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

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/Plotting/UnitTesting

Files:

• AddTextTest.py (modified) (1 diff)
• BoxSumTest.py (modified) (1 diff)
• ColorMapTest.py (modified) (1 diff)
• LinearFitTest.py (modified) (1 diff)
• PlotPropertiesTest.py (modified) (1 diff)
• Plotter2DTest.py (modified) (2 diffs)
• PlotterBaseTest.py (modified) (2 diffs)
• PlotterTest.py (modified) (2 diffs)
• ScalePropertiesTest.py (modified) (1 diff)
• SetGraphRangeTest.py (modified) (1 diff)
• SlicerModelTest.py (modified) (1 diff)
• SlicerParametersTest.py (modified) (1 diff, 1 prop)
• WindowTitleTest.py (modified) (3 diffs)

src/sas/qtgui/Plotting/UnitTesting/AddTextTest.py

@@ -11 +11 @@
 from sas.qtgui.Plotting.AddText import AddText
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class AddTextTest(unittest.TestCase):

src/sas/qtgui/Plotting/UnitTesting/BoxSumTest.py

@@ -12 +12 @@
 from sas.qtgui.Plotting.BoxSum import BoxSum
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class BoxSumTest(unittest.TestCase):

src/sas/qtgui/Plotting/UnitTesting/ColorMapTest.py

@@ -18 +18 @@
 from sas.qtgui.Plotting.ColorMap import ColorMap
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class ColorMapTest(unittest.TestCase):

src/sas/qtgui/Plotting/UnitTesting/LinearFitTest.py

@@ -15 +15 @@
 from sas.qtgui.Plotting.LinearFit import LinearFit
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class LinearFitTest(unittest.TestCase):

src/sas/qtgui/Plotting/UnitTesting/PlotPropertiesTest.py

@@ -11 +11 @@
 from sas.qtgui.Plotting.PlotProperties import PlotProperties
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class PlotPropertiesTest(unittest.TestCase):

src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py

@@ -19 +19 @@
 import sas.qtgui.Plotting.Plotter2D as Plotter2D
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class Plotter2DTest(unittest.TestCase):
@@ -159 +160 @@
         def done():
             self.clipboard_called = True
-        QtCore.QObject.connect(app.clipboard(), QtCore.SIGNAL("dataChanged()"), done)
+        QtCore.QObject.connect(QtGui.qApp.clipboard(), QtCore.SIGNAL("dataChanged()"), done)
         actions[2].trigger()
         QtGui.qApp.processEvents()

src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py

@@ -20 +20 @@
 import sas.qtgui.Plotting.PlotterBase as PlotterBase
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class PlotterBaseTest(unittest.TestCase):
@@ -149 +150 @@
         def done():
             self.clipboard_called = True
-        QtCore.QObject.connect(app.clipboard(), QtCore.SIGNAL("dataChanged()"), done)
+        QtCore.QObject.connect(QtGui.qApp.clipboard(), QtCore.SIGNAL("dataChanged()"), done)
         actions[2].trigger()
         QtGui.qApp.processEvents()

src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

@@ -20 +20 @@
 import sas.qtgui.Plotting.Plotter as Plotter
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 
@@ -97 +98 @@
         def done():
             self.clipboard_called = True
-        QtCore.QObject.connect(app.clipboard(), QtCore.SIGNAL("dataChanged()"), done)
+        QtCore.QObject.connect(QtGui.qApp.clipboard(), QtCore.SIGNAL("dataChanged()"), done)
         actions[2].trigger()
         QtGui.qApp.processEvents()

src/sas/qtgui/Plotting/UnitTesting/ScalePropertiesTest.py

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

src/sas/qtgui/Plotting/UnitTesting/SetGraphRangeTest.py

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

src/sas/qtgui/Plotting/UnitTesting/SlicerModelTest.py

@@ -12 +12 @@
 from sas.qtgui.Plotting.SlicerModel import SlicerModel
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class SlicerModelTest(unittest.TestCase):

src/sas/qtgui/Plotting/UnitTesting/SlicerParametersTest.py

@@ -18 +18 @@
 from sas.qtgui.Plotting.SlicerParameters import SlicerParameters
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class SlicerParametersTest(unittest.TestCase):

src/sas/qtgui/Plotting/UnitTesting/WindowTitleTest.py

@@ -10 +10 @@
 from sas.qtgui.Plotting.WindowTitle import WindowTitle
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class WindowTitleTest(unittest.TestCase):
@@ -32 +33 @@
         '''Modify the title'''
         self.widget.show()
-        app.processEvents()
+        QtGui.qApp.processEvents()
         # make sure we have the pre-set title
         self.assertEqual(self.widget.txtTitle.text(), "some title")
@@ -38 +39 @@
         self.widget.txtTitle.clear()
         self.widget.txtTitle.setText("5 elephants")
-        app.processEvents()
+        QtGui.qApp.processEvents()
         # Retrieve value
         new_title = self.widget.title()