forked from openlp/openlp
merge trunk
This commit is contained in:
commit
c8d0efe2ea
@ -73,13 +73,13 @@ class OpenSongBible(BibleDB):
|
|||||||
log.debug('Starting OpenSong import from "%s"' % self.filename)
|
log.debug('Starting OpenSong import from "%s"' % self.filename)
|
||||||
if not isinstance(self.filename, str):
|
if not isinstance(self.filename, str):
|
||||||
self.filename = str(self.filename, 'utf8')
|
self.filename = str(self.filename, 'utf8')
|
||||||
file = None
|
import_file = None
|
||||||
success = True
|
success = True
|
||||||
try:
|
try:
|
||||||
# NOTE: We don't need to do any of the normal encoding detection here, because lxml does it's own encoding
|
# NOTE: We don't need to do any of the normal encoding detection here, because lxml does it's own encoding
|
||||||
# detection, and the two mechanisms together interfere with each other.
|
# detection, and the two mechanisms together interfere with each other.
|
||||||
file = open(self.filename, 'r')
|
import_file = open(self.filename, 'rb')
|
||||||
opensong = objectify.parse(file)
|
opensong = objectify.parse(import_file)
|
||||||
bible = opensong.getroot()
|
bible = opensong.getroot()
|
||||||
language_id = self.get_language(bible_name)
|
language_id = self.get_language(bible_name)
|
||||||
if not language_id:
|
if not language_id:
|
||||||
@ -93,7 +93,7 @@ class OpenSongBible(BibleDB):
|
|||||||
log.error('Importing books from "%s" failed' % self.filename)
|
log.error('Importing books from "%s" failed' % self.filename)
|
||||||
return False
|
return False
|
||||||
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
|
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
|
||||||
db_book = self.create_book(str(book.attrib['n']), book_ref_id, book_details['testament_id'])
|
db_book = self.create_book(book.attrib['n'], book_ref_id, book_details['testament_id'])
|
||||||
chapter_number = 0
|
chapter_number = 0
|
||||||
for chapter in book.c:
|
for chapter in book.c:
|
||||||
if self.stop_import_flag:
|
if self.stop_import_flag:
|
||||||
@ -122,8 +122,8 @@ class OpenSongBible(BibleDB):
|
|||||||
verse_number += 1
|
verse_number += 1
|
||||||
self.create_verse(db_book.id, chapter_number, verse_number, self.get_text(verse))
|
self.create_verse(db_book.id, chapter_number, verse_number, self.get_text(verse))
|
||||||
self.wizard.increment_progress_bar(
|
self.wizard.increment_progress_bar(
|
||||||
translate('BiblesPlugin.Opensong', 'Importing %s %s...',
|
translate('BiblesPlugin.Opensong', 'Importing %(bookname)s %(chapter)s...' %
|
||||||
'Importing <book name> <chapter>...')) % (db_book.name, chapter_number)
|
{'bookname': db_book.name, 'chapter': chapter_number}))
|
||||||
self.session.commit()
|
self.session.commit()
|
||||||
self.application.process_events()
|
self.application.process_events()
|
||||||
except etree.XMLSyntaxError as inst:
|
except etree.XMLSyntaxError as inst:
|
||||||
@ -137,8 +137,8 @@ class OpenSongBible(BibleDB):
|
|||||||
log.exception('Loading Bible from OpenSong file failed')
|
log.exception('Loading Bible from OpenSong file failed')
|
||||||
success = False
|
success = False
|
||||||
finally:
|
finally:
|
||||||
if file:
|
if import_file:
|
||||||
file.close()
|
import_file.close()
|
||||||
if self.stop_import_flag:
|
if self.stop_import_flag:
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
|
@ -192,7 +192,7 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
song_number = False
|
song_number = False
|
||||||
if not search_results:
|
if not search_results:
|
||||||
search_keywords = search_keywords.rpartition(' ')
|
search_keywords = search_keywords.rpartition(' ')
|
||||||
search_string = '%' + search_keywords + '%'
|
search_string = '%' + search_keywords[0] + '%'
|
||||||
search_results = self.plugin.manager.get_all_objects(Book,
|
search_results = self.plugin.manager.get_all_objects(Book,
|
||||||
Book.name.like(search_string), Book.name.asc())
|
Book.name.like(search_string), Book.name.asc())
|
||||||
song_number = re.sub(r'[^0-9]', '', search_keywords[2])
|
song_number = re.sub(r'[^0-9]', '', search_keywords[2])
|
||||||
|
@ -53,7 +53,7 @@ class OpenLyricsImport(SongImport):
|
|||||||
Initialise the Open Lyrics importer.
|
Initialise the Open Lyrics importer.
|
||||||
"""
|
"""
|
||||||
log.debug('initialise OpenLyricsImport')
|
log.debug('initialise OpenLyricsImport')
|
||||||
SongImport.__init__(self, manager, **kwargs)
|
super(OpenLyricsImport, self).__init__(manager, **kwargs)
|
||||||
self.open_lyrics = OpenLyrics(self.manager)
|
self.open_lyrics = OpenLyrics(self.manager)
|
||||||
|
|
||||||
def do_import(self):
|
def do_import(self):
|
||||||
@ -69,7 +69,7 @@ class OpenLyricsImport(SongImport):
|
|||||||
try:
|
try:
|
||||||
# Pass a file object, because lxml does not cope with some
|
# Pass a file object, because lxml does not cope with some
|
||||||
# special characters in the path (see lp:757673 and lp:744337).
|
# special characters in the path (see lp:757673 and lp:744337).
|
||||||
parsed_file = etree.parse(open(file_path, 'r'), parser)
|
parsed_file = etree.parse(open(file_path, 'rb'), parser)
|
||||||
xml = etree.tostring(parsed_file).decode()
|
xml = etree.tostring(parsed_file).decode()
|
||||||
self.open_lyrics.xml_to_song(xml)
|
self.open_lyrics.xml_to_song(xml)
|
||||||
except etree.XMLSyntaxError:
|
except etree.XMLSyntaxError:
|
||||||
|
@ -137,7 +137,7 @@ class SongBeamerImport(SongImport):
|
|||||||
if line.startswith('#') and not read_verses:
|
if line.startswith('#') and not read_verses:
|
||||||
self.parseTags(line)
|
self.parseTags(line)
|
||||||
elif line.startswith('--'):
|
elif line.startswith('--'):
|
||||||
# --- and -- allowed for page-breaks (difference in Songbeamer only in printout)
|
# --- and -- allowed for page-breaks (difference in Songbeamer only in printout)
|
||||||
if self.current_verse:
|
if self.current_verse:
|
||||||
self.replace_html_tags()
|
self.replace_html_tags()
|
||||||
self.add_verse(self.current_verse, self.current_verse_type)
|
self.add_verse(self.current_verse, self.current_verse_type)
|
||||||
|
@ -96,7 +96,7 @@ class CommandStack(object):
|
|||||||
return len(self.data)
|
return len(self.data)
|
||||||
|
|
||||||
def __getitem__(self, index):
|
def __getitem__(self, index):
|
||||||
if not index in self.data:
|
if index not in self.data:
|
||||||
return None
|
return None
|
||||||
elif self.data[index].get('arguments'):
|
elif self.data[index].get('arguments'):
|
||||||
return self.data[index]['command'], self.data[index]['arguments']
|
return self.data[index]['command'], self.data[index]['arguments']
|
||||||
|
@ -79,5 +79,5 @@ class TestCommonFunctions(TestCase):
|
|||||||
trace_error_handler(mocked_logger)
|
trace_error_handler(mocked_logger)
|
||||||
|
|
||||||
# THEN: The mocked_logger.error() method should have been called with the correct parameters
|
# THEN: The mocked_logger.error() method should have been called with the correct parameters
|
||||||
mocked_logger.error.assert_called_with('OpenLP Error trace\n File openlp.fake at line 56 \n\t called trace_error_handler_test')
|
mocked_logger.error.assert_called_with(
|
||||||
|
'OpenLP Error trace\n File openlp.fake at line 56 \n\t called trace_error_handler_test')
|
||||||
|
@ -54,7 +54,7 @@ class TestFileDialog(TestCase):
|
|||||||
self.mocked_qt_gui.reset()
|
self.mocked_qt_gui.reset()
|
||||||
|
|
||||||
# GIVEN: A List of known values as a return value from QFileDialog.getOpenFileNames and a list of valid
|
# GIVEN: A List of known values as a return value from QFileDialog.getOpenFileNames and a list of valid
|
||||||
# file names.
|
# file names.
|
||||||
self.mocked_qt_gui.QFileDialog.getOpenFileNames.return_value = [
|
self.mocked_qt_gui.QFileDialog.getOpenFileNames.return_value = [
|
||||||
'/Valid File', '/url%20encoded%20file%20%231', '/non-existing']
|
'/Valid File', '/url%20encoded%20file%20%231', '/non-existing']
|
||||||
self.mocked_os.path.exists.side_effect = lambda file_name: file_name in [
|
self.mocked_os.path.exists.side_effect = lambda file_name: file_name in [
|
||||||
|
@ -482,7 +482,7 @@ class TestLib(TestCase):
|
|||||||
# WHEN: we run the validate_thumb() function
|
# WHEN: we run the validate_thumb() function
|
||||||
|
|
||||||
# THEN: we should have called a few functions, and the result should be True
|
# THEN: we should have called a few functions, and the result should be True
|
||||||
#mocked_os.path.exists.assert_called_with(thumb_path)
|
# mocked_os.path.exists.assert_called_with(thumb_path)
|
||||||
|
|
||||||
def validate_thumb_file_exists_and_older_test(self):
|
def validate_thumb_file_exists_and_older_test(self):
|
||||||
"""
|
"""
|
||||||
|
@ -162,7 +162,7 @@ class TestUi(TestCase):
|
|||||||
|
|
||||||
# WHEN: We create an action with some properties
|
# WHEN: We create an action with some properties
|
||||||
action = create_action(dialog, 'my_action', text='my text', icon=':/wizards/wizard_firsttime.bmp',
|
action = create_action(dialog, 'my_action', text='my text', icon=':/wizards/wizard_firsttime.bmp',
|
||||||
tooltip='my tooltip', statustip='my statustip')
|
tooltip='my tooltip', statustip='my statustip')
|
||||||
|
|
||||||
# THEN: These properties should be set
|
# THEN: These properties should be set
|
||||||
self.assertIsInstance(action, QtGui.QAction)
|
self.assertIsInstance(action, QtGui.QAction)
|
||||||
|
@ -70,7 +70,7 @@ class TestFormattingTagForm(TestCase):
|
|||||||
form.save_button = MagicMock()
|
form.save_button = MagicMock()
|
||||||
|
|
||||||
# WHEN: on_text_edited is called with an arbitrary value
|
# WHEN: on_text_edited is called with an arbitrary value
|
||||||
#form.on_text_edited('text')
|
# form.on_text_edited('text')
|
||||||
|
|
||||||
# THEN: setEnabled and setDefault should have been called on save_push_button
|
# THEN: setEnabled and setDefault should have been called on save_push_button
|
||||||
#form.save_button.setEnabled.assert_called_with(True)
|
# form.save_button.setEnabled.assert_called_with(True)
|
||||||
|
@ -106,4 +106,4 @@ class TestMainDisplay(TestCase):
|
|||||||
self.assertEqual('QGraphicsView {}', main_display.styleSheet(),
|
self.assertEqual('QGraphicsView {}', main_display.styleSheet(),
|
||||||
'MainDisplay instance should not be transparent')
|
'MainDisplay instance should not be transparent')
|
||||||
self.assertFalse(main_display.testAttribute(QtCore.Qt.WA_TranslucentBackground),
|
self.assertFalse(main_display.testAttribute(QtCore.Qt.WA_TranslucentBackground),
|
||||||
'MainDisplay hasnt translucent background')
|
'MainDisplay hasnt translucent background')
|
||||||
|
@ -35,7 +35,7 @@ from bs4 import BeautifulSoup
|
|||||||
from tests.functional import patch, MagicMock
|
from tests.functional import patch, MagicMock
|
||||||
from openlp.plugins.bibles.lib.http import BSExtract
|
from openlp.plugins.bibles.lib.http import BSExtract
|
||||||
|
|
||||||
#TODO: Items left to test
|
# TODO: Items left to test
|
||||||
# BGExtract
|
# BGExtract
|
||||||
# __init__
|
# __init__
|
||||||
# _remove_elements
|
# _remove_elements
|
||||||
@ -68,7 +68,7 @@ class TestBSExtract(TestCase):
|
|||||||
"""
|
"""
|
||||||
Test the BSExtractClass
|
Test the BSExtractClass
|
||||||
"""
|
"""
|
||||||
#TODO: Items left to test
|
# TODO: Items left to test
|
||||||
# BSExtract
|
# BSExtract
|
||||||
# __init__
|
# __init__
|
||||||
# get_bible_chapter
|
# get_bible_chapter
|
||||||
|
@ -47,7 +47,7 @@ class TestPptviewController(TestCase, TestMixin):
|
|||||||
"""
|
"""
|
||||||
Test the PptviewController Class
|
Test the PptviewController Class
|
||||||
"""
|
"""
|
||||||
#TODO: Items left to test
|
# TODO: Items left to test
|
||||||
# PptviewController
|
# PptviewController
|
||||||
# start_process(self)
|
# start_process(self)
|
||||||
# kill
|
# kill
|
||||||
@ -108,7 +108,7 @@ class TestPptviewDocument(TestCase):
|
|||||||
"""
|
"""
|
||||||
Test the PptviewDocument Class
|
Test the PptviewDocument Class
|
||||||
"""
|
"""
|
||||||
#TODO: Items left to test
|
# TODO: Items left to test
|
||||||
# PptviewDocument
|
# PptviewDocument
|
||||||
# __init__
|
# __init__
|
||||||
# create_thumbnails
|
# create_thumbnails
|
||||||
|
@ -141,7 +141,7 @@ class TestEasyWorshipSongImport(TestCase):
|
|||||||
self.assertIsNotNone(field_desc_entry, 'Import should not be none')
|
self.assertIsNotNone(field_desc_entry, 'Import should not be none')
|
||||||
self.assertEqual(field_desc_entry.name, name, 'FieldDescEntry.name should be the same as the name argument')
|
self.assertEqual(field_desc_entry.name, name, 'FieldDescEntry.name should be the same as the name argument')
|
||||||
self.assertEqual(field_desc_entry.field_type, field_type,
|
self.assertEqual(field_desc_entry.field_type, field_type,
|
||||||
'FieldDescEntry.type should be the same as the type argument')
|
'FieldDescEntry.type should be the same as the type argument')
|
||||||
self.assertEqual(field_desc_entry.size, size, 'FieldDescEntry.size should be the same as the size argument')
|
self.assertEqual(field_desc_entry.size, size, 'FieldDescEntry.size should be the same as the size argument')
|
||||||
|
|
||||||
def create_importer_test(self):
|
def create_importer_test(self):
|
||||||
@ -229,10 +229,10 @@ class TestEasyWorshipSongImport(TestCase):
|
|||||||
for field_index, result in field_results:
|
for field_index, result in field_results:
|
||||||
return_value = importer.get_field(field_index)
|
return_value = importer.get_field(field_index)
|
||||||
|
|
||||||
# THEN: get_field should return the known results
|
# THEN: get_field should return the known results
|
||||||
self.assertEqual(return_value, result,
|
self.assertEqual(return_value, result,
|
||||||
'get_field should return "%s" when called with "%s"' %
|
'get_field should return "%s" when called with "%s"' %
|
||||||
(result, TEST_FIELDS[field_index]))
|
(result, TEST_FIELDS[field_index]))
|
||||||
|
|
||||||
def get_memo_field_test(self):
|
def get_memo_field_test(self):
|
||||||
"""
|
"""
|
||||||
@ -403,11 +403,11 @@ class TestEasyWorshipSongImport(TestCase):
|
|||||||
if song_copyright:
|
if song_copyright:
|
||||||
self.assertEqual(importer.copyright, song_copyright)
|
self.assertEqual(importer.copyright, song_copyright)
|
||||||
if ccli_number:
|
if ccli_number:
|
||||||
self.assertEqual(importer.ccli_number, ccli_number, 'ccli_number for %s should be %s'
|
self.assertEqual(importer.ccli_number, ccli_number,
|
||||||
% (title, ccli_number))
|
'ccli_number for %s should be %s' % (title, ccli_number))
|
||||||
for verse_text, verse_tag in add_verse_calls:
|
for verse_text, verse_tag in add_verse_calls:
|
||||||
mocked_add_verse.assert_any_call(verse_text, verse_tag)
|
mocked_add_verse.assert_any_call(verse_text, verse_tag)
|
||||||
if verse_order_list:
|
if verse_order_list:
|
||||||
self.assertEqual(importer.verse_order_list, verse_order_list,
|
self.assertEqual(importer.verse_order_list, verse_order_list,
|
||||||
'verse_order_list for %s should be %s' % (title, verse_order_list))
|
'verse_order_list for %s should be %s' % (title, verse_order_list))
|
||||||
mocked_finish.assert_called_with()
|
mocked_finish.assert_called_with()
|
||||||
|
@ -44,7 +44,7 @@ class TestFoilPresenter(TestCase):
|
|||||||
"""
|
"""
|
||||||
Test the functions in the :mod:`foilpresenterimport` module.
|
Test the functions in the :mod:`foilpresenterimport` module.
|
||||||
"""
|
"""
|
||||||
#TODO: The following modules still need tests written for
|
# TODO: The following modules still need tests written for
|
||||||
# xml_to_song
|
# xml_to_song
|
||||||
# _child
|
# _child
|
||||||
# _process_authors
|
# _process_authors
|
||||||
|
@ -129,7 +129,6 @@ class TestLib(TestCase):
|
|||||||
# THEN: The result should be a tuple of songs..
|
# THEN: The result should be a tuple of songs..
|
||||||
assert result == (self.song1, self.song2), 'The result should be the tuble of songs'
|
assert result == (self.song1, self.song2), 'The result should be the tuble of songs'
|
||||||
|
|
||||||
|
|
||||||
def songs_probably_equal_different_song_test(self):
|
def songs_probably_equal_different_song_test(self):
|
||||||
"""
|
"""
|
||||||
Test the songs_probably_equal function with two different songs.
|
Test the songs_probably_equal function with two different songs.
|
||||||
|
@ -0,0 +1,99 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
# OpenLP - Open Source Lyrics Projection #
|
||||||
|
# --------------------------------------------------------------------------- #
|
||||||
|
# Copyright (c) 2008-2014 Raoul Snyman #
|
||||||
|
# Portions copyright (c) 2008-2014 Tim Bentley, Gerald Britton, Jonathan #
|
||||||
|
# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
|
||||||
|
# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
|
||||||
|
# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
|
||||||
|
# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
|
||||||
|
# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
|
||||||
|
# Frode Woldsund, Martin Zibricky, Patrick Zimmermann #
|
||||||
|
# --------------------------------------------------------------------------- #
|
||||||
|
# This program is free software; you can redistribute it and/or modify it #
|
||||||
|
# under the terms of the GNU General Public License as published by the Free #
|
||||||
|
# Software Foundation; version 2 of the License. #
|
||||||
|
# #
|
||||||
|
# This program is distributed in the hope that it will be useful, but WITHOUT #
|
||||||
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
|
||||||
|
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
|
||||||
|
# more details. #
|
||||||
|
# #
|
||||||
|
# You should have received a copy of the GNU General Public License along #
|
||||||
|
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
||||||
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
|
###############################################################################
|
||||||
|
"""
|
||||||
|
This module contains tests for the OpenLyrics song importer.
|
||||||
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
from unittest import TestCase
|
||||||
|
|
||||||
|
from tests.functional import MagicMock, patch
|
||||||
|
from openlp.plugins.songs.lib.openlyricsimport import OpenLyricsImport
|
||||||
|
from openlp.plugins.songs.lib.songimport import SongImport
|
||||||
|
|
||||||
|
TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
||||||
|
'..', '..', '..', 'resources', 'openlyricssongs'))
|
||||||
|
SONG_TEST_DATA = {
|
||||||
|
'What a friend we have in Jesus.xml': {
|
||||||
|
'title': 'What A Friend We Have In Jesus',
|
||||||
|
'verses': [
|
||||||
|
('What a friend we have in Jesus, All ours sins and griefs to bear;\n\
|
||||||
|
What a privilege to carry, Everything to God in prayer!\n\
|
||||||
|
O what peace we often forfeit, O what needless pain we bear;\n\
|
||||||
|
All because we do not carry, Everything to God in prayer!', 'v1'),
|
||||||
|
('Have we trials and temptations? Is there trouble anywhere?\n\
|
||||||
|
We should never be discouraged, Take it to the Lord in prayer.\n\
|
||||||
|
Can we find a friend so faithful? Who will all our sorrows share?\n\
|
||||||
|
Jesus knows our every weakness; Take it to the Lord in prayer.', 'v2'),
|
||||||
|
('Are we weak and heavy laden, Cumbered with a load of care?\n\
|
||||||
|
Precious Saviour still our refuge; Take it to the Lord in prayer.\n\
|
||||||
|
Do thy friends despise forsake thee? Take it to the Lord in prayer!\n\
|
||||||
|
In His arms He’ll take and shield thee; Thou wilt find a solace there.', 'v3')
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class TestOpenLyricsImport(TestCase):
|
||||||
|
"""
|
||||||
|
Test the functions in the :mod:`openlyricsimport` module.
|
||||||
|
"""
|
||||||
|
def create_importer_test(self):
|
||||||
|
"""
|
||||||
|
Test creating an instance of the OpenLyrics file importer
|
||||||
|
"""
|
||||||
|
# GIVEN: A mocked out SongImport class, and a mocked out "manager"
|
||||||
|
with patch('openlp.plugins.songs.lib.songbeamerimport.SongImport'):
|
||||||
|
mocked_manager = MagicMock()
|
||||||
|
|
||||||
|
# WHEN: An importer object is created
|
||||||
|
importer = OpenLyricsImport(mocked_manager, filenames=[])
|
||||||
|
|
||||||
|
# THEN: The importer should be an instance of SongImport
|
||||||
|
self.assertIsInstance(importer, SongImport)
|
||||||
|
|
||||||
|
def file_import_test(self):
|
||||||
|
"""
|
||||||
|
Test the actual import of real song files
|
||||||
|
"""
|
||||||
|
# GIVEN: Test files with a mocked out "manager" and a mocked out "import_wizard"
|
||||||
|
for song_file in SONG_TEST_DATA:
|
||||||
|
mocked_manager = MagicMock()
|
||||||
|
mocked_import_wizard = MagicMock()
|
||||||
|
importer = OpenLyricsImport(mocked_manager, filenames=[])
|
||||||
|
importer.import_wizard = mocked_import_wizard
|
||||||
|
importer.open_lyrics = MagicMock()
|
||||||
|
importer.open_lyrics.xml_to_song = MagicMock()
|
||||||
|
|
||||||
|
# WHEN: Importing each file
|
||||||
|
importer.import_source = [os.path.join(TEST_PATH, song_file)]
|
||||||
|
importer.do_import()
|
||||||
|
|
||||||
|
# THEN: The xml_to_song() method should have been called
|
||||||
|
self.assertTrue(importer.open_lyrics.xml_to_song.called)
|
@ -49,7 +49,8 @@ SONG_TEST_DATA = {
|
|||||||
('4. Lobsingt seiner Treu´,\ndie immerdar neu,\nbis Er uns zur Herrlichket führet!\n\n', 'v')
|
('4. Lobsingt seiner Treu´,\ndie immerdar neu,\nbis Er uns zur Herrlichket führet!\n\n', 'v')
|
||||||
],
|
],
|
||||||
'song_book_name': 'Glaubenslieder I',
|
'song_book_name': 'Glaubenslieder I',
|
||||||
'song_number': "1"
|
'song_number': "1",
|
||||||
|
'authors': ['Carl Brockhaus', 'Johann Jakob Vetter']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -91,7 +92,7 @@ class TestSongBeamerImport(TestCase):
|
|||||||
# THEN: do_import should return none and the progress bar maximum should not be set.
|
# THEN: do_import should return none and the progress bar maximum should not be set.
|
||||||
self.assertIsNone(importer.do_import(), 'do_import should return None when import_source is not a list')
|
self.assertIsNone(importer.do_import(), 'do_import should return None when import_source is not a list')
|
||||||
self.assertEqual(mocked_import_wizard.progress_bar.setMaximum.called, False,
|
self.assertEqual(mocked_import_wizard.progress_bar.setMaximum.called, False,
|
||||||
'setMaxium on import_wizard.progress_bar should not have been called')
|
'setMaxium on import_wizard.progress_bar should not have been called')
|
||||||
|
|
||||||
def valid_import_source_test(self):
|
def valid_import_source_test(self):
|
||||||
"""
|
"""
|
||||||
@ -140,6 +141,7 @@ class TestSongBeamerImport(TestCase):
|
|||||||
add_verse_calls = SONG_TEST_DATA[song_file]['verses']
|
add_verse_calls = SONG_TEST_DATA[song_file]['verses']
|
||||||
song_book_name = SONG_TEST_DATA[song_file]['song_book_name']
|
song_book_name = SONG_TEST_DATA[song_file]['song_book_name']
|
||||||
song_number = SONG_TEST_DATA[song_file]['song_number']
|
song_number = SONG_TEST_DATA[song_file]['song_number']
|
||||||
|
song_authors = SONG_TEST_DATA[song_file]['authors']
|
||||||
|
|
||||||
# THEN: do_import should return none, the song data should be as expected, and finish should have been
|
# THEN: do_import should return none, the song data should be as expected, and finish should have been
|
||||||
# called.
|
# called.
|
||||||
@ -148,11 +150,14 @@ class TestSongBeamerImport(TestCase):
|
|||||||
for verse_text, verse_tag in add_verse_calls:
|
for verse_text, verse_tag in add_verse_calls:
|
||||||
mocked_add_verse.assert_any_call(verse_text, verse_tag)
|
mocked_add_verse.assert_any_call(verse_text, verse_tag)
|
||||||
if song_book_name:
|
if song_book_name:
|
||||||
self.assertEqual(importer.song_book_name, song_book_name, 'song_book_name for %s should be "%s"' %
|
self.assertEqual(importer.song_book_name, song_book_name,
|
||||||
(song_file, song_book_name))
|
'song_book_name for %s should be "%s"' % (song_file, song_book_name))
|
||||||
if song_number:
|
if song_number:
|
||||||
self.assertEqual(importer.song_number, song_number, 'song_number for %s should be %s' %
|
self.assertEqual(importer.song_number, song_number,
|
||||||
(song_file, song_number))
|
'song_number for %s should be %s' % (song_file, song_number))
|
||||||
|
if song_authors:
|
||||||
|
for author in importer.authors:
|
||||||
|
self.assertIn(author, song_authors)
|
||||||
mocked_finish.assert_called_with()
|
mocked_finish.assert_called_with()
|
||||||
|
|
||||||
def check_verse_marks_test(self):
|
def check_verse_marks_test(self):
|
||||||
|
@ -96,7 +96,7 @@ class TestSongShowPlusImport(TestCase):
|
|||||||
# THEN: do_import should return none and the progress bar maximum should not be set.
|
# THEN: do_import should return none and the progress bar maximum should not be set.
|
||||||
self.assertIsNone(importer.do_import(), 'do_import should return None when import_source is not a list')
|
self.assertIsNone(importer.do_import(), 'do_import should return None when import_source is not a list')
|
||||||
self.assertEqual(mocked_import_wizard.progress_bar.setMaximum.called, False,
|
self.assertEqual(mocked_import_wizard.progress_bar.setMaximum.called, False,
|
||||||
'setMaximum on import_wizard.progress_bar should not have been called')
|
'setMaximum on import_wizard.progress_bar should not have been called')
|
||||||
|
|
||||||
def valid_import_source_test(self):
|
def valid_import_source_test(self):
|
||||||
"""
|
"""
|
||||||
@ -116,7 +116,7 @@ class TestSongShowPlusImport(TestCase):
|
|||||||
# THEN: do_import should return none and the progress bar setMaximum should be called with the length of
|
# THEN: do_import should return none and the progress bar setMaximum should be called with the length of
|
||||||
# import_source.
|
# import_source.
|
||||||
self.assertIsNone(importer.do_import(), 'do_import should return None when import_source is a list '
|
self.assertIsNone(importer.do_import(), 'do_import should return None when import_source is a list '
|
||||||
'and stop_import_flag is True')
|
'and stop_import_flag is True')
|
||||||
mocked_import_wizard.progress_bar.setMaximum.assert_called_with(len(importer.import_source))
|
mocked_import_wizard.progress_bar.setMaximum.assert_called_with(len(importer.import_source))
|
||||||
|
|
||||||
def to_openlp_verse_tag_test(self):
|
def to_openlp_verse_tag_test(self):
|
||||||
@ -144,8 +144,8 @@ class TestSongShowPlusImport(TestCase):
|
|||||||
# THEN: The returned value should should correlate with the input arguments
|
# THEN: The returned value should should correlate with the input arguments
|
||||||
for original_tag, openlp_tag in test_values:
|
for original_tag, openlp_tag in test_values:
|
||||||
self.assertEqual(importer.to_openlp_verse_tag(original_tag), openlp_tag,
|
self.assertEqual(importer.to_openlp_verse_tag(original_tag), openlp_tag,
|
||||||
'SongShowPlusImport.to_openlp_verse_tag should return "%s" when called with "%s"' %
|
'SongShowPlusImport.to_openlp_verse_tag should return "%s" when called with "%s"' %
|
||||||
(openlp_tag, original_tag))
|
(openlp_tag, original_tag))
|
||||||
|
|
||||||
def to_openlp_verse_tag_verse_order_test(self):
|
def to_openlp_verse_tag_verse_order_test(self):
|
||||||
"""
|
"""
|
||||||
@ -173,5 +173,5 @@ class TestSongShowPlusImport(TestCase):
|
|||||||
# THEN: The returned value should should correlate with the input arguments
|
# THEN: The returned value should should correlate with the input arguments
|
||||||
for original_tag, openlp_tag in test_values:
|
for original_tag, openlp_tag in test_values:
|
||||||
self.assertEqual(importer.to_openlp_verse_tag(original_tag, ignore_unique=True), openlp_tag,
|
self.assertEqual(importer.to_openlp_verse_tag(original_tag, ignore_unique=True), openlp_tag,
|
||||||
'SongShowPlusImport.to_openlp_verse_tag should return "%s" when called with "%s"' %
|
'SongShowPlusImport.to_openlp_verse_tag should return "%s" when called with "%s"' %
|
||||||
(openlp_tag, original_tag))
|
(openlp_tag, original_tag))
|
||||||
|
@ -116,24 +116,24 @@ class SongImportTestHelper(TestCase):
|
|||||||
if song_copyright:
|
if song_copyright:
|
||||||
self.mocked_add_copyright.assert_called_with(song_copyright)
|
self.mocked_add_copyright.assert_called_with(song_copyright)
|
||||||
if ccli_number:
|
if ccli_number:
|
||||||
self.assertEqual(importer.ccli_number, ccli_number, 'ccli_number for %s should be %s' %
|
self.assertEqual(importer.ccli_number, ccli_number,
|
||||||
(source_file_name, ccli_number))
|
'ccli_number for %s should be %s' % (source_file_name, ccli_number))
|
||||||
for verse_text, verse_tag in add_verse_calls:
|
for verse_text, verse_tag in add_verse_calls:
|
||||||
self.mocked_add_verse.assert_any_call(verse_text, verse_tag)
|
self.mocked_add_verse.assert_any_call(verse_text, verse_tag)
|
||||||
if topics:
|
if topics:
|
||||||
self.assertEqual(importer.topics, topics, 'topics for %s should be %s' % (source_file_name, topics))
|
self.assertEqual(importer.topics, topics, 'topics for %s should be %s' % (source_file_name, topics))
|
||||||
if comments:
|
if comments:
|
||||||
self.assertEqual(importer.comments, comments, 'comments for %s should be "%s"' %
|
self.assertEqual(importer.comments, comments,
|
||||||
(source_file_name, comments))
|
'comments for %s should be "%s"' % (source_file_name, comments))
|
||||||
if song_book_name:
|
if song_book_name:
|
||||||
self.assertEqual(importer.song_book_name, song_book_name, 'song_book_name for %s should be "%s"' %
|
self.assertEqual(importer.song_book_name, song_book_name,
|
||||||
(source_file_name, song_book_name))
|
'song_book_name for %s should be "%s"' % (source_file_name, song_book_name))
|
||||||
if song_number:
|
if song_number:
|
||||||
self.assertEqual(importer.song_number, song_number, 'song_number for %s should be %s' %
|
self.assertEqual(importer.song_number, song_number,
|
||||||
(source_file_name, song_number))
|
'song_number for %s should be %s' % (source_file_name, song_number))
|
||||||
if verse_order_list:
|
if verse_order_list:
|
||||||
self.assertEqual(importer.verse_order_list, [], 'verse_order_list for %s should be %s' %
|
self.assertEqual(importer.verse_order_list, [],
|
||||||
(source_file_name, verse_order_list))
|
'verse_order_list for %s should be %s' % (source_file_name, verse_order_list))
|
||||||
self.mocked_finish.assert_called_with()
|
self.mocked_finish.assert_called_with()
|
||||||
|
|
||||||
def _get_data(self, data, key):
|
def _get_data(self, data, key):
|
||||||
|
@ -103,5 +103,5 @@ class TestBibleManager(TestCase, TestMixin):
|
|||||||
# WHEN asking to parse the bible reference
|
# WHEN asking to parse the bible reference
|
||||||
results = parse_reference('1 Timothy 1:1-2:1', self.manager.db_cache['tests'], MagicMock(), 54)
|
results = parse_reference('1 Timothy 1:1-2:1', self.manager.db_cache['tests'], MagicMock(), 54)
|
||||||
# THEN a verse array should be returned
|
# THEN a verse array should be returned
|
||||||
self.assertEqual([(54, 1, 1, -1), (54, 2, 1, 1)], results, "The bible verses should matches the expected "
|
self.assertEqual([(54, 1, 1, -1), (54, 2, 1, 1)], results,
|
||||||
"results")
|
"The bible verses should match the expected results")
|
||||||
|
@ -0,0 +1,44 @@
|
|||||||
|
<?xml version='1.0' encoding='UTF-8'?>
|
||||||
|
<song xmlns="http://openlyrics.info/namespace/2009/song" version="0.8" createdIn="opensong2openlyrics.py 0.1" modifiedIn="convert-schema.py" modifiedDate="2013-03-12T09:13:04.212538">
|
||||||
|
<properties>
|
||||||
|
<titles>
|
||||||
|
<title>What A Friend We Have In Jesus</title>
|
||||||
|
</titles>
|
||||||
|
<authors>
|
||||||
|
<author>Joseph M. Scriven</author>
|
||||||
|
<author>Charles C. Convers</author>
|
||||||
|
</authors>
|
||||||
|
<copyright>Public Domain</copyright>
|
||||||
|
<ccliNo>27714</ccliNo>
|
||||||
|
<themes>
|
||||||
|
<theme>Christ: Love/Mercy</theme>
|
||||||
|
<theme>Fruit: Peace/Comfort</theme>
|
||||||
|
</themes>
|
||||||
|
</properties>
|
||||||
|
<lyrics>
|
||||||
|
<verse name="v1">
|
||||||
|
<lines>
|
||||||
|
What a friend we have in Jesus, All ours sins and griefs to bear;<br/>
|
||||||
|
What a privilege to carry, Everything to God in prayer!<br/>
|
||||||
|
O what peace we often forfeit, O what needless pain we bear;<br/>
|
||||||
|
All because we do not carry, Everything to God in prayer!
|
||||||
|
</lines>
|
||||||
|
</verse>
|
||||||
|
<verse name="v2">
|
||||||
|
<lines>
|
||||||
|
Have we trials and temptations? Is there trouble anywhere?<br/>
|
||||||
|
We should never be discouraged, Take it to the Lord in prayer.<br/>
|
||||||
|
Can we find a friend so faithful? Who will all our sorrows share?<br/>
|
||||||
|
Jesus knows our every weakness; Take it to the Lord in prayer.
|
||||||
|
</lines>
|
||||||
|
</verse>
|
||||||
|
<verse name="v3">
|
||||||
|
<lines>
|
||||||
|
Are we weak and heavy laden, Cumbered with a load of care?<br/>
|
||||||
|
Precious Saviour still our refuge; Take it to the Lord in prayer.<br/>
|
||||||
|
Do thy friends despise forsake thee? Take it to the Lord in prayer!<br/>
|
||||||
|
In His arms He’ll take and shield thee; Thou wilt find a solace there.
|
||||||
|
</lines>
|
||||||
|
</verse>
|
||||||
|
</lyrics>
|
||||||
|
</song>
|
@ -1,5 +1,7 @@
|
|||||||
#LangCount=1
|
#LangCount=1
|
||||||
#Title=GL 1 - Lobsinget dem Herrn
|
#Title=GL 1 - Lobsinget dem Herrn
|
||||||
|
#Author=Carl Brockhaus
|
||||||
|
#Melody=Johann Jakob Vetter
|
||||||
#Editor=SongBeamer 4.20
|
#Editor=SongBeamer 4.20
|
||||||
#Version=3
|
#Version=3
|
||||||
#Format=F/K//
|
#Format=F/K//
|
||||||
|
Loading…
Reference in New Issue
Block a user