Changeset 02ddfb4 in sasview for src

Timestamp:

May 3, 2017 7:56:24 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:

56b22f9

Parents:

d48cc19

Message:

Unit tests for GUI fitting: SASVIEW-507

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

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

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

@@ -456 +456 @@
         calc_thread = threads.deferToThread(calc_fit.compute)
         calc_thread.addCallback(self.fitComplete)
+        calc_thread.addErrback(self.fitFailed)
 
         #disable the Fit button
@@ -466 +467 @@
         """
         print "UPDATE FIT"
+        pass
+
+    def fitFailed(self, reason):
+        """
+        """
+        print "FIT FAILED: ", reason
         pass
 

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

@@ -498 +498 @@
         self.assertEqual(spy.count(), 1)
 
+    def testOnFit(self):
+        """
+        Test the threaded fitting call
+        """
+        # 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.show()
+
+        # Test no fitting params
+        self.widget.parameters_to_fit = []
+
+        with self.assertRaises(ValueError) as error:
+            self.widget.onFit()
+        self.assertEqual(str(error.exception), 'no fitting parameters')
+
+        # Assing fitting params
+        self.widget.parameters_to_fit = ['scale']
+
+        # Spying on status update signal
+        update_spy = QtSignalSpy(self.widget, self.widget.communicate.statusBarUpdateSignal)
+
+        with threads.deferToThread as MagicMock:
+            self.widget.onFit()
+            # thread called
+            self.assertTrue(threads.deferToThread.called)
+            # thread method is 'compute'
+            self.assertEqual(threads.deferToThread.call_args_list[0][0][0].__name__, 'compute')
+
+            # the fit button changed caption and got disabled
+            self.assertEqual(self.widget.cmdFit.text(), 'Calculating...')
+            self.assertFalse(self.widget.cmdFit.isEnabled())
+
+            # Signal pushed up
+            self.assertEqual(update_spy.count(), 1)
+
 
 if __name__ == "__main__":