Changeset 53c771e in sasview for src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py
- Timestamp:
- Nov 9, 2017 6:45:20 AM (6 years ago)
- 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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py
r7fb471d r53c771e 3 3 import platform 4 4 5 from PyQt 4 import QtGui6 from PyQt 4import QtCore7 from matplotlib.backends.backend_qt 4agg import FigureCanvasQTAgg as FigureCanvas5 from PyQt5 import QtGui, QtWidgets, QtPrintSupport 6 from PyQt5 import QtCore 7 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas 8 8 from unittest.mock import MagicMock 9 9 from unittest.mock import patch … … 21 21 import sas.qtgui.Plotting.Plotter as Plotter 22 22 23 if not Qt Gui.QApplication.instance():24 app = Qt Gui.QApplication(sys.argv)23 if not QtWidgets.QApplication.instance(): 24 app = QtWidgets.QApplication(sys.argv) 25 25 26 26 … … 57 57 self.plotter.data = self.data 58 58 self.plotter.show() 59 FigureCanvas.draw = MagicMock()59 FigureCanvas.draw_idle = MagicMock() 60 60 61 61 self.plotter.plot(hide_error=False) 62 62 63 63 self.assertEqual(self.plotter.ax.get_xscale(), 'log') 64 self.assertTrue(FigureCanvas.draw.called) 64 self.assertTrue(FigureCanvas.draw_idle.called) 65 66 self.plotter.figure.clf() 65 67 66 68 def testPlotWithoutErrors(self): … … 68 70 self.plotter.data = self.data 69 71 self.plotter.show() 70 FigureCanvas.draw = MagicMock()72 FigureCanvas.draw_idle = MagicMock() 71 73 72 74 self.plotter.plot(hide_error=True) 73 75 74 76 self.assertEqual(self.plotter.ax.get_yscale(), 'log') 75 self.assertTrue(FigureCanvas.draw.called) 77 self.assertTrue(FigureCanvas.draw_idle.called) 78 self.plotter.figure.clf() 76 79 77 80 def testPlotWithSesans(self): … … 110 113 # Trigger Print Image and make sure the method is called 111 114 self.assertEqual(actions[1].text(), "Print Image") 112 Qt Gui.QPrintDialog.exec_ = MagicMock(return_value=QtGui.QDialog.Rejected)115 QtPrintSupport.QPrintDialog.exec_ = MagicMock(return_value=QtWidgets.QDialog.Rejected) 113 116 actions[1].trigger() 114 self.assertTrue(Qt Gui.QPrintDialog.exec_.called)117 self.assertTrue(QtPrintSupport.QPrintDialog.exec_.called) 115 118 116 119 # Trigger Copy to Clipboard and make sure the method is called … … 125 128 # Trigger Change Scale and make sure the method is called 126 129 self.assertEqual(actions[6].text(), "Change Scale") 127 self.plotter.properties.exec_ = MagicMock(return_value=Qt Gui.QDialog.Rejected)130 self.plotter.properties.exec_ = MagicMock(return_value=QtWidgets.QDialog.Rejected) 128 131 actions[6].trigger() 129 132 self.assertTrue(self.plotter.properties.exec_.called) … … 135 138 def done(): 136 139 self.clipboard_called = True 137 QtCore.QObject.connect(Qt Gui.qApp.clipboard(), QtCore.SIGNAL("dataChanged()"), done)140 QtCore.QObject.connect(QtWidgets.qApp.clipboard(), QtCore.SIGNAL("dataChanged()"), done) 138 141 actions[2].trigger() 139 Qt Gui.qApp.processEvents()142 QtWidgets.qApp.processEvents() 140 143 # Make sure clipboard got updated. 141 144 self.assertTrue(self.clipboard_called) … … 157 160 self.assertEqual(len(self.plotter.plot_dict), 1) 158 161 self.assertEqual(len(self.plotter.ax.collections), 1) 162 self.plotter.figure.clf() 159 163 160 164 def testAddText(self): … … 174 178 self.plotter.addText.color = MagicMock(return_value = test_color) 175 179 # Return OK from the dialog 176 self.plotter.addText.exec_ = MagicMock(return_value = Qt Gui.QDialog.Accepted)180 self.plotter.addText.exec_ = MagicMock(return_value = QtWidgets.QDialog.Accepted) 177 181 # Add text to graph 178 182 self.plotter.onAddText() … … 184 188 self.assertEqual(self.plotter.textList[0].get_fontproperties().get_family()[0], 'Arial') 185 189 self.assertEqual(self.plotter.textList[0].get_fontproperties().get_size(), 16) 190 self.plotter.figure.clf() 186 191 187 192 def testOnRemoveText(self): … … 193 198 self.plotter.addText.textEdit.setText(test_text) 194 199 # Return OK from the dialog 195 self.plotter.addText.exec_ = MagicMock(return_value = Qt Gui.QDialog.Accepted)200 self.plotter.addText.exec_ = MagicMock(return_value = QtWidgets.QDialog.Accepted) 196 201 # Add text to graph 197 202 self.plotter.onAddText() … … 209 214 self.plotter.onRemoveText() 210 215 self.assertEqual(self.plotter.textList, []) 216 self.plotter.figure.clf() 211 217 212 218 def testOnSetGraphRange(self): … … 216 222 self.plotter.plot(self.data) 217 223 self.plotter.show() 218 self.plotter.setRange.exec_ = MagicMock(return_value = Qt Gui.QDialog.Accepted)224 self.plotter.setRange.exec_ = MagicMock(return_value = QtWidgets.QDialog.Accepted) 219 225 self.plotter.setRange.xrange = MagicMock(return_value = new_x) 220 226 self.plotter.setRange.yrange = MagicMock(return_value = new_y) … … 225 231 self.assertEqual(self.plotter.ax.get_xlim(), new_x) 226 232 self.assertEqual(self.plotter.ax.get_ylim(), new_y) 233 self.plotter.figure.clf() 227 234 228 235 def testOnResetGraphRange(self): … … 236 243 237 244 # mock setRange methods 238 self.plotter.setRange.exec_ = MagicMock(return_value = Qt Gui.QDialog.Accepted)245 self.plotter.setRange.exec_ = MagicMock(return_value = QtWidgets.QDialog.Accepted) 239 246 self.plotter.setRange.xrange = MagicMock(return_value = new_x) 240 247 self.plotter.setRange.yrange = MagicMock(return_value = new_y) … … 249 256 self.assertNotEqual(self.plotter.ax.get_xlim(), new_x) 250 257 self.assertNotEqual(self.plotter.ax.get_ylim(), new_y) 258 self.plotter.figure.clf() 251 259 252 260 def testOnLinearFit(self): … … 254 262 self.plotter.plot(self.data) 255 263 self.plotter.show() 256 Qt Gui.QDialog.exec_ = MagicMock(return_value=QtGui.QDialog.Accepted)264 QtWidgets.QDialog.exec_ = MagicMock(return_value=QtWidgets.QDialog.Accepted) 257 265 258 266 # Just this one plot … … 261 269 262 270 # Check that exec_ got called 263 self.assertTrue(QtGui.QDialog.exec_.called) 271 self.assertTrue(QtWidgets.QDialog.exec_.called) 272 self.plotter.figure.clf() 264 273 265 274 def testOnRemovePlot(self): … … 296 305 # Assure the plotter window is closed 297 306 self.assertFalse(self.plotter.isVisible()) 298 307 self.plotter.figure.clf() 299 308 300 309 def testRemovePlot(self): … … 327 336 # The hide_error flag should also remain 328 337 self.assertTrue(self.plotter.plot_dict[2].hide_error) 338 self.plotter.figure.clf() 329 339 330 340 def testOnToggleHideError(self): … … 357 367 # The hide_error flag should toggle 358 368 self.assertEqual(self.plotter.plot_dict[2].hide_error, not error_status) 369 self.plotter.figure.clf() 359 370 360 371 def testOnFitDisplay(self): … … 373 384 self.plotter.plot.assert_called_with(data=self.plotter.fit_result, 374 385 hide_error=True, marker='-') 386 self.plotter.figure.clf() 375 387 376 388 def testReplacePlot(self): … … 410 422 # The hide_error flag should be as set 411 423 self.assertEqual(self.plotter.plot_dict[2].hide_error, error_status) 424 self.plotter.figure.clf() 412 425 413 426 def notestOnModifyPlot(self): … … 429 442 with patch('sas.qtgui.Plotting.PlotProperties.PlotProperties') as mock: 430 443 instance = mock.return_value 431 Qt Gui.QDialog.exec_ = MagicMock(return_value=QtGui.QDialog.Accepted)444 QtWidgets.QDialog.exec_ = MagicMock(return_value=QtWidgets.QDialog.Accepted) 432 445 instance.symbol.return_value = 7 433 446 434 447 self.plotter.onModifyPlot(2) 448 self.plotter.figure.clf() 435 449 436 450
Note: See TracChangeset
for help on using the changeset viewer.