Changeset 464cd07 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Aug 22, 2017 5:59:29 AM (7 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:

b2a5042

Parents:

457d961

Message:

Use singleton QApplication in unit tests to avoid issues on Ubuntu. SASVIEW-485

Location:

src/sas/qtgui/MainWindow/UnitTesting

Files:

• AboutBoxTest.py (modified) (7 diffs)
• DataExplorerTest.py (modified) (3 diffs)
• DroppableDataLoadWidgetTest.py (modified) (1 diff)
• GuiManagerTest.py (modified) (1 diff)
• MainWindowTest.py (modified) (1 diff)
• WelcomePanelTest.py (modified) (1 diff)

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

@@ -3 +3 @@
 import webbrowser
 
-from PyQt4.QtGui import *
+from PyQt4 import QtGui
 from PyQt4.QtTest import QTest
-from PyQt4.QtCore import *
+from PyQt4 import QtCore
 from mock import MagicMock
 
@@ -15 +15 @@
 import sas.qtgui.Utilities.LocalConfig as LocalConfig
 
-app = QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class AboutBoxTest(unittest.TestCase):
@@ -30 +31 @@
     def testDefaults(self):
         '''Test the GUI in its default state'''
-        self.assertIsInstance(self.widget, QWidget)
+        self.assertIsInstance(self.widget, QtGui.QWidget)
         self.assertEqual(self.widget.windowTitle(), "About")
         self.assertEqual(self.widget.cmdOK.text(), "OK")
@@ -44 +45 @@
         """
         version = self.widget.lblVersion
-        self.assertIsInstance(version, QLabel)
+        self.assertIsInstance(version, QtGui.QLabel)
         self.assertEqual(str(version.text()), str(LocalConfig.__version__))
 
@@ -52 +53 @@
         """
         about = self.widget.lblAbout
-        self.assertIsInstance(about, QLabel)
+        self.assertIsInstance(about, QtGui.QLabel)
         # build version
         self.assertIn(str(LocalConfig.__build__), about.text())
@@ -82 +83 @@
 
         # Press the buttons
-        buttonList = self.widget.findChildren(QPushButton)
+        buttonList = self.widget.findChildren(QtGui.QPushButton)
         for button in buttonList:
-            QTest.mouseClick(button, Qt.LeftButton)
+            QTest.mouseClick(button, QtCore.Qt.LeftButton)
             #open_link = webbrowser.open.call_args
             args, _ = webbrowser.open.call_args
@@ -96 +97 @@
         self.assertTrue(self.widget.isVisible())
         # Click on the OK button
-        QTest.mouseClick(self.widget.cmdOK, Qt.LeftButton)
+        QTest.mouseClick(self.widget.cmdOK, QtCore.Qt.LeftButton)
         # assure the widget is no longer seen
         self.assertFalse(self.widget.isVisible())

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

@@ -25 +25 @@
 import sas.qtgui.Plotting.PlotHelper as PlotHelper
 
-app = QApplication(sys.argv)
+if not QApplication.instance():
+    app = QApplication(sys.argv)
 
 class DataExplorerTest(unittest.TestCase):
@@ -441 +442 @@
         # Click on the Help button
         QTest.mouseClick(button1, Qt.LeftButton)
-        qApp.processEvents()
+        QtGui.qApp.processEvents()
 
         # Check the browser
@@ -450 +451 @@
         # Click on the Help_2 button
         QTest.mouseClick(button2, Qt.LeftButton)
-        qApp.processEvents()
+        QtGui.qApp.processEvents()
         # Check the browser
         self.assertIn(partial_url, str(self.form._helpView.url()))

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

@@ -13 +13 @@
 from sas.qtgui.UnitTesting.TestUtils import QtSignalSpy
 
-app = QApplication(sys.argv)
+if not QApplication.instance():
+    app = QApplication(sys.argv)
 
 class DroppableDataLoadWidgetTest(unittest.TestCase):

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

@@ -24 +24 @@
 from sas.qtgui.UnitTesting.TestUtils import QtSignalSpy
 
-app = QApplication(sys.argv)
+if not QApplication.instance():
+    app = QApplication(sys.argv)
 
 class GuiManagerTest(unittest.TestCase):

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

@@ -14 +14 @@
 from sas.qtgui.MainWindow.MainWindow import SplashScreen
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class MainWindowTest(unittest.TestCase):

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

@@ -10 +10 @@
 from sas.qtgui.MainWindow.WelcomePanel import WelcomePanel
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class WelcomePanelTest(unittest.TestCase):