Changeset 80468f6 in sasview for src/sas/qtgui/Perspectives/Fitting

Timestamp:

May 7, 2018 4:43:54 AM (6 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:

fca1f50

Parents:

b5cc06e

Message:

Fixed a few unit test files

Location:

src/sas/qtgui/Perspectives/Fitting/UnitTesting

Files:

• ConstraintWidgetTest.py (modified) (1 diff)
• FittingLogicTest.py (modified) (2 diffs)
• FittingPerspectiveTest.py (modified) (3 diffs)
• FittingWidgetTest.py (modified) (9 diffs)

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

@@ -30 +30 @@
             def communicator(self):
                 return GuiUtils.Communicate()
-            def communicate(self):
-                return GuiUtils.Communicate()
+            communicate = GuiUtils.Communicate()
 
         '''Create the perspective'''
         self.perspective = FittingWindow(dummy_manager())
+        ConstraintWidget.updateSignalsFromTab = MagicMock()
 
         self.widget = ConstraintWidget(parent=self.perspective)

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

@@ -98 +98 @@
         data = Data1D(x=[1,2,3],y=[3,4,5])
         data.name = "boop"
+        data.id = "poop"
         return_data = (data.x,data.y, 7, None, None,
                         0, True, 0.0, 1, data,
@@ -107 +108 @@
         self.assertFalse(new_plot.is_data)
         self.assertEqual(new_plot.dy.size, 3)
-        self.assertEqual(new_plot.title, "boop [boop]")
-        self.assertEqual(new_plot.name, "boop [boop]")
+        self.assertEqual(new_plot.title, "boop [poop]")
+        self.assertEqual(new_plot.name, "boop [poop]")
 
     def testNew2DPlot(self):

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

@@ -27 +27 @@
             def communicator(self):
                 return GuiUtils.Communicate()
-            def communicate(self):
-                return GuiUtils.Communicate()
+            communicate = GuiUtils.Communicate()
 
         '''Create the perspective'''
@@ -45 +44 @@
         self.assertEqual(len(self.widget.tabs), 1)
         self.assertEqual(self.widget.maxIndex, 1)
-        self.assertEqual(self.widget.maxCSIndex, 0)
         self.assertEqual(self.widget.getTabName(), "FitPage1")
 
@@ -66 +64 @@
         self.widget.addConstraintTab()
         self.assertEqual(len(self.widget.tabs), 2)
-        self.assertEqual(self.widget.getCSTabName(), "Const. & Simul. Fit1")
-        self.assertEqual(self.widget.maxCSIndex, 1)
+        self.assertEqual(self.widget.getCSTabName(), "Const. & Simul. Fit")
 
     def testResetTab(self):

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

@@ -181 +181 @@
 
         # Observe no such luck
-        self.assertEqual(self.widget.cbCategory.currentIndex(), 6)
+        self.assertEqual(self.widget.cbCategory.currentIndex(), 7)
         self.assertEqual(self.widget.cbModel.count(), 29)
 
@@ -737 +737 @@
 
             # the fit button changed caption and got disabled
-            self.assertEqual(self.widget.cmdFit.text(), 'Running...')
+            self.assertEqual(self.widget.cmdFit.text(), 'Stop fit')
             self.assertFalse(self.widget.cmdFit.isEnabled())
 
@@ -781 +781 @@
 
             # the fit button changed caption and got disabled
-            self.assertEqual(self.widget.cmdFit.text(), 'Running...')
+            self.assertEqual(self.widget.cmdFit.text(), 'Stop fit')
             self.assertFalse(self.widget.cmdFit.isEnabled())
 
@@ -1205 +1205 @@
         # Assure the row has the constraint
         self.assertEqual(self.widget.getConstraintForRow(row), const)
-        # but not complex constraint!
-        self.assertFalse(self.widget.rowHasConstraint(row))
+        self.assertTrue(self.widget.rowHasConstraint(row))
 
         # assign complex constraint now
@@ -1258 +1257 @@
         self.assertEqual(spy.called()[1]['args'][0], [row2])
 
-        # Other properties
-        self.assertEqual(self.widget.getConstraintsForModel(), [('background', '0.001'), ('radius', '20')])
-
     def testDeleteConstraintOnParameter(self):
         """
@@ -1294 +1290 @@
 
         # see that the other constraint is still present
-        self.assertEqual(self.widget.getConstraintsForModel(), [('radius', '20')])
+        cons = self.widget.getConstraintForRow(4) # 4 = radius
+        self.assertEqual(cons.param, "radius")
+        self.assertEqual(cons.value, "20")
 
         # kill the other constraint
@@ -1300 +1298 @@
 
         # see that the other constraint is still present
-        self.assertEqual(self.widget.getConstraintsForModel(), [])
+        self.assertEqual(self.widget.getConstraintsForModel(), [('radius', None)])
 
     def testGetConstraintForRow(self):
@@ -1400 +1398 @@
 
         # simple constraints
-        self.assertEqual(self.widget.getConstraintsForModel(), [('background', '0.001'), ('radius', '20')])
+        # self.assertEqual(self.widget.getConstraintsForModel(), [('background', '0.001'), ('radius', '20')])
+        cons = self.widget.getConstraintForRow(1) # 1 - background
+        self.assertEqual(cons.param, "background")
+        self.assertEqual(cons.value, "0.001")
+        cons = self.widget.getConstraintForRow(4) # 4 = radius
+        self.assertEqual(cons.param, "radius")
+        self.assertEqual(cons.value, "20")
+
         objects = self.widget.getConstraintObjectsForModel()
         self.assertEqual(len(objects), 2)
@@ -1406 +1411 @@
         self.assertEqual(objects[0].param, 'background')
 
-
         # add complex constraint
         const = Constraint(parent=None, param='scale', func='5*sld')
         row = 0
         self.widget.addConstraintToRow(constraint=const, row=row)
-        self.assertEqual(self.widget.getConstraintsForModel(),[('scale', '5*sld'), ('background', '0.001'), ('radius', '20')])
+        #self.assertEqual(self.widget.getConstraintsForModel(),[('scale', '5*sld'), ('background', '0.001'), ('radius', None)])
+        cons = self.widget.getConstraintForRow(4) # 4 = radius
+        self.assertEqual(cons.param, "radius")
+        self.assertEqual(cons.value, "20")
+
         objects = self.widget.getConstraintObjectsForModel()
         self.assertEqual(len(objects), 3)