Changeset 144fe21 in sasview for src/sas/qtgui/Calculators/UnitTesting

Timestamp:

Jul 26, 2018 5:30:15 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

dc71408

Parents:

e793f62

git-author:

Piotr Rozyczko <rozyczko@…> (07/26/18 05:28:51)

git-committer:

Piotr Rozyczko <rozyczko@…> (07/26/18 05:30:15)

Message:

new unit test runner script + test fixes. SASVIEW-970

Location:

src/sas/qtgui/Calculators/UnitTesting

Files:

• ResolutionCalculatorPanelTest.py (modified) (3 diffs)
• SLDCalculatorTest.py (modified) (1 diff)

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

@@ -12 +12 @@
 from twisted.internet import threads
 
-# from UnitTesting.TestUtils import QtSignalSpy
-# from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
+from sas.qtgui.Utilities.GuiUtils import Communicate
 from sas.qtgui.Calculators.ResolutionCalculatorPanel \
     import ResolutionCalculatorPanel
-
-# from sas.qtgui.MainWindow.DataManager import DataManager
-# from sas.qtgui.MainWindow.GuiManager import GuiManager
-# from sas.qtgui.Utilities.GuiUtils import *
-
 
 BG_COLOR_ERR = 'background-color: rgb(244, 170, 164);'
@@ -34 +28 @@
     """Test the ResolutionCalculator"""
     def setUp(self):
+        class dummy_manager(object):
+            communicator = Communicate()
         """Create the ResolutionCalculator"""
-        self.widget = ResolutionCalculatorPanel(None)
+        self.widget = ResolutionCalculatorPanel(dummy_manager())
 
         # self.widget.onCompute = MagicMock()
@@ -41 +37 @@
     def tearDown(self):
         """Destroy the ResolutionCalculator"""
+        if self.widget.plotter is not None:
+            self.widget.plotter.close()
         self.widget.close()
         self.widget = None

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

@@ -20 +20 @@
 import sas.qtgui.Utilities.LocalConfig
 
-#if not QtWidgets.QApplication.instance():
-#    app = QtWidgets.QApplication(sys.argv)
-app = QtWidgets.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class SldResultTest(unittest.TestCase):