From ea8497d559e33319efb5b08bef1a13db8e8b9081 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 21 Oct 2013 09:38:18 +0200 Subject: [PATCH] no need for MagicMock --- tests/functional/openlp_core_lib/test_htmlbuilder.py | 6 +++--- .../openlp_plugins/songs/forms/test_editsongform.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/functional/openlp_core_lib/test_htmlbuilder.py b/tests/functional/openlp_core_lib/test_htmlbuilder.py index ec8e3a4a3..0ffab5458 100644 --- a/tests/functional/openlp_core_lib/test_htmlbuilder.py +++ b/tests/functional/openlp_core_lib/test_htmlbuilder.py @@ -216,9 +216,9 @@ class Htmbuilder(TestCase): is_live = False background = None plugin = MagicMock() - plugin.get_display_css = MagicMock(return_value='plugin CSS') - plugin.get_display_javascript = MagicMock(return_value='plugin JS') - plugin.get_display_html = MagicMock(return_value='plugin HTML') + plugin.get_display_css.return_value = 'plugin CSS' + plugin.get_display_javascript.return_value = 'plugin JS' + plugin.get_display_html.return_value = 'plugin HTML' plugins = [plugin] # WHEN: Create the html. diff --git a/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py b/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py index 405ba5cf6..75907e3c8 100644 --- a/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py +++ b/tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py @@ -55,9 +55,9 @@ class TestEditSongForm(TestCase): self.form.verse_list_widget.rowCount = MagicMock(return_value=2) # Mock out the verse. first_verse = MagicMock() - first_verse.data = MagicMock(return_value='V1') + first_verse.data.return_value = 'V1' second_verse = MagicMock() - second_verse.data = MagicMock(return_value= 'V2') + second_verse.data.return_value = 'V2' self.form.verse_list_widget.item = MagicMock(side_effect=[first_verse, second_verse]) self.form._extract_verse_order = MagicMock(return_value=given_verse_order.split()) @@ -76,9 +76,9 @@ class TestEditSongForm(TestCase): self.form.verse_list_widget.rowCount = MagicMock(return_value=2) # Mock out the verse. first_verse = MagicMock() - first_verse.data = MagicMock(return_value='V1') + first_verse.data.return_value = 'V1' second_verse = MagicMock() - second_verse.data = MagicMock(return_value= 'V2') + second_verse.data.return_value = 'V2' self.form.verse_list_widget.item = MagicMock(side_effect=[first_verse, second_verse]) self.form._extract_verse_order = MagicMock(return_value=[given_verse_order]) @@ -98,7 +98,7 @@ class TestEditSongForm(TestCase): self.form.verse_list_widget.rowCount = MagicMock(return_value=1) # Mock out the verse. (We want a verse type to be returned). mocked_verse = MagicMock() - mocked_verse.data = MagicMock(return_value='V1') + mocked_verse.data.return_value = 'V1' self.form.verse_list_widget.item = MagicMock(return_value=mocked_verse) self.form._extract_verse_order = MagicMock(return_value=[]) self.form.verse_order_edit.text = MagicMock(return_value=given_verse_order)