Changeset 3e8dee3 in sasview for src/sas/qtgui/Plotting/UnitTesting/PlotterTest.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/PlotterTest.py (modified) (24 diffs)

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

@@ -3 +3 @@
 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 unittest.mock import patch
@@ -21 +21 @@
 import sas.qtgui.Plotting.Plotter as Plotter
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 
@@ -57 +57 @@
         self.plotter.data = self.data
         self.plotter.show()
-        FigureCanvas.draw = MagicMock()
+        FigureCanvas.draw_idle = MagicMock()
 
         self.plotter.plot(hide_error=False)
 
         self.assertEqual(self.plotter.ax.get_xscale(), 'log')
-        self.assertTrue(FigureCanvas.draw.called)
+        self.assertTrue(FigureCanvas.draw_idle.called)
+
+        self.plotter.figure.clf()
 
     def testPlotWithoutErrors(self):
@@ -68 +70 @@
         self.plotter.data = self.data
         self.plotter.show()
-        FigureCanvas.draw = MagicMock()
+        FigureCanvas.draw_idle = MagicMock()
 
         self.plotter.plot(hide_error=True)
 
         self.assertEqual(self.plotter.ax.get_yscale(), 'log')
-        self.assertTrue(FigureCanvas.draw.called)
+        self.assertTrue(FigureCanvas.draw_idle.called)
+        self.plotter.figure.clf()
 
     def testCreateContextMenuQuick(self):
@@ -89 +92 @@
         # 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
@@ -104 +107 @@
         # Trigger Change Scale and make sure the method is called
         self.assertEqual(actions[6].text(), "Change Scale")
-        self.plotter.properties.exec_ = MagicMock(return_value=QtGui.QDialog.Rejected)
+        self.plotter.properties.exec_ = MagicMock(return_value=QtWidgets.QDialog.Rejected)
         actions[6].trigger()
         self.assertTrue(self.plotter.properties.exec_.called)
@@ -114 +117 @@
         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)
@@ -136 +139 @@
         self.assertEqual(len(self.plotter.plot_dict), 1)
         self.assertEqual(len(self.plotter.ax.collections), 1)
+        self.plotter.figure.clf()
 
     def testAddText(self):
@@ -153 +157 @@
         self.plotter.addText.color = MagicMock(return_value = test_color)
         # Return OK from the dialog
-        self.plotter.addText.exec_ = MagicMock(return_value = QtGui.QDialog.Accepted)
+        self.plotter.addText.exec_ = MagicMock(return_value = QtWidgets.QDialog.Accepted)
         # Add text to graph
         self.plotter.onAddText()
@@ -163 +167 @@
         self.assertEqual(self.plotter.textList[0].get_fontproperties().get_family()[0], 'Arial')
         self.assertEqual(self.plotter.textList[0].get_fontproperties().get_size(), 16)
+        self.plotter.figure.clf()
 
     def testOnRemoveText(self):
@@ -172 +177 @@
         self.plotter.addText.textEdit.setText(test_text)
         # Return OK from the dialog
-        self.plotter.addText.exec_ = MagicMock(return_value = QtGui.QDialog.Accepted)
+        self.plotter.addText.exec_ = MagicMock(return_value = QtWidgets.QDialog.Accepted)
         # Add text to graph
         self.plotter.onAddText()
@@ -188 +193 @@
         self.plotter.onRemoveText()
         self.assertEqual(self.plotter.textList, [])
+        self.plotter.figure.clf()
 
     def testOnSetGraphRange(self):
@@ -195 +201 @@
         self.plotter.plot(self.data)
         self.plotter.show()
-        self.plotter.setRange.exec_ = MagicMock(return_value = QtGui.QDialog.Accepted)
+        self.plotter.setRange.exec_ = MagicMock(return_value = QtWidgets.QDialog.Accepted)
         self.plotter.setRange.xrange = MagicMock(return_value = new_x)
         self.plotter.setRange.yrange = MagicMock(return_value = new_y)
@@ -204 +210 @@
         self.assertEqual(self.plotter.ax.get_xlim(), new_x)
         self.assertEqual(self.plotter.ax.get_ylim(), new_y)
+        self.plotter.figure.clf()
 
     def testOnResetGraphRange(self):
@@ -215 +222 @@
 
         # mock setRange methods
-        self.plotter.setRange.exec_ = MagicMock(return_value = QtGui.QDialog.Accepted)
+        self.plotter.setRange.exec_ = MagicMock(return_value = QtWidgets.QDialog.Accepted)
         self.plotter.setRange.xrange = MagicMock(return_value = new_x)
         self.plotter.setRange.yrange = MagicMock(return_value = new_y)
@@ -228 +235 @@
         self.assertNotEqual(self.plotter.ax.get_xlim(), new_x)
         self.assertNotEqual(self.plotter.ax.get_ylim(), new_y)
+        self.plotter.figure.clf()
 
     def testOnLinearFit(self):
@@ -233 +241 @@
         self.plotter.plot(self.data)
         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
@@ -240 +248 @@
 
         # Check that exec_ got called
-        self.assertTrue(QtGui.QDialog.exec_.called)
+        self.assertTrue(QtWidgets.QDialog.exec_.called)
+        self.plotter.figure.clf()
 
     def testOnRemovePlot(self):
@@ -275 +284 @@
         # Assure the plotter window is closed
         self.assertFalse(self.plotter.isVisible())
-
+        self.plotter.figure.clf()
 
     def testRemovePlot(self):
@@ -306 +315 @@
         # The hide_error flag should also remain
         self.assertTrue(self.plotter.plot_dict[2].hide_error)
+        self.plotter.figure.clf()
 
     def testOnToggleHideError(self):
@@ -336 +346 @@
         # The hide_error flag should toggle
         self.assertEqual(self.plotter.plot_dict[2].hide_error, not error_status)
+        self.plotter.figure.clf()
 
     def testOnFitDisplay(self):
@@ -352 +363 @@
         self.plotter.plot.assert_called_with(data=self.plotter.fit_result,
                                              hide_error=True, marker='-')
+        self.plotter.figure.clf()
 
     def testReplacePlot(self):
@@ -389 +401 @@
         # The hide_error flag should be as set
         self.assertEqual(self.plotter.plot_dict[2].hide_error, error_status)
+        self.plotter.figure.clf()
 
     def notestOnModifyPlot(self):
@@ -408 +421 @@
         with patch('sas.qtgui.Plotting.PlotProperties.PlotProperties') as mock:
             instance = mock.return_value
-            QtGui.QDialog.exec_ = MagicMock(return_value=QtGui.QDialog.Accepted)
+            QtWidgets.QDialog.exec_ = MagicMock(return_value=QtWidgets.QDialog.Accepted)
             instance.symbol.return_value = 7
 
             self.plotter.onModifyPlot(2)
+        self.plotter.figure.clf()