From 2c9502418fbb0e695f60b64d51c3439eced1825f Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 12 Apr 2016 05:54:23 +0300 Subject: [PATCH] - Fixed PPT name tests by changing Powerpoint into PowerPoint - Replaced resources.py with trunk version. --- tests/functional/openlp_plugins/presentations/test_mediaitem.py | 2 +- .../openlp_plugins/presentations/test_powerpointcontroller.py | 2 +- .../openlp_plugins/presentations/test_pptviewcontroller.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/functional/openlp_plugins/presentations/test_mediaitem.py b/tests/functional/openlp_plugins/presentations/test_mediaitem.py index a689966ec..daa2886f6 100644 --- a/tests/functional/openlp_plugins/presentations/test_mediaitem.py +++ b/tests/functional/openlp_plugins/presentations/test_mediaitem.py @@ -69,7 +69,7 @@ class TestMediaItem(TestCase, TestMixin): self.media_item.controllers = { 'Impress': impress_controller, 'Powerpoint': presentation_controller, - 'Powerpoint Viewer': presentation_viewer_controller, + 'PowerPoint Viewer': presentation_viewer_controller, 'Pdf': pdf_controller } diff --git a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py index c6ddb8238..935aa7881 100644 --- a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py @@ -76,7 +76,7 @@ class TestPowerpointController(TestCase, TestMixin): controller = PowerpointController(plugin=self.mock_plugin) # THEN: The name of the presentation controller should be correct - self.assertEqual('Powerpoint', controller.name, + self.assertEqual('PowerPoint', controller.name, 'The name of the presentation controller should be correct') diff --git a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py index 104c0e1fa..d54379db7 100644 --- a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py @@ -76,7 +76,7 @@ class TestPptviewController(TestCase, TestMixin): controller = PptviewController(plugin=self.mock_plugin) # THEN: The name of the presentation controller should be correct - self.assertEqual('Powerpoint Viewer', controller.name, + self.assertEqual('PowerPoint Viewer', controller.name, 'The name of the presentation controller should be correct') def check_available_test(self):