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

Fix up test failures

This commit is contained in:
Tim Bentley 2014-01-01 14:59:57 +00:00
parent 3a75e53fcf
commit 8518207417
6 changed files with 43 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/common/registry.py
View File

@ -80,7 +80,7 @@ class Registry(object):
else: else:
trace_error_handler(log) trace_error_handler(log)
log.error('Service %s not found in list' % key) log.error('Service %s not found in list' % key)
#raise KeyError('Service %s not found in list' % key) return None
def register(self, key, reference): def register(self, key, reference):
""" """

14
tests/functional/openlp_core_common/test_registry.py
View File

@ -59,22 +59,18 @@ class TestRegistry(TestCase):
with self.assertRaises(KeyError) as context: with self.assertRaises(KeyError) as context:
Registry().register('test1', mock_1) Registry().register('test1', mock_1)
self.assertEqual(context.exception.args[0], 'Duplicate service exception test1', self.assertEqual(context.exception.args[0], 'Duplicate service exception test1',
'KeyError exception should have been thrown for duplicate service') 'KeyError exception should have been thrown for duplicate service')
# WHEN I try to get back a non existent component # WHEN I try to get back a non existent component
# THEN I will get an exception # THEN I will get an exception
with self.assertRaises(KeyError) as context: temp = Registry().get('test2')
temp = Registry().get('test2') self.assertEqual(temp, None, 'KeyError error None should not have been returned for missing service')
self.assertEqual(context.exception.args[0], 'Service test2 not found in list',
'KeyError exception should have been thrown for missing service')
# WHEN I try to replace a component I should be allowed (testing only) # WHEN I try to replace a component I should be allowed (testing only)
Registry().remove('test1') Registry().remove('test1')
# THEN I will get an exception # THEN I will get an exception
with self.assertRaises(KeyError) as context: temp = Registry().get('test1')
temp = Registry().get('test1') self.assertEqual(temp, None, 'KeyError error None should have been returned for deleted service')
self.assertEqual(context.exception.args[0], 'Service test1 not found in list',
'KeyError exception should have been thrown for deleted service')
def registry_function_test(self): def registry_function_test(self):
""" """

4
tests/interfaces/openlp_core_ui/test_listpreviewwidget.py
View File

@ -38,7 +38,7 @@ class TestListPreviewWidget(TestCase):
def initial_slide_count_test(self): def initial_slide_count_test(self):
""" """
Test the inital slide count. Test the initial slide count .
""" """
# GIVEN: A new ListPreviewWidget instance. # GIVEN: A new ListPreviewWidget instance.
# WHEN: No SlideItem has been added yet. # WHEN: No SlideItem has been added yet.
@ -47,7 +47,7 @@ class TestListPreviewWidget(TestCase):
def initial_slide_number_test(self): def initial_slide_number_test(self):
""" """
Test the inital slide number. Test the initial current slide number.
""" """
# GIVEN: A new ListPreviewWidget instance. # GIVEN: A new ListPreviewWidget instance.
# WHEN: No SlideItem has been added yet. # WHEN: No SlideItem has been added yet.

7
tests/interfaces/openlp_core_ui/test_mainwindow.py
View File

@ -22,12 +22,13 @@ class TestMainWindow(TestCase):
# Mock cursor busy/normal methods. # Mock cursor busy/normal methods.
self.app.set_busy_cursor = MagicMock() self.app.set_busy_cursor = MagicMock()
self.app.set_normal_cursor = MagicMock() self.app.set_normal_cursor = MagicMock()
self.app.args =[] self.app.args = []
Registry().register('application', self.app) Registry().register('application', self.app)
# Mock classes and methods used by mainwindow. # Mock classes and methods used by mainwindow.
with patch('openlp.core.ui.mainwindow.SettingsForm') as mocked_settings_form, \ with patch('openlp.core.ui.mainwindow.SettingsForm') as mocked_settings_form, \
patch('openlp.core.ui.mainwindow.ImageManager') as mocked_image_manager, \ patch('openlp.core.ui.mainwindow.ImageManager') as mocked_image_manager, \
patch('openlp.core.ui.mainwindow.SlideController') as mocked_slide_controller, \ patch('openlp.core.ui.mainwindow.LiveController') as mocked_live_controller, \
patch('openlp.core.ui.mainwindow.PreviewController') as mocked_preview_controller, \
patch('openlp.core.ui.mainwindow.OpenLPDockWidget') as mocked_dock_widget, \ patch('openlp.core.ui.mainwindow.OpenLPDockWidget') as mocked_dock_widget, \
patch('openlp.core.ui.mainwindow.QtGui.QToolBox') as mocked_q_tool_box_class, \ patch('openlp.core.ui.mainwindow.QtGui.QToolBox') as mocked_q_tool_box_class, \
patch('openlp.core.ui.mainwindow.QtGui.QMainWindow.addDockWidget') as mocked_add_dock_method, \ patch('openlp.core.ui.mainwindow.QtGui.QMainWindow.addDockWidget') as mocked_add_dock_method, \
@ -53,7 +54,7 @@ class TestMainWindow(TestCase):
mocked_value.side_effect = [True, 2] mocked_value.side_effect = [True, 2]
# WHEN: Call the restore method. # WHEN: Call the restore method.
Registry().execute('bootstrap_post_set_up') self.main_window.restore_current_media_manager_item()
# THEN: The current widget should have been set. # THEN: The current widget should have been set.
self.main_window.media_tool_box.setCurrentIndex.assert_called_with(2) self.main_window.media_tool_box.setCurrentIndex.assert_called_with(2)

60
tests/interfaces/openlp_core_ui/test_starttimedialog.py
View File

@ -34,28 +34,28 @@ class TestStartTimeDialog(TestCase):
""" """
Test StartTimeDialog are defaults correct Test StartTimeDialog are defaults correct
""" """
self.assertEqual(self.form.hourSpinBox.minimum(), 0, 'The minimum hour should stay the same as the dialog') self.assertEqual(self.form.hour_spin_box.minimum(), 0, 'The minimum hour should stay the same as the dialog')
self.assertEqual(self.form.hourSpinBox.maximum(), 4, 'The maximum hour should stay the same as the dialog') self.assertEqual(self.form.hour_spin_box.maximum(), 4, 'The maximum hour should stay the same as the dialog')
self.assertEqual(self.form.minuteSpinBox.minimum(), 0, self.assertEqual(self.form.minute_spin_box.minimum(), 0,
'The minimum minute should stay the same as the dialog') 'The minimum minute should stay the same as the dialog')
self.assertEqual(self.form.minuteSpinBox.maximum(), 59, self.assertEqual(self.form.minute_spin_box.maximum(), 59,
'The maximum minute should stay the same as the dialog') 'The maximum minute should stay the same as the dialog')
self.assertEqual(self.form.secondSpinBox.minimum(), 0, self.assertEqual(self.form.second_spin_box.minimum(), 0,
'The minimum second should stay the same as the dialog') 'The minimum second should stay the same as the dialog')
self.assertEqual(self.form.secondSpinBox.maximum(), 59, self.assertEqual(self.form.second_spin_box.maximum(), 59,
'The maximum second should stay the same as the dialog') 'The maximum second should stay the same as the dialog')
self.assertEqual(self.form.hourFinishSpinBox.minimum(), 0, self.assertEqual(self.form.hour_finish_spin_box.minimum(), 0,
'The minimum finish hour should stay the same as the dialog') 'The minimum finish hour should stay the same as the dialog')
self.assertEqual(self.form.hourFinishSpinBox.maximum(), 4, self.assertEqual(self.form.hour_finish_spin_box.maximum(), 4,
'The maximum finish hour should stay the same as the dialog') 'The maximum finish hour should stay the same as the dialog')
self.assertEqual(self.form.minuteFinishSpinBox.minimum(), 0, self.assertEqual(self.form.minute_finish_spin_box.minimum(), 0,
'The minimum finish minute should stay the same as the dialog') 'The minimum finish minute should stay the same as the dialog')
self.assertEqual(self.form.minuteFinishSpinBox.maximum(), 59, self.assertEqual(self.form.minute_finish_spin_box.maximum(), 59,
'The maximum finish minute should stay the same as the dialog') 'The maximum finish minute should stay the same as the dialog')
self.assertEqual(self.form.secondFinishSpinBox.minimum(), 0, self.assertEqual(self.form.second_finish_spin_box.minimum(), 0,
'The minimum finish second should stay the same as the dialog') 'The minimum finish second should stay the same as the dialog')
self.assertEqual(self.form.secondFinishSpinBox.maximum(), 59, self.assertEqual(self.form.second_finish_spin_box.maximum(), 59,
'The maximum finish second should stay the same as the dialog') 'The maximum finish second should stay the same as the dialog')
def time_display_test(self): def time_display_test(self):
""" """
@ -75,22 +75,22 @@ class TestStartTimeDialog(TestCase):
QtTest.QTest.mouseClick(ok_widget, QtCore.Qt.LeftButton) QtTest.QTest.mouseClick(ok_widget, QtCore.Qt.LeftButton)
# THEN the following input values are returned # THEN the following input values are returned
self.assertEqual(self.form.hourSpinBox.value(), 0) self.assertEqual(self.form.hour_spin_box.value(), 0)
self.assertEqual(self.form.minuteSpinBox.value(), 1) self.assertEqual(self.form.minute_spin_box.value(), 1)
self.assertEqual(self.form.secondSpinBox.value(), 1) self.assertEqual(self.form.second_spin_box.value(), 1)
self.assertEqual(self.form.item['service_item'].start_time, 61, 'The start time should stay the same') self.assertEqual(self.form.item['service_item'].start_time, 61, 'The start time should stay the same')
# WHEN displaying the UI, changing the time to 2min 3secs and pressing enter # WHEN displaying the UI, changing the time to 2min 3secs and pressing enter
self.form.item = {'service_item': mocked_serviceitem} self.form.item = {'service_item': mocked_serviceitem}
with patch('PyQt4.QtGui.QDialog.exec_'): with patch('PyQt4.QtGui.QDialog.exec_'):
self.form.exec_() self.form.exec_()
self.form.minuteSpinBox.setValue(2) self.form.minute_spin_box.setValue(2)
self.form.secondSpinBox.setValue(3) self.form.second_spin_box.setValue(3)
ok_widget = self.form.button_box.button(self.form.button_box.Ok) ok_widget = self.form.button_box.button(self.form.button_box.Ok)
QtTest.QTest.mouseClick(ok_widget, QtCore.Qt.LeftButton) QtTest.QTest.mouseClick(ok_widget, QtCore.Qt.LeftButton)
# THEN the following values are returned # THEN the following values are returned
self.assertEqual(self.form.hourSpinBox.value(), 0) self.assertEqual(self.form.hour_spin_box.value(), 0)
self.assertEqual(self.form.minuteSpinBox.value(), 2) self.assertEqual(self.form.minute_spin_box.value(), 2)
self.assertEqual(self.form.secondSpinBox.value(), 3) self.assertEqual(self.form.second_spin_box.value(), 3)
self.assertEqual(self.form.item['service_item'].start_time, 123, 'The start time should have changed') self.assertEqual(self.form.item['service_item'].start_time, 123, 'The start time should have changed')

21
tests/interfaces/openlp_core_ui/test_thememanagerhelper.py
View File

@ -50,6 +50,7 @@ class TestThemeManagerHelper(TestCase):
Settings().set_filename(self.ini_file) Settings().set_filename(self.ini_file)
self.helper = ThemeManagerHelper() self.helper = ThemeManagerHelper()
self.helper.settings_section = "themes" self.helper.settings_section = "themes"
self.helper.log_debug = MagicMock()
def tearDown(self): def tearDown(self):
""" """
@ -58,26 +59,6 @@ class TestThemeManagerHelper(TestCase):
os.unlink(self.ini_file) os.unlink(self.ini_file)
os.unlink(Settings().fileName()) os.unlink(Settings().fileName())
def test_initialise(self):
"""
Test the thememanagerhelper initialise - basic test
"""
# GIVEN: A new a call to initialise
Settings().setValue('themes/global theme', 'my_theme')
self.helper.build_theme_path = MagicMock()
self.helper.load_first_time_themes = MagicMock()
# WHEN: the initialistion is run
self.helper.initialise()
# THEN:
self.assertEqual(1, self.helper.build_theme_path.call_count,
'The function build_theme_path should have been called')
self.assertEqual(1, self.helper.load_first_time_themes.call_count,
'The function load_first_time_themes should have been called only once')
self.assertEqual(self.helper.global_theme, 'my_theme',
'The global theme should have been set to my_theme')
def test_build_theme_path(self): def test_build_theme_path(self):
""" """
Test the thememanagerhelper build_theme_path - basic test Test the thememanagerhelper build_theme_path - basic test