Changeset 53c771e in sasview for src/sas/qtgui/Calculators/UnitTesting/ResolutionCalculatorPanelTest.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/ResolutionCalculatorPanelTest.py (modified) (4 diffs)

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

@@ -4 +4 @@
 import logging
 import unittest
-from PyQt4 import QtGui
-from PyQt4 import QtCore
-from PyQt4.QtTest import QTest
-from PyQt4.QtCore import Qt
+from PyQt5 import QtGui, QtWidgets
+from PyQt5 import QtCore
+from PyQt5.QtTest import QTest
+from PyQt5.QtCore import Qt
 from unittest.mock import MagicMock
 
@@ -27 +27 @@
 
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 
@@ -47 +47 @@
         """Test the GUI in its default state"""
 
-        self.assertIsInstance(self.widget, QtGui.QDialog)
+        self.assertIsInstance(self.widget, QtWidgets.QDialog)
         self.assertEqual(self.widget.windowTitle(), "Q Resolution Estimator")
         # size
@@ -230 +230 @@
     def testOnSelectCustomSpectrum(self):
         """ Test Custom Spectrum: load file if 'Add New' """
-        QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=None)
+        QtWidgets.QFileDialog.getOpenFileName = MagicMock(return_value=("",""))
         self.widget.cbCustomSpectrum.setCurrentIndex(1)
 
         # Test the getOpenFileName() dialog called once
-        self.assertTrue(QtGui.QFileDialog.getOpenFileName.called)
-        QtGui.QFileDialog.getOpenFileName.assert_called_once()
+        self.assertTrue(QtWidgets.QFileDialog.getOpenFileName.called)
+        QtWidgets.QFileDialog.getOpenFileName.assert_called_once()
 
     def testHelp(self):