Changeset 672b8ab in sasview for src/sas/qtgui/Perspectives/Fitting/UnitTesting

Timestamp:

May 10, 2017 9:36:13 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:

1bc27f1

Parents:

2da5759

Message:

Further fitpage implementation with tests SASVIEW-570

Location:

src/sas/qtgui/Perspectives/Fitting/UnitTesting

Files:

• FitPageTest.py (added)
• FittingWidgetTest.py (modified) (2 diffs)

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

@@ -301 +301 @@
         self.widget.calculateResiduals(test_data)
         # Now, the difference is non-zero
-        self.assertEqual(float(self.widget.lblChi2Value.text()), 1.715)
+        self.assertEqual(float(self.widget.lblChi2Value.text()), 1.7151)
 
     def testSetPolyModel(self):
@@ -550 +550 @@
             self.assertEqual(update_spy.count(), 1)
 
+    def testReadFitPage(self):
+        """
+        Read in the fitpage object and restore state
+        """
+        # Set data
+        test_data = Data1D(x=[1,2], y=[1,2])
+
+        # Force same data into logic
+        self.widget.logic.data = test_data
+        self.widget.data_is_loaded = True
+        category_index = self.widget.cbCategory.findText('Sphere')
+        self.widget.cbCategory.setCurrentIndex(category_index)
+        self.widget.parameters_to_fit = ['scale']
+        # Invoke the tested method
+        fp = self.widget.currentState()
+
+        # Prepare modified fit page
+        fp.current_model = 'onion'
+        fp.is_polydisperse = True
+
+        # Read in modified state
+        self.widget.readFitPage(fp)
+
+        # Check if the widget got updated accordingly
+        self.assertEqual(self.widget.cbModel.currentText(), 'onion')
+        self.assertTrue(self.widget.chkPolydispersity.isChecked())
+
+    def testCurrentState(self):
+        """
+        Set up the fitpage with current state
+        """
+        # Set data
+        test_data = Data1D(x=[1,2], y=[1,2])
+
+        # Force same data into logic
+        self.widget.logic.data = test_data
+        self.widget.data_is_loaded = True
+        category_index = self.widget.cbCategory.findText("Sphere")
+        self.widget.cbCategory.setCurrentIndex(category_index)
+        self.widget.parameters_to_fit = ['scale']
+
+        # Invoke the tested method
+        fp = self.widget.currentState()
+
+        # Test some entries. (Full testing of fp is done in FitPageTest)
+        self.assertIsInstance(fp.data, Data1D)
+        self.assertListEqual(list(fp.data.x), [1,2])
+        self.assertTrue(fp.data_is_loaded)
+        self.assertEqual(fp.current_category, "Sphere")
+        self.assertEqual(fp.current_model, "adsorbed_layer")
+        self.assertListEqual(fp.parameters_to_fit, ['scale'])
+
+    def testPushFitPage(self):
+        """
+        Push current state of fitpage onto stack
+        """
+        pass
+
+    def testPopFitPage(self):
+        """
+        Pop current state of fitpage from stack
+        """
+        pass
 
 if __name__ == "__main__":