Changeset 9208346 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Apr 9, 2017 6:16:37 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:

9687d58

Parents:

1970780

Message:

Fix failing unit tests

File:

• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingUtilitiesTest.py (modified) (3 diffs)

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

@@ -97 +97 @@
         barbell_parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
 
-        model = QtGui.QStandardItemModel()
-
-        FittingUtilities.addParametersToModel(barbell_parameters, model)
+        params = FittingUtilities.addParametersToModel(barbell_parameters, True)
 
         # Test the resulting model
-        self.assertEqual(model.rowCount(), 5)
-        self.assertTrue(model.item(0).isCheckable())
-        self.assertEqual(model.item(0).text(), "sld")
-        self.assertEqual(model.item(1).text(), "sld_solvent")
+        self.assertEqual(len(params), 7)
+        self.assertEqual(len(params[0]), 5)
+        self.assertTrue(params[0][0].isCheckable())
+        self.assertEqual(params[0][0].text(), "sld")
+        self.assertEqual(params[1][0].text(), "sld_solvent")
 
         # Use a multi-shell parameter to see that the method includes shell params
@@ -112 +111 @@
         multi_parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
 
-        model = QtGui.QStandardItemModel()
-
-        FittingUtilities.addParametersToModel(multi_parameters, model)
+        params = FittingUtilities.addParametersToModel(multi_parameters, False)
 
         # Test the resulting model
-        self.assertEqual(model.rowCount(), 3)
-        self.assertTrue(model.item(0).isCheckable())
-        self.assertEqual(model.item(0).text(), "sld_core")
-        self.assertEqual(model.item(1).text(), "radius")
-        self.assertEqual(model.item(2).text(), "sld_solvent")
+        self.assertEqual(len(params), 3)
+        self.assertEqual(len(params[0]), 5)
+        self.assertTrue(params[0][0].isCheckable())
+        self.assertEqual(params[0][0].text(), "sld_core")
+        self.assertEqual(params[1][0].text(), "radius")
 
     def testAddSimpleParametersToModel(self):
@@ -132 +129 @@
         multi_parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
 
-        model = QtGui.QStandardItemModel()
-
-        FittingUtilities.addParametersToModel(multi_parameters, model)
+        params = FittingUtilities.addParametersToModel(multi_parameters, True)
 
         # Test the resulting model
-        self.assertEqual(model.rowCount(), 3)
-        self.assertTrue(model.item(0).isCheckable())
-        self.assertEqual(model.item(0).text(), "sld_core")
-        self.assertEqual(model.item(1).text(), "radius")
+        self.assertEqual(len(params), 3)
+        self.assertEqual(len(params[0]), 5)
+        self.assertTrue(params[0][0].isCheckable())
+        self.assertEqual(params[0][0].text(), "sld_core")
+        self.assertEqual(params[1][0].text(), "radius")
 
     def testAddCheckedListToModel(self):