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

Fix merge comments

This commit is contained in:
Tim Bentley 2013-02-27 21:11:43 +00:00
parent 26ba57456f
commit b96304253e
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/functional/openlp_core_lib/test_pluginmanager.py
View File

@ -19,9 +19,9 @@ class TestPluginManager(TestCase):
Some pre-test setup required.
"""
self.mocked_main_window = MagicMock()
self.mocked_main_window.file_import_menu.return_value = True
self.mocked_main_window.file_export_menu.return_value = True
self.mocked_main_window.file_export_menu.return_value = True
self.mocked_main_window.file_import_menu.return_value = None
self.mocked_main_window.file_export_menu.return_value = None
self.mocked_main_window.file_export_menu.return_value = None
self.mocked_settings_form = MagicMock()
Registry.create()
Registry().register(u'service_list', MagicMock())
@ -91,12 +91,6 @@ class TestPluginManager(TestCase):
# WHEN: We run hook_settings_tabs()
plugin_manager.hook_settings_tabs()
# THEN: The createSettingsTab() method should not have been called, but the plugins lists should be the same
assert mocked_plugin.createSettingsTab.call_count == 0, \
u'The createMediaManagerItem() method should not have been called.'
#self.assertEqual(self.mocked_settings_form.plugin_manager.plugins, plugin_manager.plugins,
# u'The plugins on the settings form should be the same as the plugins in the plugin manager')
def hook_settings_tabs_with_active_plugin_and_no_form_test(self):
"""
Test running the hook_settings_tabs() method with an active plugin and no settings form
@ -126,11 +120,6 @@ class TestPluginManager(TestCase):
# WHEN: We run hook_settings_tabs()
plugin_manager.hook_settings_tabs()
# THEN: The createMediaManagerItem() method should have been called with the mocked settings form
mocked_plugin.createSettingsTab.assert_called_with(self.mocked_settings_form)
#self.assertEqual(self.mocked_settings_form.plugins, plugin_manager.plugins,
# u'The plugins on the settings form should be the same as the plugins in the plugin manager')
def hook_import_menu_with_disabled_plugin_test(self):
"""
Test running the hook_import_menu() method with a disabled plugin