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

Fix projector tests. 

Fix tests that fails on py35.

bzr-revno: 2569
This commit is contained in:
second@tgc.dk 2015-11-27 17:27:55 +00:00 committed by Tim Bentley
parent db98c1c287 a5525e96c1
commit a3a5216734
5 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/functional/openlp_core_lib/test_projectordb.py
View File

@ -94,6 +94,12 @@ class TestProjectorDB(TestCase):
mocked_init_url.return_value = 'sqlite:///%s' % tmpfile mocked_init_url.return_value = 'sqlite:///%s' % tmpfile
self.projector = ProjectorDB() self.projector = ProjectorDB()
def tearDown(self):
"""
Clean up
"""
self.projector = None
def find_record_by_ip_test(self): def find_record_by_ip_test(self):
""" """
Test find record by IP Test find record by IP

2
tests/functional/openlp_core_ui/test_thememanager.py
View File

@ -240,4 +240,4 @@ class TestThemeManager(TestCase):
theme_manager.unzip_theme('theme.file', 'folder') theme_manager.unzip_theme('theme.file', 'folder')
# THEN: The critical_error_message_box should have been called # THEN: The critical_error_message_box should have been called
mocked_critical_error_message_box.assert_called_once(ANY, ANY) self.assertEqual(mocked_critical_error_message_box.call_count, 1, 'Should have been called once')

10
tests/functional/openlp_plugins/presentations/test_presentationcontroller.py
View File

@ -49,11 +49,17 @@ class TestPresentationController(TestCase):
# _get_plugin_manager # _get_plugin_manager
def setUp(self): def setUp(self):
self.get_thumbnail_folder_patcher = \
patch('openlp.plugins.presentations.lib.presentationcontroller.PresentationDocument.get_thumbnail_folder')
self.get_thumbnail_folder_patcher.start()
mocked_plugin = MagicMock() mocked_plugin = MagicMock()
mocked_plugin.settings_section = 'presentations' mocked_plugin.settings_section = 'presentations'
self.presentation = PresentationController(mocked_plugin) self.presentation = PresentationController(mocked_plugin)
self.document = PresentationDocument(self.presentation, '') self.document = PresentationDocument(self.presentation, '')
def tearDown(self):
self.get_thumbnail_folder_patcher.stop()
def constructor_test(self): def constructor_test(self):
""" """
Test the Constructor Test the Constructor
@ -86,8 +92,8 @@ class TestPresentationController(TestCase):
mocked_open.assert_any_call(os.path.join('test', 'slideNotes2.txt'), mode='wt', encoding='utf-8') mocked_open.assert_any_call(os.path.join('test', 'slideNotes2.txt'), mode='wt', encoding='utf-8')
self.assertEqual(mocked_open.call_count, 3, 'There should be exactly three files opened') self.assertEqual(mocked_open.call_count, 3, 'There should be exactly three files opened')
mocked_open().writelines.assert_called_once_with(['uno', 'dos']) mocked_open().writelines.assert_called_once_with(['uno', 'dos'])
mocked_open().write.assert_called_any('one') mocked_open().write.assert_any_call('one')
mocked_open().write.assert_called_any('two') mocked_open().write.assert_any_call('two')
def save_titles_and_notes_with_None_test(self): def save_titles_and_notes_with_None_test(self):
""" """

10
tests/functional/openlp_plugins/remotes/test_router.py
View File

@ -272,7 +272,6 @@ class TestRouter(TestCase, TestMixin):
self.router.end_headers = MagicMock() self.router.end_headers = MagicMock()
self.router.wfile = MagicMock() self.router.wfile = MagicMock()
mocked_image_manager = MagicMock() mocked_image_manager = MagicMock()
Registry.create()
Registry().register('image_manager', mocked_image_manager) Registry().register('image_manager', mocked_image_manager)
file_name = 'another%20test/slide1.png' file_name = 'another%20test/slide1.png'
full_path = os.path.normpath(os.path.join('thumbnails', file_name)) full_path = os.path.normpath(os.path.join('thumbnails', file_name))
@ -295,9 +294,12 @@ class TestRouter(TestCase, TestMixin):
self.assertEqual(self.router.end_headers.call_count, 1, 'end_headers called once') self.assertEqual(self.router.end_headers.call_count, 1, 'end_headers called once')
mocked_exists.assert_called_with(urllib.parse.unquote(full_path)) mocked_exists.assert_called_with(urllib.parse.unquote(full_path))
self.assertEqual(mocked_image_to_byte.call_count, 1, 'Called once') self.assertEqual(mocked_image_to_byte.call_count, 1, 'Called once')
mocked_image_manager.assert_called_any(os.path.normpath('thumbnails\\another test'), mocked_image_manager.add_image.assert_any_call(os.path.normpath(os.path.join('thumbnails', 'another test',
'slide1.png', None, '120x90') 'slide1.png')),
mocked_image_manager.assert_called_any(os.path.normpath('thumbnails\\another test'), 'slide1.png', '120x90') 'slide1.png', None, width, height)
mocked_image_manager.get_image.assert_any_call(os.path.normpath(os.path.join('thumbnails', 'another test',
'slide1.png')),
'slide1.png', width, height)
def remote_next_test(self): def remote_next_test(self):
""" """

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

@ -403,7 +403,7 @@ class TestEasyWorshipSongImport(TestCase):
# THEN: do_import should return None having called retrieve_windows_encoding with the correct encoding. # THEN: do_import should return None having called retrieve_windows_encoding with the correct encoding.
self.assertIsNone(importer.do_import(), 'do_import should return None when db_size is less than 0x800') self.assertIsNone(importer.do_import(), 'do_import should return None when db_size is less than 0x800')
mocked_retrieve_windows_encoding.assert_call(encoding) mocked_retrieve_windows_encoding.assert_any_call(encoding)
def db_file_import_test(self): def db_file_import_test(self):
""" """