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

Timestamp:

Mar 23, 2017 9:53:10 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:

9934e48

Parents:

29eb947

Message:

FittingWidget? code review SASVIEW-561

Location:

src/sas/qtgui/Perspectives/Fitting/UnitTesting

Files:

• FittingUtilitiesTest.py (modified) (2 diffs)
• FittingWidgetTest.py (modified) (11 diffs)

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

@@ -114 +114 @@
 
         # Test the resulting model
-        self.assertEqual(model.rowCount(), 5)
+        self.assertEqual(model.rowCount(), 3)
         self.assertTrue(model.item(0).isCheckable())
         self.assertEqual(model.item(0).text(), "sld_core")
-        self.assertFalse(model.item(3).hasChildren())
         self.assertEqual(model.item(1).text(), "radius")
         self.assertEqual(model.item(2).text(), "sld_solvent")
-        self.assertEqual(model.item(3).text(), "sld1")
-
-        self.assertEqual(model.item(4).text(), "thickness1")
-        self.assertTrue(model.item(4).hasChildren())
 
     def testAddSimpleParametersToModel(self):
@@ -139 +134 @@
 
         # Test the resulting model
-        self.assertEqual(model.rowCount(), 5)
+        self.assertEqual(model.rowCount(), 3)
         self.assertTrue(model.item(0).isCheckable())
         self.assertEqual(model.item(0).text(), "sld_core")

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

@@ -165 +165 @@
 
         # invoke the method by changing the index
-        self.widget.cbCategory.setCurrentIndex(1)
+        category_index = self.widget.cbCategory.findText("Shape-Independent")
+        self.widget.cbCategory.setCurrentIndex(category_index)
 
         # test the model combo content
@@ -190 +191 @@
         self.widget.show()
         # Change the category index so we have some models
-        self.widget.cbCategory.setCurrentIndex(1)
+        category_index = self.widget.cbCategory.findText("Shape-Independent")
+        self.widget.cbCategory.setCurrentIndex(category_index)
 
         # check the enablement of controls
@@ -202 +204 @@
         self.widget.SASModelToQModel = MagicMock()
         self.widget.createDefaultDataset = MagicMock()
-        self.widget.calculateDataForModel = MagicMock()
+        self.widget.calculateQGridForModel = MagicMock()
         # 
         # Now change the model
@@ -211 +213 @@
         self.assertTrue(self.widget.createDefaultDataset.called)
         self.assertTrue(self.widget.SASModelToQModel.called)
-        self.assertFalse(self.widget.calculateDataForModel.called)
+        self.assertFalse(self.widget.calculateQGridForModel.called)
 
         # Let's set a dummy index on widget
@@ -219 +221 @@
         self.assertEqual(self.widget.cbModel.currentText(),'be_polyelectrolyte')
 
-        # Observe calculateDataForModel called
-        self.assertTrue(self.widget.calculateDataForModel.called)
+        # Observe calculateQGridForModel called
+        self.assertTrue(self.widget.calculateQGridForModel.called)
 
     def testSelectFactor(self):
@@ -228 +230 @@
         self.widget.show()
         # Change the category index so we have some models
-        self.widget.cbCategory.setCurrentIndex(1)
+        category_index = self.widget.cbCategory.findText("Shape-Independent")
+        self.widget.cbCategory.setCurrentIndex(category_index)
         # Change the model to one that supports structure factors
         model_index = self.widget.cbModel.findText('fractal_core_shell')
@@ -296 +299 @@
         # Check the index
 
-    def testCalculateDataForModel(self):
+    def testCalculateQGridForModel(self):
         """
         Check that the fitting 1D data object is ready
@@ -303 +306 @@
         threads.deferToThread = MagicMock()
         # Call the tested method
-        self.widget.calculateDataForModel()
+        self.widget.calculateQGridForModel()
         # Test the mock
         self.assertTrue(threads.deferToThread.called)
@@ -328 +331 @@
         self.widget.show()
         # Change the category index so we have a model with no poly
-        self.widget.cbCategory.setCurrentIndex(1)
+        category_index = self.widget.cbCategory.findText("Shape-Independent")
+        self.widget.cbCategory.setCurrentIndex(category_index)
         # Check the poly model
         self.assertEqual(self.widget._poly_model.rowCount(), 0)
@@ -356 +360 @@
         self.widget.show()
         # Change the category index so we have a model available
-        self.widget.cbCategory.setCurrentIndex(2)
+        category_index = self.widget.cbCategory.findText("Shapes")
+        self.widget.cbCategory.setCurrentIndex(category_index)
 
         # Check the magnetic model
@@ -384 +389 @@
         self.widget.show()
         # Change the model to multi shell
-        self.widget.cbCategory.setCurrentIndex(2)
-        self.widget.cbModel.setCurrentIndex(4)
+        category_index = self.widget.cbCategory.findText("Shapes")
+        self.widget.cbCategory.setCurrentIndex(category_index)
+        model_index = self.widget.cbModel.findText("core_multi_shell")
+        self.widget.cbModel.setCurrentIndex(model_index)
 
         # Assure we have the combobox available