Changeset 7248d75d in sasview

Timestamp:

Mar 20, 2017 9:41:02 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:

351b53e

Parents:

4d457df

Message:

More unit tests for fitting perspective components - SASVIEW-499

Location:

src/sas/qtgui

Files:

• GUITests.py (modified) (2 diffs)
• Perspectives/Fitting/FittingLogic.py (modified) (2 diffs)
• Perspectives/Fitting/FittingUtilities.py (modified) (1 diff)
• Perspectives/Fitting/UnitTesting/FittingLogicTest.py (added)
• Perspectives/Fitting/UnitTesting/FittingUtilitiesTest.py (added)
• Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (5 diffs)

src/sas/qtgui/GUITests.py

@@ -32 +32 @@
 from Perspectives.Fitting.UnitTesting import FittingWidgetTest
 from Perspectives.Fitting.UnitTesting import FittingPerspectiveTest
+from Perspectives.Fitting.UnitTesting import FittingLogicTest
+from Perspectives.Fitting.UnitTesting import FittingUtilitiesTest
 
 
@@ -64 +66 @@
         unittest.makeSuite(FittingPerspectiveTest.FittingPerspectiveTest, 'test'),
         unittest.makeSuite(FittingWidgetTest.FittingWidgetTest, 'test'),
+        unittest.makeSuite(FittingLogicTest.FittingLogicTest, 'test'),
+        unittest.makeSuite(FittingUtilitiesTest.FittingUtilitiesTest, 'test'),
     )
     return unittest.TestSuite(suites)

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

@@ -14 +14 @@
     def __init__(self, data=None):
         self._data = data
+        self.data_is_loaded = False
+        if data is not None:
+            self.data_is_loaded = True
 
     @property
@@ -119 +122 @@
 
         new_plot.group_id = data.group_id
-        if new_plot.group_id == None:
-            new_plot.group_id = data.group_id
         #new_plot.id = str(self.tab_id) + " " + data.name
         new_plot.name = model.name + " [" + data.name + "]"

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

@@ -74 +74 @@
     """
     for param in parameters.iq_parameters:
-        # Modify parameter name from <param>[n] to <param>1
+        # Create the top level, checkable item
         item_name = param.name
         item1 = QtGui.QStandardItem(item_name)

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

@@ -71 +71 @@
         item = QtGui.QStandardItem("test")
 
-        widget_with_data = FittingWidget(dummy_manager(), data=[data], id=3)
+        widget_with_data = FittingWidget(dummy_manager(), data=[item], id=3)
 
         self.assertEqual(widget_with_data.data, data)
         self.assertTrue(widget_with_data.data_is_loaded)
-        self.assertTrue(widget_with_data.cmdFit.isEnabled())
+        # self.assertTrue(widget_with_data.cmdFit.isEnabled())
         self.assertFalse(widget_with_data.acceptsData())
 
@@ -125 +125 @@
 
         #Test loading from json categories
-        fittingWindow.setModelModel("cylinder")
+        fittingWindow.SASModelToQModel("cylinder")
         pd_index = fittingWindow.lstPoly.model().index(0,0)
         self.assertEqual(str(pd_index.data().toString()), "Distribution of radius")
@@ -177 +177 @@
         pass
 
-    def testGetIterParams(self):
-        """
-        Assure the right multishell parameters are returned
-        """
-        pass
-
-    def testGetMultiplicity(self):
-        """
-        Assure more multishell parameters are evaluated correctly
-        """
-        pass
-
-    def testAddCheckedListToModel(self):
-        """
-        Test for utility function
-        """
-        pass
-
     def testUpdateParamsFromModel(self):
         """
@@ -207 +189 @@
         pass
 
-    def testAddParametersToModel(self):
-        """
-        Checks the QModel update from Sasmodel parameters
-        """
-        pass
-
-    def testAddSimpleParametersToModel(self):
-        """
-        Checks the QModel update from Sasmodel parameters - no polydisp
-        """
-        pass
-
     def testCreateDefault1dData(self):
         """
@@ -258 +228 @@
         """
         Check that a new 2D plot is generated
-        """
-        pass
-
-    def testReplaceShellName(self):
-        """
-        Test the utility function for string manipulation
         """
         pass