openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/cleanup-tests into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)

For more details, see:
https://code.launchpad.net/~trb143/openlp/cleanup-tests/+merge/200451

Fixes for broken tests.
Still cannot find the segmentation fault as each file runs fine on it's own.
Fixed ThemeManager tests

Conflicts needed a re roll.
-- 
https://code.launchpad.net/~trb143/openlp/cleanup-tests/+merge/200451
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'tests/functional/openlp_core_common/test_registry.py'
--- tests/functional/openlp_core_common/test_registry.py	2013-12-28 21:33:38 +0000
+++ tests/functional/openlp_core_common/test_registry.py	2014-01-04 08:35:25 +0000
@@ -59,22 +59,18 @@
         with self.assertRaises(KeyError) as context:
             Registry().register('test1', mock_1)
         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
         # THEN I will get an exception
-        with self.assertRaises(KeyError) as context:
-            temp = Registry().get('test2')
-        self.assertEqual(context.exception.args[0], 'Service test2 not found in list',
-            'KeyError exception should have been thrown for missing service')
+        temp = Registry().get('test2')
+        self.assertEqual(temp, None, 'None should have been returned for missing service')
 
         # WHEN I try to replace a component I should be allowed (testing only)
         Registry().remove('test1')
         # THEN I will get an exception
-        with self.assertRaises(KeyError) as context:
-            temp = Registry().get('test1')
-        self.assertEqual(context.exception.args[0], 'Service test1 not found in list',
-            'KeyError exception should have been thrown for deleted service')
+        temp = Registry().get('test1')
+        self.assertEqual(temp, None, 'None should have been returned for deleted service')
 
     def registry_function_test(self):
         """

=== modified file 'tests/interfaces/openlp_core_ui/test_listpreviewwidget.py'
--- tests/interfaces/openlp_core_ui/test_listpreviewwidget.py	2013-12-13 17:44:05 +0000
+++ tests/interfaces/openlp_core_ui/test_listpreviewwidget.py	2014-01-04 08:35:25 +0000
@@ -38,7 +38,7 @@
 
     def initial_slide_count_test(self):
         """
-        Test the inital slide count.
+        Test the initial slide count .
         """
         # GIVEN: A new ListPreviewWidget instance.
         # WHEN: No SlideItem has been added yet.
@@ -47,7 +47,7 @@
 
     def initial_slide_number_test(self):
         """
-        Test the inital slide number.
+        Test the initial current slide number.
         """
         # GIVEN: A new ListPreviewWidget instance.
         # WHEN: No SlideItem has been added yet.

=== modified file 'tests/interfaces/openlp_core_ui/test_mainwindow.py'
--- tests/interfaces/openlp_core_ui/test_mainwindow.py	2013-12-13 17:44:05 +0000
+++ tests/interfaces/openlp_core_ui/test_mainwindow.py	2014-01-04 08:35:25 +0000
@@ -22,12 +22,13 @@
         # Mock cursor busy/normal methods.
         self.app.set_busy_cursor = MagicMock()
         self.app.set_normal_cursor = MagicMock()
-        self.app.args =[]
+        self.app.args = []
         Registry().register('application', self.app)
         # Mock classes and methods used by mainwindow.
         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.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.QtGui.QToolBox') as mocked_q_tool_box_class, \
                 patch('openlp.core.ui.mainwindow.QtGui.QMainWindow.addDockWidget') as mocked_add_dock_method, \
@@ -53,7 +54,7 @@
             mocked_value.side_effect = [True, 2]
 
             # 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.
             self.main_window.media_tool_box.setCurrentIndex.assert_called_with(2)

=== modified file 'tests/interfaces/openlp_core_ui/test_starttimedialog.py'
--- tests/interfaces/openlp_core_ui/test_starttimedialog.py	2013-12-13 17:44:05 +0000
+++ tests/interfaces/openlp_core_ui/test_starttimedialog.py	2014-01-04 08:35:25 +0000
@@ -34,28 +34,28 @@
         """
         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.hourSpinBox.maximum(), 4, 'The maximum hour should stay the same as the dialog')
-        self.assertEqual(self.form.minuteSpinBox.minimum(), 0,
-            'The minimum minute should stay the same as the dialog')
-        self.assertEqual(self.form.minuteSpinBox.maximum(), 59,
-            'The maximum minute should stay the same as the dialog')
-        self.assertEqual(self.form.secondSpinBox.minimum(), 0,
-            'The minimum second should stay the same as the dialog')
-        self.assertEqual(self.form.secondSpinBox.maximum(), 59,
-            'The maximum second should stay the same as the dialog')
-        self.assertEqual(self.form.hourFinishSpinBox.minimum(), 0,
-            'The minimum finish hour should stay the same as the dialog')
-        self.assertEqual(self.form.hourFinishSpinBox.maximum(), 4,
-            'The maximum finish hour should stay the same as the dialog')
-        self.assertEqual(self.form.minuteFinishSpinBox.minimum(), 0,
-            'The minimum finish minute should stay the same as the dialog')
-        self.assertEqual(self.form.minuteFinishSpinBox.maximum(), 59,
-            'The maximum finish minute should stay the same as the dialog')
-        self.assertEqual(self.form.secondFinishSpinBox.minimum(), 0,
-            'The minimum finish second should stay the same as the dialog')
-        self.assertEqual(self.form.secondFinishSpinBox.maximum(), 59,
-            'The maximum finish second 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.hour_spin_box.maximum(), 4, 'The maximum hour should stay the same as the dialog')
+        self.assertEqual(self.form.minute_spin_box.minimum(), 0,
+                         'The minimum minute should stay the same as the dialog')
+        self.assertEqual(self.form.minute_spin_box.maximum(), 59,
+                         'The maximum minute should stay the same as the dialog')
+        self.assertEqual(self.form.second_spin_box.minimum(), 0,
+                         'The minimum second should stay the same as the dialog')
+        self.assertEqual(self.form.second_spin_box.maximum(), 59,
+                         'The maximum second should stay the same as the dialog')
+        self.assertEqual(self.form.hour_finish_spin_box.minimum(), 0,
+                         'The minimum finish hour should stay the same as the dialog')
+        self.assertEqual(self.form.hour_finish_spin_box.maximum(), 4,
+                         'The maximum finish hour should stay the same as the dialog')
+        self.assertEqual(self.form.minute_finish_spin_box.minimum(), 0,
+                         'The minimum finish minute should stay the same as the dialog')
+        self.assertEqual(self.form.minute_finish_spin_box.maximum(), 59,
+                         'The maximum finish minute should stay the same as the dialog')
+        self.assertEqual(self.form.second_finish_spin_box.minimum(), 0,
+                         'The minimum finish second should stay the same as the dialog')
+        self.assertEqual(self.form.second_finish_spin_box.maximum(), 59,
+                         'The maximum finish second should stay the same as the dialog')
 
     def time_display_test(self):
         """
@@ -75,22 +75,22 @@
         QtTest.QTest.mouseClick(ok_widget, QtCore.Qt.LeftButton)
 
         # THEN the following input values are returned
-        self.assertEqual(self.form.hourSpinBox.value(), 0)
-        self.assertEqual(self.form.minuteSpinBox.value(), 1)
-        self.assertEqual(self.form.secondSpinBox.value(), 1)
+        self.assertEqual(self.form.hour_spin_box.value(), 0)
+        self.assertEqual(self.form.minute_spin_box.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')
 
         # WHEN displaying the UI, changing the time to 2min 3secs and pressing enter
         self.form.item = {'service_item': mocked_serviceitem}
         with patch('PyQt4.QtGui.QDialog.exec_'):
             self.form.exec_()
-        self.form.minuteSpinBox.setValue(2)
-        self.form.secondSpinBox.setValue(3)
+        self.form.minute_spin_box.setValue(2)
+        self.form.second_spin_box.setValue(3)
         ok_widget = self.form.button_box.button(self.form.button_box.Ok)
         QtTest.QTest.mouseClick(ok_widget, QtCore.Qt.LeftButton)
 
         # THEN the following values are returned
-        self.assertEqual(self.form.hourSpinBox.value(), 0)
-        self.assertEqual(self.form.minuteSpinBox.value(), 2)
-        self.assertEqual(self.form.secondSpinBox.value(), 3)
+        self.assertEqual(self.form.hour_spin_box.value(), 0)
+        self.assertEqual(self.form.minute_spin_box.value(), 2)
+        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')

=== modified file 'tests/interfaces/openlp_core_ui/test_thememanager.py'
--- tests/interfaces/openlp_core_ui/test_thememanager.py	2013-12-31 21:02:35 +0000
+++ tests/interfaces/openlp_core_ui/test_thememanager.py	2014-01-04 08:35:25 +0000
@@ -33,6 +33,8 @@
 from unittest import TestCase
 from tempfile import mkstemp
 
+from PyQt4 import QtGui
+
 from openlp.core.common import Registry, Settings
 from openlp.core.ui import ThemeManager
 from tests.functional import patch, MagicMock
@@ -48,6 +50,7 @@
         """
         fd, self.ini_file = mkstemp('.ini')
         Settings().set_filename(self.ini_file)
+        self.app = QtGui.QApplication([])
         Registry.create()
         self.theme_manager = ThemeManager()
 
@@ -57,6 +60,7 @@
         """
         os.unlink(self.ini_file)
         os.unlink(Settings().fileName())
+        del self.app
 
     def initialise_test(self):
         """