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

PEP fixes

Browse Source
This commit is contained in:
Philip Ridout 2016-09-09 22:47:29 +01:00
parent 29bc21d807
commit 2dd770ea11
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/functional/openlp_plugins/bibles/test_bibleimport.py
View File

@ -232,14 +232,14 @@ class TestBibleImport(TestCase):
# called # called
with patch.object(BibleImport, 'log_debug'), \ with patch.object(BibleImport, 'log_debug'), \
patch('openlp.plugins.bibles.lib.bibleimport.BiblesResourcesDB', patch('openlp.plugins.bibles.lib.bibleimport.BiblesResourcesDB',
**{'get_book.return_value':{'id': 20}}): **{'get_book.return_value': {'id': 20}}):
instance = BibleImport(MagicMock()) instance = BibleImport(MagicMock())
# WHEN: Calling get_book_ref_id_by_name # WHEN: Calling get_book_ref_id_by_name
result = instance.get_book_ref_id_by_name('Gen', 66, 4) result = instance.get_book_ref_id_by_name('Gen', 66, 4)
# THEN: The bible id should be returned # THEN: The bible id should be returned
self.assertEqual(result,20) self.assertEqual(result, 20)
def get_book_ref_id_by_name_get_alternative_book_name_test(self): def get_book_ref_id_by_name_get_alternative_book_name_test(self):
""" """
@ -266,7 +266,7 @@ class TestBibleImport(TestCase):
# get_book_reference_id is called # get_book_reference_id is called
with patch.object(BibleImport, 'log_debug'), \ with patch.object(BibleImport, 'log_debug'), \
patch('openlp.plugins.bibles.lib.bibleimport.BiblesResourcesDB', patch('openlp.plugins.bibles.lib.bibleimport.BiblesResourcesDB',
**{'get_book.return_value': None, 'get_alternative_book_name.return_value': None}), \ **{'get_book.return_value': None, 'get_alternative_book_name.return_value': None}), \
patch('openlp.plugins.bibles.lib.bibleimport.AlternativeBookNamesDB', patch('openlp.plugins.bibles.lib.bibleimport.AlternativeBookNamesDB',
**{'get_book_reference_id.return_value': 40}): **{'get_book_reference_id.return_value': 40}):
instance = BibleImport(MagicMock()) instance = BibleImport(MagicMock())
@ -303,12 +303,12 @@ class TestBibleImport(TestCase):
""" """
# GIVEN: An instance of BibleImport and a mocked BookNameForm which simulates a user accepting the dialog # GIVEN: An instance of BibleImport and a mocked BookNameForm which simulates a user accepting the dialog
with patch.object(BibleImport, 'log_debug'), patch.object(BibleImport, 'get_books'), \ with patch.object(BibleImport, 'log_debug'), patch.object(BibleImport, 'get_books'), \
patch('openlp.plugins.bibles.lib.bibleimport.BiblesResourcesDB', patch('openlp.plugins.bibles.lib.bibleimport.BiblesResourcesDB',
**{'get_book.return_value': None, 'get_alternative_book_name.return_value': None}), \ **{'get_book.return_value': None, 'get_alternative_book_name.return_value': None}), \
patch('openlp.plugins.bibles.lib.bibleimport.AlternativeBookNamesDB', patch('openlp.plugins.bibles.lib.bibleimport.AlternativeBookNamesDB',
**{'get_book_reference_id.return_value': None}) as mocked_alternative_book_names_db, \ **{'get_book_reference_id.return_value': None}) as mocked_alternative_book_names_db, \
patch('openlp.plugins.bibles.forms.BookNameForm', patch('openlp.plugins.bibles.forms.BookNameForm',
return_value=MagicMock(**{'exec.return_value': QDialog.Accepted, 'book_id':50})): return_value=MagicMock(**{'exec.return_value': QDialog.Accepted, 'book_id': 50})):
instance = BibleImport(MagicMock()) instance = BibleImport(MagicMock())
# WHEN: Calling get_book_ref_id_by_name # WHEN: Calling get_book_ref_id_by_name

2
tests/functional/openlp_plugins/bibles/test_osisimport.py
View File

@ -32,7 +32,7 @@ from openlp.plugins.bibles.lib.bibleimport import BibleImport
from openlp.plugins.bibles.lib.db import BibleDB from openlp.plugins.bibles.lib.db import BibleDB
from openlp.plugins.bibles.lib.importers.osis import OSISBible from openlp.plugins.bibles.lib.importers.osis import OSISBible
TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'bibles')) TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources', 'bibles'))
class TestOsisImport(TestCase): class TestOsisImport(TestCase):