Changeset 144fe21 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

Jul 26, 2018 5:30:15 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

dc71408

Parents:

e793f62

git-author:

Piotr Rozyczko <rozyczko@…> (07/26/18 05:28:51)

git-committer:

Piotr Rozyczko <rozyczko@…> (07/26/18 05:30:15)

Message:

new unit test runner script + test fixes. SASVIEW-970

Location:

src/sas/qtgui/Perspectives/Fitting/UnitTesting

Files:

• FittingPerspectiveTest.py (modified) (6 diffs)
• FittingWidgetTest.py (modified) (6 diffs)

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

@@ -44 +44 @@
         self.assertEqual(len(self.widget.tabs), 1)
         self.assertEqual(self.widget.maxIndex, 2)
-        self.assertEqual(self.widget.getTabName(), "FitPage1")
+        self.assertEqual(self.widget.getTabName(), "FitPage2")
 
     def testAddTab(self):
@@ -52 +52 @@
         self.widget.addFit(None)
         self.assertEqual(len(self.widget.tabs), 2)
-        self.assertEqual(self.widget.getTabName(), "FitPage2")
+        self.assertEqual(self.widget.getTabName(), "FitPage3")
         self.assertEqual(self.widget.maxIndex, 3)
         # Add an empty batch tab
         self.widget.addFit(None, is_batch=True)
         self.assertEqual(len(self.widget.tabs), 3)
-        self.assertEqual(self.widget.getTabName(2), "BatchPage3")
+        self.assertEqual(self.widget.getTabName(2), "BatchPage4")
         self.assertEqual(self.widget.maxIndex, 4)
 
@@ -69 +69 @@
         ''' Remove data from last tab'''
         self.assertEqual(len(self.widget.tabs), 1)
-        self.assertEqual(self.widget.getTabName(), "FitPage1")
+        self.assertEqual(self.widget.getTabName(), "FitPage2")
         self.assertEqual(self.widget.maxIndex, 2)
 
@@ -77 +77 @@
         # see that the tab didn't disappear, just changed the name/id
         self.assertEqual(len(self.widget.tabs), 1)
-        self.assertEqual(self.widget.getTabName(), "FitPage2")
+        self.assertEqual(self.widget.getTabName(), "FitPage3")
         self.assertEqual(self.widget.maxIndex, 3)
 
@@ -101 +101 @@
         self.assertEqual(len(self.widget.tabs), 1)
         self.assertEqual(self.widget.maxIndex, 3)
-        self.assertEqual(self.widget.getTabName(), "FitPage2")
+        self.assertEqual(self.widget.getTabName(), "FitPage3")
 
         # Attemtp to remove the last tab
@@ -108 +108 @@
         self.assertEqual(len(self.widget.tabs), 1)
         self.assertEqual(self.widget.maxIndex, 4)
-        self.assertEqual(self.widget.getTabName(), "FitPage3")
+        self.assertEqual(self.widget.getTabName(), "FitPage4")
 
     def testAllowBatch(self):

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

@@ -411 +411 @@
         category_index = self.widget.cbCategory.findText("Cylinder")
         self.widget.cbCategory.setCurrentIndex(category_index)
+        model_index = self.widget.cbModel.findText("barbell")
+        self.widget.cbModel.setCurrentIndex(model_index)
 
         # click on a poly parameter checkbox
         index = self.widget._poly_model.index(0,0)
+
+        #self.widget.show()
+        #QtWidgets.QApplication(sys.argv).exec_()
+
+
         # Set the checbox
         self.widget._poly_model.item(0,0).setCheckState(2)
@@ -455 +462 @@
         category_index = self.widget.cbCategory.findText("Cylinder")
         self.widget.cbCategory.setCurrentIndex(category_index)
+        model_index = self.widget.cbModel.findText("barbell")
+        self.widget.cbModel.setCurrentIndex(model_index)
 
         # call method with default settings
@@ -494 +503 @@
         category_index = self.widget.cbCategory.findText("Cylinder")
         self.widget.cbCategory.setCurrentIndex(category_index)
+        model_index = self.widget.cbModel.findText("barbell")
+        self.widget.cbModel.setCurrentIndex(model_index)
 
         self.widget.onPolyComboIndexChange('array', 0)
@@ -524 +535 @@
 
         # Check the magnetic model
-        self.assertEqual(self.widget._magnet_model.rowCount(), 9)
+        self.assertEqual(self.widget._magnet_model.rowCount(), 12)
         self.assertEqual(self.widget._magnet_model.columnCount(), 5)
 
@@ -535 +546 @@
 
         header_tooltips = ['Select parameter for fitting',
-                             'Enter parameter value',
-                             'Enter minimum value for parameter',
-                             'Enter maximum value for parameter',
-                             'Unit of the parameter']
+                           'Enter parameter value',
+                           'Enter minimum value for parameter',
+                           'Enter maximum value for parameter',
+                           'Unit of the parameter']
         for column, tooltip in enumerate(header_tooltips):
              self.assertEqual(self.widget._magnet_model.headerData(column,
@@ -942 +953 @@
         self.assertTrue(fp.data_is_loaded)
         self.assertEqual(fp.current_category, "Sphere")
-        self.assertEqual(fp.current_model, "adsorbed_layer")
+        self.assertEqual(fp.current_model, "binary_hard_sphere")
         self.assertListEqual(fp.parameters_to_fit, ['scale'])