Changeset fd1ae6d1 in sasview for src/sas/qtgui/Perspectives/Fitting/UnitTesting

Timestamp:

May 18, 2017 9:05:27 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:

6964d44

Parents:

6066a3f

Message:

Fixes for structure factor chooser + minor refactoring in the FittingWidget?

File:

• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -219 +219 @@
         self.assertEqual(self.widget.cbStructureFactor.currentText(), STRUCTURE_DEFAULT)
 
-
-        # TODO once functionality fixed
-        ## Switch category to structure factor
-        #structure_index=self.widget.cbCategory.findText(CATEGORY_STRUCTURE)
-        #self.widget.cbCategory.setCurrentIndex(structure_index)
-        ## Choose the last factor
-        #last_index = self.widget.cbStructureFactor.count()
-        #self.widget.cbStructureFactor.setCurrentIndex(last_index-1)
+        # Switch category to structure factor
+        structure_index=self.widget.cbCategory.findText(CATEGORY_STRUCTURE)
+        self.widget.cbCategory.setCurrentIndex(structure_index)
+        # Observe the correct enablement
+        self.assertTrue(self.widget.cbStructureFactor.isEnabled())
+        self.assertFalse(self.widget.cbModel.isEnabled())
+        self.assertEqual(self.widget._model_model.rowCount(), 0)
+
+        # Choose the last factor
+        last_index = self.widget.cbStructureFactor.count()
+        self.widget.cbStructureFactor.setCurrentIndex(last_index-1)
+        # Do we have all the rows?
+        self.assertEqual(self.widget._model_model.rowCount(), 4)
+
+        # Are the command buttons properly enabled?
+        self.assertTrue(self.widget.cmdPlot.isEnabled())
+        self.assertFalse(self.widget.cmdFit.isEnabled())
 
     def testReadCategoryInfo(self):