Changeset 99ea1b0 in sasview for src/sas/qtgui/Calculators/UnitTesting

Timestamp:

Oct 27, 2017 8:49:35 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

0849aec

Parents:

895e7359

Message:

Update for unit tests and minor functionality quirks

Location:

src/sas/qtgui/Calculators/UnitTesting

Files:

• DataOperationUtilityTest.py (modified) (1 diff)
• DensityCalculatorTest.py (modified) (1 diff)
• GenericScatteringCalculatorTest.py (modified) (1 diff)
• ResolutionCalculatorPanelTest.py (modified) (1 diff)
• SLDCalculatorTest.py (modified) (1 diff)
• SlitSizeCalculatorTest.py (modified) (1 diff, 1 prop)

src/sas/qtgui/Calculators/UnitTesting/DataOperationUtilityTest.py

@@ -8 +8 @@
 from PyQt4.QtTest import QTest
 from PyQt4.QtCore import Qt
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 from twisted.internet import threads

src/sas/qtgui/Calculators/UnitTesting/DensityCalculatorTest.py

@@ -6 +6 @@
 from PyQt4.QtTest import QTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 ####### TEMP

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -7 +7 @@
 
 from PyQt4.QtCore import Qt
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 # set up import paths

src/sas/qtgui/Calculators/UnitTesting/ResolutionCalculatorPanelTest.py

@@ -8 +8 @@
 from PyQt4.QtTest import QTest
 from PyQt4.QtCore import Qt
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
 
 from twisted.internet import threads

src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py

@@ -6 +6 @@
 from PyQt4.QtTest import QTest
 from PyQt4 import QtCore
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 ####### TEMP

src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

@@ -4 +4 @@
 from PyQt4.QtTest import QTest
 from PyQt4.QtCore import Qt
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths