Changeset 53c771e in sasview for src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

Timestamp:

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

git-committer:

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

Message:

Converted unit tests

File:

• src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py (modified) (11 diffs)

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -3 +3 @@
 import numpy
 import unittest
-from PyQt4 import QtGui
-from PyQt4.QtTest import QTest
-
-from PyQt4.QtCore import Qt
+from PyQt5 import QtGui, QtWidgets
+from PyQt5.QtTest import QTest
+
+from PyQt5.QtCore import Qt
 from unittest.mock import MagicMock
 from unittest.mock import patch
@@ -15 +15 @@
 from mpl_toolkits.mplot3d import Axes3D
 from UnitTesting.TestUtils import QtSignalSpy
-from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
+from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
 from sas.qtgui.Calculators.GenericScatteringCalculator import GenericScatteringCalculator
 from sas.qtgui.Calculators.GenericScatteringCalculator import Plotter3D
@@ -24 +24 @@
 from sas.sascalc.calculator import sas_gen
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
-
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class GenericScatteringCalculatorTest(unittest.TestCase):
@@ -46 +45 @@
     def testDefaults(self):
         """Test the GUI in its default state"""
-        self.assertIsInstance(self.widget, QtGui.QWidget)
+        self.assertIsInstance(self.widget, QtWidgets.QWidget)
         self.assertEqual(self.widget.windowTitle(), "Generic SAS Calculator")
 
@@ -175 +174 @@
         """
         filename = os.path.join("UnitTesting", "sld_file.sld")
-        QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
+        QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=[filename, ''])
         self.widget.loadFile()
 
@@ -239 +238 @@
         filename = os.path.join("UnitTesting", "diamdsml.pdb")
 
-        QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
+        QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=[filename, ''])
         self.widget.loadFile()
 
@@ -302 +301 @@
         filename = os.path.join("UnitTesting", "A_Raw_Example-1.omf")
 
-        QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
+        QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=[filename, ''])
         self.widget.loadFile()
         self.assertEqual(self.widget.cmdLoad.text(), 'Loading...')
@@ -369 +368 @@
         filename = os.path.join("UnitTesting", "diamdsml.pdb")
 
-        QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
+        QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=[filename, ''])
         self.widget.loadFile()
         time.sleep(1)
@@ -388 +387 @@
         self.assertFalse(self.widget.cmdDraw.isEnabled())
         filename = os.path.join("UnitTesting", "diamdsml.pdb")
-        QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
+        QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=[filename,''])
         self.widget.loadFile()
         self.assertEqual(self.widget.cmdLoad.text(), 'Loading...')
         time.sleep(1)
+
         self.assertTrue(self.widget.cmdDraw.isEnabled())
         QTest.mouseClick(self.widget.cmdDraw, Qt.LeftButton)
@@ -408 +408 @@
         filename = os.path.join("UnitTesting", "sld_file.sld")
 
-        QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
+        QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=[filename, ''])
         self.widget.loadFile()
 
@@ -414 +414 @@
 
         filename1 = "test"
-        QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=filename1)
+        QtWidgets.QFileDialog.getSaveFileName = MagicMock(return_value=[filename1, ''])
 
         QTest.mouseClick(self.widget.cmdSave, Qt.LeftButton)