raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

pep8 fixes

Browse Source
This commit is contained in:
Tomas Groth 2015-10-27 22:36:52 +00:00
parent a8c5f8cb52
commit f712b35b08
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/functional/openlp_plugins/songs/test_worshipcenterproimport.py
View File

@ -101,9 +101,7 @@ RECORDSET_TEST_DATA = [TestRecord(1, 'TITLE', 'Amazing Grace'),
'Just to learn from His&crlf;lips words of comfort&crlf;In the beautiful&crlf;' 'Just to learn from His&crlf;lips words of comfort&crlf;In the beautiful&crlf;'
'garden of prayer.&crlf;&crlf;There\'s a garden where&crlf;Jesus is waiting,&crlf;' 'garden of prayer.&crlf;&crlf;There\'s a garden where&crlf;Jesus is waiting,&crlf;'
'And He bids you to come,&crlf;meet Him there;&crlf;Just to bow and&crlf;' 'And He bids you to come,&crlf;meet Him there;&crlf;Just to bow and&crlf;'
'receive a new blessing&crlf;In the beautiful&crlf;garden of prayer.&crlf;&crlf;'), 'receive a new blessing&crlf;In the beautiful&crlf;garden of prayer.&crlf;&crlf;')]
]
SONG_TEST_DATA = [{'title': 'Amazing Grace', SONG_TEST_DATA = [{'title': 'Amazing Grace',
'verses': [ 'verses': [
('Amazing grace! How\nsweet the sound\nThat saved a wretch like me!\nI once was lost,\n' ('Amazing grace! How\nsweet the sound\nThat saved a wretch like me!\nI once was lost,\n'
@ -120,9 +118,9 @@ SONG_TEST_DATA = [{'title': 'Amazing Grace',
'me here below,\nShall be forever mine.'), 'me here below,\nShall be forever mine.'),
('When we\'ve been there\nten thousand years,\nBright shining as the sun,\n' ('When we\'ve been there\nten thousand years,\nBright shining as the sun,\n'
'We\'ve no less days to\nsing God\'s praise\nThan when we\'d first begun.')], 'We\'ve no less days to\nsing God\'s praise\nThan when we\'d first begun.')],
'author': 'John Newton', 'author': 'John Newton',
'comments': 'The original version', 'comments': 'The original version',
'copyright': 'Public Domain'}, 'copyright': 'Public Domain'},
{'title': 'Beautiful Garden Of Prayer, The', {'title': 'Beautiful Garden Of Prayer, The',
'verses': [ 'verses': [
('There\'s a garden where\nJesus is waiting,\nThere\'s a place that\nis wondrously fair,\n' ('There\'s a garden where\nJesus is waiting,\nThere\'s a place that\nis wondrously fair,\n'
@ -200,7 +198,7 @@ class TestWorshipCenterProSongImport(TestCase):
mocked_manager = MagicMock() mocked_manager = MagicMock()
mocked_import_wizard = MagicMock() mocked_import_wizard = MagicMock()
mocked_add_verse = MagicMock() mocked_add_verse = MagicMock()
mocked_parse_author= MagicMock() mocked_parse_author = MagicMock()
mocked_add_comment = MagicMock() mocked_add_comment = MagicMock()
mocked_add_copyright = MagicMock() mocked_add_copyright = MagicMock()
mocked_finish = MagicMock() mocked_finish = MagicMock()

2
tests/functional/openlp_plugins/songs/test_zionworximport.py
View File

@ -35,6 +35,7 @@ from openlp.core.common import Registry
TEST_PATH = os.path.abspath( TEST_PATH = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'zionworxsongs')) os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'zionworxsongs'))
class TestZionWorxImport(TestCase): class TestZionWorxImport(TestCase):
""" """
Test the functions in the :mod:`zionworximport` module. Test the functions in the :mod:`zionworximport` module.
@ -59,6 +60,7 @@ class TestZionWorxImport(TestCase):
# THEN: The importer should be an instance of SongImport # THEN: The importer should be an instance of SongImport
self.assertIsInstance(importer, SongImport) self.assertIsInstance(importer, SongImport)
class TestZionWorxFileImport(SongImportTestHelper): class TestZionWorxFileImport(SongImportTestHelper):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):