Changeset 377ade1 in sasview for src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

Timestamp:

Aug 16, 2017 2:44:42 AM (7 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:

0e4d87c

Parents:

38eb433

Message:

Fixing unit tests + removal of unnecessary files

File:

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

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

@@ -98 +98 @@
         # test the delegate a bit
         delegate = fittingWindow.lstPoly.itemDelegate()
-        self.assertEqual(len(delegate.POLYDISPERSE_FUNCTIONS), 5)
+        self.assertEqual(len(delegate.POLYDISPERSE_FUNCTIONS), 4)
         self.assertEqual(delegate.editableParameters(), [2, 3, 4, 5])
         self.assertEqual(delegate.poly_function, 6)
@@ -595 +595 @@
         # Set data
         test_data = Data1D(x=[1,2], y=[1,2])
-
+        item = QtGui.QStandardItem()
+        updateModelItem(item, [test_data], "test")
         # Force same data into logic
-        self.widget.logic.data = test_data
-        self.widget.data_is_loaded = True
+        self.widget.data = item
         category_index = self.widget.cbCategory.findText("Sphere")
         self.widget.cbCategory.setCurrentIndex(category_index)
@@ -625 +625 @@
 
             # the fit button changed caption and got disabled
-            self.assertEqual(self.widget.cmdFit.text(), 'Calculating...')
+            self.assertEqual(self.widget.cmdFit.text(), 'Running...')
             self.assertFalse(self.widget.cmdFit.isEnabled())
 
@@ -644 +644 @@
 
         # 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.data = item
         category_index = self.widget.cbCategory.findText("Sphere")
         self.widget.cbCategory.setCurrentIndex(category_index)
@@ -672 +674 @@
 
             # the fit button changed caption and got disabled
-            self.assertEqual(self.widget.cmdFit.text(), 'Calculating...')
+            self.assertEqual(self.widget.cmdFit.text(), 'Running...')
             self.assertFalse(self.widget.cmdFit.isEnabled())