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

Timestamp:

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

dd150ef

Parents:

d6b8a1d

git-author:

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

git-committer:

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

Message:

Converted unit tests

File:

• src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py (modified) (13 diffs)

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

@@ -4 +4 @@
 import platform
 
-from PyQt4 import QtGui
-from PyQt4 import QtCore
-from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
+from PyQt5 import QtGui, QtWidgets, QtPrintSupport
+from PyQt5 import QtCore
+from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
 from unittest.mock import MagicMock
 from mpl_toolkits.mplot3d import Axes3D
@@ -20 +20 @@
 import sas.qtgui.Plotting.Plotter2D as Plotter2D
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class Plotter2DTest(unittest.TestCase):
@@ -53 +53 @@
     def tearDown(self):
         '''destroy'''
+        self.plotter.figure.clf()
         self.plotter = None
 
@@ -73 +74 @@
 
         self.assertTrue(FigureCanvas.draw_idle.called)
+        self.plotter.figure.clf()
 
     def testCalculateDepth(self):
@@ -94 +96 @@
         self.plotter.show()
 
-        QtGui.QDialog.exec_ = MagicMock(return_value=QtGui.QDialog.Accepted)
+        QtWidgets.QDialog.exec_ = MagicMock(return_value=QtWidgets.QDialog.Accepted)
 
         # Just this one plot
@@ -100 +102 @@
 
         # Check that exec_ got called
-        self.assertTrue(QtGui.QDialog.exec_.called)
+        self.assertTrue(QtWidgets.QDialog.exec_.called)
 
         self.assertEqual(self.plotter.cmap, "jet")
         self.assertAlmostEqual(self.plotter.vmin, 0.1, 6)
         self.assertAlmostEqual(self.plotter.vmax, 1e+20, 6)
+        self.plotter.figure.clf()
 
     def testOnToggleScale(self):
@@ -115 +118 @@
 
         self.assertTrue(FigureCanvas.draw_idle.called)
+        self.plotter.figure.clf()
 
     def testOnBoxSum(self):
@@ -135 +139 @@
         self.assertTrue(self.plotter.boxwidget.isVisible())
         self.assertIsInstance(self.plotter.boxwidget.model, QtGui.QStandardItemModel)
+        self.plotter.figure.clf()
 
     def testContextMenuQuickPlot(self):
@@ -151 +156 @@
         # Trigger Print Image and make sure the method is called
         self.assertEqual(actions[1].text(), "Print Image")
-        QtGui.QPrintDialog.exec_ = MagicMock(return_value=QtGui.QDialog.Rejected)
+        QtPrintSupport.QPrintDialog.exec_ = MagicMock(return_value=QtWidgets.QDialog.Rejected)
         actions[1].trigger()
-        self.assertTrue(QtGui.QPrintDialog.exec_.called)
+        self.assertTrue(QtPrintSupport.QPrintDialog.exec_.called)
 
         # Trigger Copy to Clipboard and make sure the method is called
@@ -176 +181 @@
         def done():
             self.clipboard_called = True
-        QtCore.QObject.connect(QtGui.qApp.clipboard(), QtCore.SIGNAL("dataChanged()"), done)
+        QtCore.QObject.connect(QtWidgets.qApp.clipboard(), QtCore.SIGNAL("dataChanged()"), done)
         actions[2].trigger()
-        QtGui.qApp.processEvents()
+        QtWidgets.qApp.processEvents()
         # Make sure clipboard got updated.
         self.assertTrue(self.clipboard_called)
+        self.plotter.figure.clf()
 
     def testShowNoPlot(self):
@@ -200 +206 @@
         self.assertFalse(FigureCanvas.draw_idle.called)
         self.assertFalse(FigureCanvas.draw.called)
+        self.plotter.figure.clf()
 
     def testShow3DPlot(self):
@@ -220 +227 @@
         self.assertTrue(Axes3D.plot_surface.called)
         self.assertTrue(FigureCanvas.draw.called)
+        self.plotter.figure.clf()
 
     def testShow2DPlot(self):
@@ -238 +246 @@
                               zmax=None)
         self.assertTrue(FigureCanvas.draw_idle.called)
+        self.plotter.figure.clf()