Changeset 53c771e in sasview for src/sas/qtgui/Plotting/UnitTesting/LinearFitTest.py

Timestamp:

Nov 9, 2017 6:45:20 AM (6 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:

dd150ef

Parents:

d6b8a1d

git-author:

Piotr Rozyczko <rozyczko@…> (11/08/17 07:22:45)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:45:20)

Message:

Converted unit tests

File:

• src/sas/qtgui/Plotting/UnitTesting/LinearFitTest.py (modified) (6 diffs)

src/sas/qtgui/Plotting/UnitTesting/LinearFitTest.py

@@ -3 +3 @@
 import numpy
 
-from PyQt4 import QtGui
+from PyQt5 import QtGui, QtWidgets
 from unittest.mock import MagicMock
+
+from UnitTesting.TestUtils import QtSignalSpy
 
 # set up import paths
@@ -15 +17 @@
 from sas.qtgui.Plotting.LinearFit import LinearFit
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class LinearFitTest(unittest.TestCase):
@@ -36 +38 @@
     def testDefaults(self):
         '''Test the GUI in its default state'''
-        self.assertIsInstance(self.widget, QtGui.QDialog)
+        self.assertIsInstance(self.widget, QtWidgets.QDialog)
         self.assertEqual(self.widget.windowTitle(), "Linear Fit")
         self.assertEqual(self.widget.txtA.text(), "1")
@@ -48 +50 @@
         '''Test the fitting wrapper '''
         # Catch the update signal
-        self.widget.parent.emit = MagicMock()
+        #self.widget.updatePlot.emit = MagicMock()
+        #self.widget.updatePlot.emit = MagicMock()
+        spy_update = QtSignalSpy(self.widget, self.widget.updatePlot)
 
         # Set some initial values
@@ -57 +61 @@
         # Run the fitting
         self.widget.fit(None)
-        return_values = self.widget.parent.emit.call_args[0][1]
+
+        # Expected one spy instance
+        self.assertEqual(spy_update.count(), 1)
+
+        return_values = spy_update.called()[0]['args'][0]
         # Compare
         self.assertCountEqual(return_values[0], [1.0, 3.0])
@@ -66 +74 @@
         self.widget.x_is_log = True
         self.widget.fit(None)
-        return_values = self.widget.parent.emit.call_args[0][1]
+        self.assertEqual(spy_update.count(), 2)
+        return_values = spy_update.called()[1]['args'][0]
         # Compare
         self.assertCountEqual(return_values[0], [1.0, 3.0])