From 668864c38d474ca3e56c7e984f0553f9a44d8027 Mon Sep 17 00:00:00 2001 From: Stewart Becker Date: Tue, 22 Jul 2014 21:06:48 +0100 Subject: [PATCH] Tidy up tests and formatting --- .../functional/openlp_core_lib/test_htmlbuilder.py | 14 ++++++++++++-- .../openlp_core_ui/test_slidecontroller.py | 10 +++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tests/functional/openlp_core_lib/test_htmlbuilder.py b/tests/functional/openlp_core_lib/test_htmlbuilder.py index a68e14061..e98dfc687 100644 --- a/tests/functional/openlp_core_lib/test_htmlbuilder.py +++ b/tests/functional/openlp_core_lib/test_htmlbuilder.py @@ -13,7 +13,6 @@ from openlp.core.lib.theme import HorizontalType, VerticalType from tests.functional import MagicMock, patch from tests.helpers.testmixin import TestMixin - HTML = """ @@ -216,7 +215,6 @@ class Htmbuilder(TestCase, TestMixin): """ self.destroy_settings() - def build_html_test(self): """ Test the build_html() function @@ -342,6 +340,18 @@ class Htmbuilder(TestCase, TestMixin): # THEN: THE css should be the same. assert FOOTER_CSS == css, 'The footer strings should be equal.' + def build_footer_css_wrap_test(self): + """ + Test the build_footer_css() function + """ + # GIVEN: Create a theme. + item = MagicMock() + item.footer = QtCore.QRect(10, 921, 1260, 103) + item.theme_data.font_footer_name = 'Arial' + item.theme_data.font_footer_size = 12 + item.theme_data.font_footer_color = '#FFFFFF' + height = 1024 + # WHEN: Settings say that footer should wrap Settings().setValue('themes/wrap footer', True) css = build_footer_css(item, height) diff --git a/tests/functional/openlp_core_ui/test_slidecontroller.py b/tests/functional/openlp_core_ui/test_slidecontroller.py index ea68b8ae9..1d241a317 100644 --- a/tests/functional/openlp_core_ui/test_slidecontroller.py +++ b/tests/functional/openlp_core_ui/test_slidecontroller.py @@ -504,7 +504,6 @@ class TestSlideController(TestCase): mocked_item = MagicMock() mocked_item.is_command.return_value = True mocked_item.name = 'Mocked Item' - mocked_execute = MagicMock() mocked_update_preview = MagicMock() mocked_preview_widget = MagicMock() mocked_slide_selected = MagicMock() @@ -516,10 +515,10 @@ class TestSlideController(TestCase): slide_controller.preview_widget = mocked_preview_widget slide_controller.slide_selected = mocked_slide_selected slide_controller.is_live = True - + # WHEN: The method is called slide_controller.on_slide_selected_index([9]) - + # THEN: It should have sent a notification mocked_item.is_command.assert_called_once_with() mocked_execute.assert_called_once_with('mocked item_slide', [mocked_item, True, 9]) @@ -535,7 +534,6 @@ class TestSlideController(TestCase): mocked_item = MagicMock() mocked_item.is_command.return_value = False mocked_item.name = 'Mocked Item' - mocked_execute = MagicMock() mocked_update_preview = MagicMock() mocked_preview_widget = MagicMock() mocked_slide_selected = MagicMock() @@ -546,7 +544,7 @@ class TestSlideController(TestCase): slide_controller.update_preview = mocked_update_preview slide_controller.preview_widget = mocked_preview_widget slide_controller.slide_selected = mocked_slide_selected - + # WHEN: The method is called slide_controller.on_slide_selected_index([7]) @@ -556,5 +554,3 @@ class TestSlideController(TestCase): self.assertEqual(0, mocked_update_preview.call_count, 'Update preview should not have been called') mocked_preview_widget.change_slide.assert_called_once_with(7) mocked_slide_selected.assert_called_once_with() - -