Merge lp:~trb143/openlp/themecombo-24 into lp:openlp/2.4

[Tim Bentley]

Fix bug and fully test it.

lp:~trb143/openlp/themecombo-24 (revision 2649)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1730/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1641/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1579/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1339/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/929/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/997/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/865/

[Raoul Snyman (raoul-snyman)]

Personally, I prefer multiple tests for each state (you can use setUp to do the common stuff necessary), as opposed to multiple scenarios within the same test, but this works.

review: Approve

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2016-07-19 20:56:31 +0000
+++ openlp/core/ui/servicemanager.py	2016-08-13 04:56:47 +0000
@@ -1321,7 +1321,7 @@
         """
         The theme may have changed in the settings dialog so make sure the theme combo box is in the correct state.
         """
-        visible = self.renderer.theme_level == ThemeLevel.Global
+        visible = self.renderer.theme_level != ThemeLevel.Global
         self.toolbar.actions['theme_combo_box'].setVisible(visible)
         self.toolbar.actions['theme_label'].setVisible(visible)
         self.regenerate_service_items()
 
=== modified file 'tests/functional/openlp_core_ui/test_servicemanager.py'
--- tests/functional/openlp_core_ui/test_servicemanager.py	2016-07-19 20:56:31 +0000
+++ tests/functional/openlp_core_ui/test_servicemanager.py	2016-08-13 04:56:47 +0000
@@ -27,6 +27,7 @@
 
 from openlp.core.common import Registry, ThemeLevel
 from openlp.core.lib import ServiceItem, ServiceItemType, ItemCapabilities
+from openlp.core.lib.toolbar import OpenLPToolbar
 from openlp.core.ui import ServiceManager
 
 from tests.functional import MagicMock, patch
@@ -592,3 +593,41 @@
         # THEN: The "save_as" method is called to save the service
         self.assertTrue(result)
         mocked_save_file_as.assert_called_with()
+
+    @patch(u'openlp.core.ui.servicemanager.ServiceManager.regenerate_service_items')
+    def test_theme_change(self, mocked_regenerate_service_items):
+        """
+        Test that when a Toolbar theme combobox displays correctly
+        """
+        # GIVEN: A service manager, a service to save with a theme level of the renderer
+        mocked_renderer = MagicMock()
+        service_manager = ServiceManager(None)
+        Registry().register('renderer', mocked_renderer)
+        service_manager.toolbar = OpenLPToolbar(None)
+
+        service_manager.toolbar.add_toolbar_action('theme_combo_box', triggers=MagicMock())
+        service_manager.toolbar.add_toolbar_action('theme_label', triggers=MagicMock())
+
+        # WHEN: The service manager has a Global theme
+        mocked_renderer.theme_level = ThemeLevel.Global
+        result = service_manager.theme_change()
+
+        # THEN: The the theme toolbar should not be visible
+        self.assertFalse(service_manager.toolbar.actions['theme_combo_box'].isVisible(),
+                         'The visibility should be False')
+
+        # WHEN: The service manager has a Service theme
+        mocked_renderer.theme_level = ThemeLevel.Service
+        result = service_manager.theme_change()
+
+        # THEN: The the theme toolbar should not be visible
+        self.assertTrue(service_manager.toolbar.actions['theme_combo_box'].isVisible(),
+                        'The visibility should be True')
+
+        # WHEN: The service manager has a Song theme
+        mocked_renderer.theme_level = ThemeLevel.Song
+        result = service_manager.theme_change()
+
+        # THEN: The the theme toolbar should not be visible
+        self.assertTrue(service_manager.toolbar.actions['theme_combo_box'].isVisible(),
+                        'The visibility should be true')