Changeset 53c771e in sasview for src/sas/qtgui/Plotting/UnitTesting/AddTextTest.py

Timestamp:

Nov 9, 2017 8:45:20 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:

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/Plotting/UnitTesting/AddTextTest.py (modified) (6 diffs)

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

@@ -3 +3 @@
 from unittest.mock import MagicMock
 
-from PyQt4 import QtGui
+from PyQt5 import QtGui, QtWidgets
 
 # set up import paths
@@ -11 +11 @@
 from sas.qtgui.Plotting.AddText import AddText
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class AddTextTest(unittest.TestCase):
@@ -27 +27 @@
     def testDefaults(self):
         '''Test the GUI in its default state'''
-        self.assertIsInstance(self.widget, QtGui.QDialog)
+        self.assertIsInstance(self.widget, QtWidgets.QDialog)
         self.assertIsInstance(self.widget._font, QtGui.QFont)
         self.assertEqual(self.widget._color, "black")
@@ -34 +34 @@
         '''Test the QFontDialog output'''
         font_1 = QtGui.QFont("Helvetica", 15)
-        QtGui.QFontDialog.getFont = MagicMock(return_value=(font_1, True))
+        QtWidgets.QFontDialog.getFont = MagicMock(return_value=(font_1, True))
         # Call the method
         self.widget.onFontChange(None)
@@ -42 +42 @@
         # See that rejecting the dialog doesn't modify the font
         font_2 = QtGui.QFont("Arial", 9)
-        QtGui.QFontDialog.getFont = MagicMock(return_value=(font_2, False))
+        QtWidgets.QFontDialog.getFont = MagicMock(return_value=(font_2, False))
         # Call the method
         self.widget.onFontChange(None)
@@ -51 +51 @@
         ''' Test the QColorDialog output'''
         new_color = QtGui.QColor("red")
-        QtGui.QColorDialog.getColor = MagicMock(return_value=new_color)
+        QtWidgets.QColorDialog.getColor = MagicMock(return_value=new_color)
         # Call the method
         self.widget.onColorChange(None)