From e6b4ec34ef5dc8566b43c3d455861865e5b6e3e4 Mon Sep 17 00:00:00 2001 From: Silke Schomann Date: Thu, 5 Dec 2024 10:43:33 +0000 Subject: [PATCH] Updated tests --- tests/workspacemanager_presenter_test.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/workspacemanager_presenter_test.py b/tests/workspacemanager_presenter_test.py index 6b127a6f..cdb491ba 100644 --- a/tests/workspacemanager_presenter_test.py +++ b/tests/workspacemanager_presenter_test.py @@ -2,7 +2,7 @@ import unittest import mock -from mock import call, patch, MagicMock +from mock import call, patch import numpy as np from mantid.api import AnalysisDataService @@ -438,12 +438,14 @@ def test_compose_error(self): def test_ensure_that_the_ads_observer_calls_delete_handle(self, _): presenter = WorkspaceManagerPresenter(self.view) - presenter.delete_handle = MagicMock() + presenter.delete_handle = mock.Mock() self.assertTrue(isinstance(presenter._ads_observer, MSliceADSObserver)) presenter._ads_observer = MSliceADSObserver( presenter.delete_handle, presenter.clear_handle, presenter.rename_handle ) + # Ensure ADS is empty before test + AnalysisDataService.clear() CreateSampleWorkspace(OutputWorkspace="ws", StoreInADS=True) AnalysisDataService.remove("ws") @@ -451,12 +453,14 @@ def test_ensure_that_the_ads_observer_calls_delete_handle(self, _): def test_ensure_that_the_ads_observer_calls_clear_handle(self, _): presenter = WorkspaceManagerPresenter(self.view) - presenter.clear_handle = MagicMock() + presenter.clear_handle = mock.Mock() self.assertTrue(isinstance(presenter._ads_observer, MSliceADSObserver)) presenter._ads_observer = MSliceADSObserver( presenter.delete_handle, presenter.clear_handle, presenter.rename_handle ) + # Ensure ADS is empty before test + AnalysisDataService.clear() CreateSampleWorkspace(OutputWorkspace="ws", StoreInADS=True) AnalysisDataService.clear() @@ -464,7 +468,7 @@ def test_ensure_that_the_ads_observer_calls_clear_handle(self, _): def test_ensure_that_the_ads_observer_calls_rename_handle(self, _): presenter = WorkspaceManagerPresenter(self.view) - presenter.rename_handle = MagicMock() + presenter.rename_handle = mock.Mock() self.assertTrue(isinstance(presenter._ads_observer, MSliceADSObserver)) presenter._ads_observer = MSliceADSObserver( presenter.delete_handle, presenter.clear_handle, presenter.rename_handle