Changeset 239214f in sasview for src/sas/qtgui/UnitTesting

Timestamp:

Jan 13, 2017 9:23:38 AM (8 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:

0f3c22d

Parents:

2e3e959

Message:

Remove graph properties - MPL dialog is enough.
Minor fix in Plot Properties (WP review)

File:

• src/sas/qtgui/UnitTesting/PlotPropertiesTest.py (modified) (2 diffs)

src/sas/qtgui/UnitTesting/PlotPropertiesTest.py

@@ -18 +18 @@
         '''Create the PlotProperties'''
 
-        self.widget = PlotProperties(None, 
+        self.widget = PlotProperties(None,
                          color=1,
                          marker=3,
@@ -36 +36 @@
         # Check the combo boxes
         self.assertEqual(self.widget.cbColor.currentText(), "Green")
+        self.assertEqual(self.widget.cbColor.count(), 7)
         self.assertEqual(self.widget.cbShape.currentText(), "Triangle Down")
         self.assertEqual(self.widget.txtLegend.text(), "LL")
         self.assertEqual(self.widget.sbSize.value(), 10)
+
+    def testDefaultsWithCustomColor(self):
+        '''Test the GUI when called with custom color'''
+        widget = PlotProperties(None,
+                         color="#FF00FF",
+                         marker=7,
+                         marker_size=10,
+                         legend="LL")
+
+        self.assertEqual(widget.cbColor.currentText(), "Custom")
+        self.assertEqual(widget.cbColor.count(), 8)
         
     def testOnColorChange(self):