From 67ab5082862cda6f248f0c0f7cf3078e760bd679 Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Sun, 20 Jul 2014 21:00:06 +0100 Subject: [PATCH] Tweeked test to use a call list --- tests/functional/openlp_core_lib/test_file_dialog.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/functional/openlp_core_lib/test_file_dialog.py b/tests/functional/openlp_core_lib/test_file_dialog.py index 875e422da..1190810da 100644 --- a/tests/functional/openlp_core_lib/test_file_dialog.py +++ b/tests/functional/openlp_core_lib/test_file_dialog.py @@ -5,7 +5,7 @@ from unittest import TestCase from openlp.core.common import UiStrings from openlp.core.lib.filedialog import FileDialog -from tests.functional import MagicMock, patch +from tests.functional import MagicMock, call, patch class TestFileDialog(TestCase): @@ -65,11 +65,9 @@ class TestFileDialog(TestCase): # THEN: os.path.exists should have been called with known args. QmessageBox.information should have been # called. The returned result should correlate with the input. - self.mocked_os.path.exists.assert_any_call('/Valid File') - self.mocked_os.path.exists.assert_any_call('/url%20encoded%20file%20%231') - self.mocked_os.path.exists.assert_any_call('/url encoded file #1') - self.mocked_os.path.exists.assert_any_call('/non-existing') - self.mocked_os.path.exists.assert_any_call('/non-existing') + call_list = [call('/Valid File'), call('/url%20encoded%20file%20%231'), call('/url encoded file #1'), + call('/non-existing'), call('/non-existing')] + self.mocked_os.path.exists.assert_has_calls(call_list) self.mocked_qt_gui.QmessageBox.information.called_with(self.mocked_parent, UiStrings().FileNotFound, UiStrings().FileNotFoundMessage % '/non-existing') self.assertEqual(result, ['/Valid File', '/url encoded file #1'], 'The returned file list is incorrect')