From 53daf226f2bd43e47b39e8bc78bb0927bb9550b9 Mon Sep 17 00:00:00 2001
From: Matthew Andrew <matthew.andrew@stfc.ac.uk>
Date: Tue, 18 Dec 2018 10:20:54 +0000
Subject: [PATCH] Updated failing unit tests Re #23642
---
scripts/test/Muon/load_run_widget/loadrun_model_test.py | 6 +++---
.../load_run_widget/loadrun_presenter_current_run_test.py | 2 +-
.../loadrun_presenter_increment_decrement_test.py | 8 ++++----
.../loadrun_presenter_multiple_file_test.py | 2 +-
.../load_run_widget/loadrun_presenter_single_file_test.py | 2 +-
scripts/test/Muon/load_run_widget/loadrun_view_test.py | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/scripts/test/Muon/load_run_widget/loadrun_model_test.py b/scripts/test/Muon/load_run_widget/loadrun_model_test.py
index af6527e5cc6..087d139ace5 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_model_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_model_test.py
@@ -32,7 +32,7 @@ class LoadRunWidgetModelTest(unittest.TestCase):
self.assertEqual(model.loaded_filenames, [])
self.assertEqual(model.loaded_runs, [])
- @mock.patch('Muon.GUI.Common.load_run_widget.model.load_utils')
+ @mock.patch('Muon.GUI.Common.load_run_widget.load_run_model.load_utils')
def test_execute_successfully_loads_valid_files(self, load_utils_mock):
# Mock the load algorithm
files = [r'EMU00019489.nxs', r'EMU00019490.nxs', r'EMU00019491.nxs']
@@ -51,7 +51,7 @@ class LoadRunWidgetModelTest(unittest.TestCase):
self.assertEqual(model.loaded_runs[1], 19490)
self.assertEqual(model.loaded_runs[2], 19491)
- @mock.patch('Muon.GUI.Common.load_run_widget.model.load_utils')
+ @mock.patch('Muon.GUI.Common.load_run_widget.load_run_model.load_utils')
def test_model_is_cleared_correctly(self, load_utils_mock):
files = [r'EMU00019489.nxs', r'EMU00019490.nxs', r'EMU00019491.nxs']
load_return_vals = [([1, 2, 3], filename, 19489 + i) for i, filename in enumerate(files)]
@@ -68,7 +68,7 @@ class LoadRunWidgetModelTest(unittest.TestCase):
self.assertEqual(model.loaded_filenames, [])
self.assertEqual(model.loaded_runs, [])
- @mock.patch('Muon.GUI.Common.load_run_widget.model.load_utils')
+ @mock.patch('Muon.GUI.Common.load_run_widget.load_run_model.load_utils')
def test_execute_throws_if_one_file_does_not_load_correctly_but_still_loads_other_files(self, load_utils_mock):
files = [r'EMU00019489.nxs', r'EMU00019490.nxs', r'EMU00019491.nxs']
load_return_vals = [([1, 2, 3], 19489 + i, filename) for i, filename in enumerate(files)]
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
index 5d0a66750d7..b71d69ef04b 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_current_run_test.py
@@ -61,7 +61,7 @@ class LoadRunWidgetLoadCurrentRunTest(unittest.TestCase):
fileUtils.get_current_run_filename = mock.Mock(return_value="EMU0001234.nxs")
- patcher = mock.patch('Muon.GUI.Common.load_run_widget.model.load_utils')
+ patcher = mock.patch('Muon.GUI.Common.load_run_widget.load_run_model.load_utils')
self.addCleanup(patcher.stop)
self.load_utils_patcher = patcher.start()
self.load_utils_patcher.exception_message_for_failed_files.return_value = ''
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py
index ab6e993aee1..bef049ff167 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_increment_decrement_test.py
@@ -7,9 +7,9 @@
import sys
import os
-from Muon.GUI.Common.load_run_widget.model import LoadRunWidgetModel
-from Muon.GUI.Common.load_run_widget.view import LoadRunWidgetView
-from Muon.GUI.Common.load_run_widget.presenter import LoadRunWidgetPresenter
+from Muon.GUI.Common.load_run_widget.load_run_model import LoadRunWidgetModel
+from Muon.GUI.Common.load_run_widget.load_run_view import LoadRunWidgetView
+from Muon.GUI.Common.load_run_widget.load_run_presenter import LoadRunWidgetPresenter
from Muon.GUI.Common import mock_widget
from Muon.GUI.Common.muon_load_data import MuonLoadData
@@ -52,7 +52,7 @@ class LoadRunWidgetIncrementDecrementSingleFileModeTest(unittest.TestCase):
self.presenter.enable_multiple_files(False)
self.presenter.set_current_instrument("EMU")
- patcher = mock.patch('Muon.GUI.Common.load_run_widget.model.load_utils')
+ patcher = mock.patch('Muon.GUI.Common.load_run_widget.load_run_model.load_utils')
self.addCleanup(patcher.stop)
self.load_utils_patcher = patcher.start()
self.load_utils_patcher.exception_message_for_failed_files.return_value = ''
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
index 73d90b81afe..4be4e419c4a 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_multiple_file_test.py
@@ -54,7 +54,7 @@ class LoadRunWidgetIncrementDecrementMultipleFileModeTest(unittest.TestCase):
self.presenter.enable_multiple_files(True)
self.presenter.set_current_instrument("EMU")
- patcher = mock.patch('Muon.GUI.Common.load_run_widget.model.load_utils')
+ patcher = mock.patch('Muon.GUI.Common.load_run_widget.load_run_model.load_utils')
self.addCleanup(patcher.stop)
self.load_utils_patcher = patcher.start()
self.load_utils_patcher.exception_message_for_failed_files.return_value = ''
diff --git a/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py b/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py
index b52c19477dc..69bb25d0d83 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_presenter_single_file_test.py
@@ -51,7 +51,7 @@ class LoadRunWidgetPresenterTest(unittest.TestCase):
self.presenter.enable_multiple_files(False)
self.presenter.set_current_instrument("EMU")
- patcher = mock.patch('Muon.GUI.Common.load_run_widget.model.load_utils')
+ patcher = mock.patch('Muon.GUI.Common.load_run_widget.load_run_model.load_utils')
self.addCleanup(patcher.stop)
self.load_utils_patcher = patcher.start()
self.load_utils_patcher.exception_message_for_failed_files.return_value = ''
diff --git a/scripts/test/Muon/load_run_widget/loadrun_view_test.py b/scripts/test/Muon/load_run_widget/loadrun_view_test.py
index 28ebbc61702..2588cb058dd 100644
--- a/scripts/test/Muon/load_run_widget/loadrun_view_test.py
+++ b/scripts/test/Muon/load_run_widget/loadrun_view_test.py
@@ -1,4 +1,4 @@
-from Muon.GUI.Common.load_run_widget.view import LoadRunWidgetView
+from Muon.GUI.Common.load_run_widget.load_run_view import LoadRunWidgetView
import unittest
from Muon.GUI.Common import mock_widget
--
GitLab