Changeset 9934e48 in sasview

Timestamp:

Mar 24, 2017 1:21:15 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:

a0f5c36

Parents:

b1e36a3

Message:

Update unit tests for the current JSON

File:

• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (10 diffs)

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

@@ -165 +165 @@
 
         # invoke the method by changing the index
-        category_index = self.widget.cbCategory.findText("Shape-Independent")
+        category_index = self.widget.cbCategory.findText("Shape Independent")
         self.widget.cbCategory.setCurrentIndex(category_index)
 
@@ -175 +175 @@
 
         # Observe no such luck
-        self.assertEqual(self.widget.cbCategory.currentIndex(), 1)
+        self.assertEqual(self.widget.cbCategory.currentIndex(), 6)
         self.assertEqual(self.widget.cbModel.count(), 29)
 
@@ -191 +191 @@
         self.widget.show()
         # Change the category index so we have some models
-        category_index = self.widget.cbCategory.findText("Shape-Independent")
+        category_index = self.widget.cbCategory.findText("Shape Independent")
         self.widget.cbCategory.setCurrentIndex(category_index)
 
@@ -208 +208 @@
         # Now change the model
         self.widget.cbModel.setCurrentIndex(3)
-        self.assertEqual(self.widget.cbModel.currentText(),'correlation_length')
+        self.assertEqual(self.widget.cbModel.currentText(),'dab')
 
         # No data sent -> no index set, only createDefaultDataset called
@@ -219 +219 @@
         # Reset the sasmodel index
         self.widget.cbModel.setCurrentIndex(1)
-        self.assertEqual(self.widget.cbModel.currentText(),'be_polyelectrolyte')
+        self.assertEqual(self.widget.cbModel.currentText(),'broad_peak')
 
         # Observe calculateQGridForModel called
@@ -230 +230 @@
         self.widget.show()
         # Change the category index so we have some models
-        category_index = self.widget.cbCategory.findText("Shape-Independent")
+        category_index = self.widget.cbCategory.findText("Shape Independent")
         self.widget.cbCategory.setCurrentIndex(category_index)
         # Change the model to one that supports structure factors
@@ -331 +331 @@
         self.widget.show()
         # Change the category index so we have a model with no poly
-        category_index = self.widget.cbCategory.findText("Shape-Independent")
+        category_index = self.widget.cbCategory.findText("Shape Independent")
         self.widget.cbCategory.setCurrentIndex(category_index)
         # Check the poly model
@@ -341 +341 @@
 
         # Check the poly model
-        self.assertEqual(self.widget._poly_model.rowCount(), 3)
+        self.assertEqual(self.widget._poly_model.rowCount(), 4)
         self.assertEqual(self.widget._poly_model.columnCount(), 7)
 
@@ -360 +360 @@
         self.widget.show()
         # Change the category index so we have a model available
-        category_index = self.widget.cbCategory.findText("Shapes")
+        category_index = self.widget.cbCategory.findText("Sphere")
         self.widget.cbCategory.setCurrentIndex(category_index)
 
@@ -389 +389 @@
         self.widget.show()
         # Change the model to multi shell
-        category_index = self.widget.cbCategory.findText("Shapes")
+        category_index = self.widget.cbCategory.findText("Sphere")
         self.widget.cbCategory.setCurrentIndex(category_index)
         model_index = self.widget.cbModel.findText("core_multi_shell")