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

Timestamp:

Nov 9, 2017 6: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 07:22:45)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:45:20)

Message:

Converted unit tests

File:

• src/sas/qtgui/Plotting/UnitTesting/ColorMapTest.py (modified) (7 diffs)

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

@@ -3 +3 @@
 import numpy
 
-from PyQt4 import QtGui
+from PyQt5 import QtGui, QtWidgets
 from unittest.mock import MagicMock
 import matplotlib as mpl
@@ -18 +18 @@
 from sas.qtgui.Plotting.ColorMap import ColorMap
 
-if not QtGui.QApplication.instance():
-    app = QtGui.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 class ColorMapTest(unittest.TestCase):
@@ -48 +48 @@
     def testDefaults(self):
         '''Test the GUI in its default state'''
-        self.assertIsInstance(self.widget, QtGui.QDialog)
+        self.assertIsInstance(self.widget, QtWidgets.QDialog)
 
         self.assertEqual(self.widget._cmap_orig, "jet")
-        self.assertEqual(len(self.widget.all_maps), 144)
-        self.assertEqual(len(self.widget.maps), 72)
-        self.assertEqual(len(self.widget.rmaps), 72)
+        self.assertEqual(len(self.widget.all_maps), 160)
+        self.assertEqual(len(self.widget.maps), 80)
+        self.assertEqual(len(self.widget.rmaps), 80)
 
         self.assertEqual(self.widget.lblWidth.text(), "0")
@@ -60 +60 @@
         self.assertEqual(self.widget.lblStopRadius.text(), "-1")
         self.assertFalse(self.widget.chkReverse.isChecked())
-        self.assertEqual(self.widget.cbColorMap.count(), 72)
-        self.assertEqual(self.widget.cbColorMap.currentIndex(), 60)
+        self.assertEqual(self.widget.cbColorMap.count(), 80)
+        self.assertEqual(self.widget.cbColorMap.currentIndex(), 64)
 
         # validators
@@ -70 +70 @@
         self.assertEqual(self.widget.txtMinAmplitude.text(), "0")
         self.assertEqual(self.widget.txtMaxAmplitude.text(), "100")
-        self.assertIsInstance(self.widget.slider, QtGui.QSlider)
+        self.assertIsInstance(self.widget.slider, QtWidgets.QSlider)
 
     def testOnReset(self):
@@ -111 +111 @@
 
         # Check the combobox
-        self.assertEqual(self.widget.cbColorMap.currentIndex(), 55)
+        self.assertEqual(self.widget.cbColorMap.currentIndex(), 59)
         self.assertFalse(self.widget.chkReverse.isChecked())
 
@@ -118 +118 @@
         self.widget.initMapCombobox()
         # Check the combobox
-        self.assertEqual(self.widget.cbColorMap.currentIndex(), 56)
+        self.assertEqual(self.widget.cbColorMap.currentIndex(), 60)
         self.assertTrue(self.widget.chkReverse.isChecked())