Changeset e00b76e in sasview

Timestamp:

Oct 25, 2017 9:35:13 AM (7 years ago)

Author:

Tim Snow <tim.snow@…>

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:

9ea43c82

Parents:

02f1d12

Message:

Unit test update magnetism

Complementary to the changes made, unit tests have been written also

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (1 diff)
• UnitTesting/FittingWidgetTest.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -644 +644 @@
             return
 
-        # p_i = self._magnet_model.headerData(0,1,2,3,4,5,6,7,8,9,10)
         property_index = self._magnet_model.headerData(0, 1, model_column).toInt()[0]-1 # Value, min, max, etc.
 

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

@@ -102 +102 @@
         self.assertEqual(delegate.editableParameters(), [2, 3, 4, 5])
         self.assertEqual(delegate.poly_function, 6)
+        self.assertIsInstance(delegate.combo_updated, QtCore.pyqtBoundSignal)
+
+    def testSelectMagnetism(self):
+        """
+        Test if models have been loaded properly
+        """
+        fittingWindow =  self.widget
+
+        self.assertIsInstance(fittingWindow.lstMagnetic.itemDelegate(), QtGui.QStyledItemDelegate)
+        #Test loading from json categories
+        fittingWindow.SASModelToQModel("cylinder")
+        mag_index = fittingWindow.lstMagnetic.model().index(0,0)
+        self.assertEqual(str(mag_index.data().toString()), "up:frac_i")
+        mag_index = fittingWindow.lstMagnetic.model().index(1,0)
+        self.assertEqual(str(mag_index.data().toString()), "up:frac_f")
+        mag_index = fittingWindow.lstMagnetic.model().index(2,0)
+        self.assertEqual(str(mag_index.data().toString()), "up:angle")
+        mag_index = fittingWindow.lstMagnetic.model().index(3,0)
+        self.assertEqual(str(mag_index.data().toString()), "M0:sld")
+        mag_index = fittingWindow.lstMagnetic.model().index(4,0)
+        self.assertEqual(str(mag_index.data().toString()), "mtheta:sld")
+        mag_index = fittingWindow.lstMagnetic.model().index(5,0)
+        self.assertEqual(str(mag_index.data().toString()), "mphi:sld")
+        mag_index = fittingWindow.lstMagnetic.model().index(6,0)
+        self.assertEqual(str(mag_index.data().toString()), "M0:sld_solvent")
+        mag_index = fittingWindow.lstMagnetic.model().index(7,0)
+        self.assertEqual(str(mag_index.data().toString()), "mtheta:sld_solvent")
+        mag_index = fittingWindow.lstMagnetic.model().index(8,0)
+        self.assertEqual(str(mag_index.data().toString()), "mphi:sld_solvent")
+
+        # test the delegate a bit
+        delegate = fittingWindow.lstMagnetic.itemDelegate()
+        self.assertEqual(delegate.editableParameters(), [1, 2, 3])
         self.assertIsInstance(delegate.combo_updated, QtCore.pyqtBoundSignal)