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

src/sas/qtgui/MainWindow/UnitTesting/MainWindowTest.py

@@ -1 +1 @@
 import sys
 import unittest
+import logging
 
-from PyQt4 import QtGui
-from PyQt4 import QtTest
-from PyQt4 import QtCore
+from PyQt5 import QtGui, QtWidgets
+from PyQt5 import QtTest
+from PyQt5 import QtCore
 from unittest.mock import MagicMock
 
@@ -13 +14 @@
 from sas.qtgui.MainWindow.MainWindow import MainSasViewWindow
 from sas.qtgui.MainWindow.MainWindow import SplashScreen
+from sas.qtgui.MainWindow.GuiManager import GuiManager
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class MainWindowTest(unittest.TestCase):
@@ -30 +32 @@
     def testDefaults(self):
         """Test the GUI in its default state"""
-        self.assertIsInstance(self.widget, QtGui.QMainWindow)
-        self.assertIsInstance(self.widget.centralWidget(), QtGui.QWorkspace)
+        self.assertIsInstance(self.widget, QtWidgets.QMainWindow)
+        self.assertIsInstance(self.widget.centralWidget(), QtWidgets.QMdiArea)
         
     def testSplashScreen(self):
         """ Test the splash screen """
         splash = SplashScreen()
-        self.assertIsInstance(splash, QtGui.QSplashScreen)
+        self.assertIsInstance(splash, QtWidgets.QSplashScreen)
 
     def testExit(self):
@@ -44 +46 @@
         # Must mask sys.exit, otherwise the whole testing process stops.
         sys.exit = MagicMock()
-        QtGui.QMessageBox.question = MagicMock(return_value=QtGui.QMessageBox.Yes)
+        QtWidgets.QMessageBox.question = MagicMock(return_value=QtWidgets.QMessageBox.Yes)
 
         # Open, then close the main window
@@ -51 +53 @@
 
         # See that the MessageBox method got called
-        self.assertTrue(QtGui.QMessageBox.question.called)
+        self.assertTrue(QtWidgets.QMessageBox.question.called)
        
 if __name__ == "__main__":