Changes in src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py [53c771e:3e8dee3] in sasview

File:

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

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

@@ -104 +104 @@
         self.assertEqual(delegate.editableParameters(), [1, 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)
 
@@ -860 +827 @@
         self.assertEqual(self.widget.cbModel.currentText(), 'onion')
         self.assertTrue(self.widget.chkPolydispersity.isChecked())
-        #Check if polidispersity tab is available
-        self.assertTrue(self.widget.tabFitting.isTabEnabled(3))
-
-        #Check if magnetism box and tab are disabled when 1D data is loaded
-        self.assertFalse(self.widget.chkMagnetism.isEnabled())
-        self.assertFalse(self.widget.tabFitting.isTabEnabled(4))
-
-    def testReadFitPage2D(self):
-        """
-        Read in the fitpage object and restore state
-        """
-        # Set data
-
-        test_data = Data2D(image=[1.0, 2.0, 3.0],
-                           err_image=[0.01, 0.02, 0.03],
-                           qx_data=[0.1, 0.2, 0.3],
-                           qy_data=[0.1, 0.2, 0.3],
-                           xmin=0.1, xmax=0.3, ymin=0.1, ymax=0.3,
-                           mask=[True, True, True])
-
-        # Force same data into logic
-        self.widget.logic.data = test_data
-        self.widget.data_is_loaded = True
-
-        #item = QtGui.QStandardItem()
-        #updateModelItem(item, [test_data], "test")
-        # Force same data into logic
-        #self.widget.logic.data = item
-        #self.widget.data_is_loaded = True
-
-        category_index = self.widget.cbCategory.findText("Cylinder")
-        self.widget.cbCategory.setCurrentIndex(category_index)
-
-        # Test no fitting params
-        self.widget.parameters_to_fit = ['scale']
-
-        # Invoke the tested method
-        fp = self.widget.currentState()
-
-        # Prepare modified fit page
-        fp.current_model = 'cylinder'
-        fp.is_polydisperse = True
-        fp.is_magnetic = True
-        fp.is2D = True
-
-        # Read in modified state
-        self.widget.readFitPage(fp)
-
-        # Check if the widget got updated accordingly
-        self.assertEqual(self.widget.cbModel.currentText(), 'cylinder')
-        self.assertTrue(self.widget.chkPolydispersity.isChecked())
-        self.assertTrue(self.widget.chkPolydispersity.isEnabled())
-        #Check if polidispersity tab is available
-        self.assertTrue(self.widget.tabFitting.isTabEnabled(3))
-
-        #Check if magnetism box and tab are disabled when 1D data is loaded
-        self.assertTrue(self.widget.chkMagnetism.isChecked())
-        self.assertTrue(self.widget.chkMagnetism.isEnabled())
-        self.assertTrue(self.widget.tabFitting.isTabEnabled(4))
 
     def testCurrentState(self):