Changeset 3e8dee3 in sasview for src/sas/qtgui/Plotting/UnitTesting/PlotPropertiesTest.py

Timestamp:

Nov 8, 2017 9:22:45 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:

0e80658

Parents:

412e069e

Message:

Converted unit tests

File:

• src/sas/qtgui/Plotting/UnitTesting/PlotPropertiesTest.py (modified) (5 diffs)

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

@@ -3 +3 @@
 from unittest.mock import MagicMock
 
-from PyQt4 import QtGui
+from PyQt5 import QtGui, QtWidgets
 
 # set up import paths
@@ -11 +11 @@
 from sas.qtgui.Plotting.PlotProperties import PlotProperties
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class PlotPropertiesTest(unittest.TestCase):
@@ -32 +32 @@
     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(), "Modify Plot Properties")
 
@@ -56 +56 @@
         '''Test the response to color change event'''
         # Accept the new color
-        QtGui.QColorDialog.getColor = MagicMock(return_value=QtGui.QColor(255, 0, 255))
+        QtWidgets.QColorDialog.getColor = MagicMock(return_value=QtGui.QColor(255, 0, 255))
 
         self.widget.onColorChange()
@@ -72 +72 @@
         # Cancel the dialog now
         bad_color = QtGui.QColor() # constructs an invalid color
-        QtGui.QColorDialog.getColor = MagicMock(return_value=bad_color)
+        QtWidgets.QColorDialog.getColor = MagicMock(return_value=bad_color)
         self.widget.onColorChange()