Changeset 72ecbdf2 in sasview for src/sas/qtgui/Perspectives/Inversion/UnitTesting

Timestamp:

May 2, 2018 8:59:34 AM (7 years ago)

Author:

krzywon

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:

b0ba43e

Parents:

6da860a

Message:

Add a stop calculations button to P(r). Plus unit tests.

File:

• src/sas/qtgui/Perspectives/Inversion/UnitTesting/InversionPerspectiveTest.py (modified) (5 diffs)

src/sas/qtgui/Perspectives/Inversion/UnitTesting/InversionPerspectiveTest.py

@@ -58 +58 @@
         self.assertEqual(self.widget.windowTitle(), "P(r) Inversion Perspective")
         self.assertFalse(self.widget.isClosable())
+        self.assertFalse(self.widget.isCalculating)
         # mapper
         self.assertIsInstance(self.widget.mapper, QtWidgets.QDataWidgetMapper)
@@ -76 +77 @@
         self.assertFalse(self.widget.calculateThisButton.isEnabled())
         self.assertFalse(self.widget.removeButton.isEnabled())
+        self.assertTrue(self.widget.stopButton.isEnabled())
+        self.assertFalse(self.widget.stopButton.isVisible())
         self.assertFalse(self.widget.regConstantSuggestionButton.isEnabled())
         self.assertFalse(self.widget.noOfTermsSuggestionButton.isEnabled())
@@ -154 +157 @@
         self.twoDataSetState()
         self.widget.calculateAllButton.click()
+        self.assertTrue(self.widget.isCalculating)
+        self.assertTrue(self.widget.isBatch)
+        self.assertTrue(self.widget.stopButton.isVisible())
+        self.assertTrue(self.widget.stopButton.isEnabled())
         self.assertIsNotNone(self.widget.batchResultsWindow)
         self.assertTrue(self.widget.batchResultsWindow.cmdHelp.isEnabled())
         self.assertEqual(self.widget.batchResultsWindow.tblParams.columnCount(), 9)
         self.assertEqual(self.widget.batchResultsWindow.tblParams.rowCount(), 2)
-        if self.widget.isBatch:
-            self.widget.isBatch = False
+        # Test stop button
+        self.widget.stopButton.click()
+        self.assertTrue(self.widget.batchResultsWindow.isVisible())
+        self.assertFalse(self.widget.stopButton.isVisible())
+        self.assertTrue(self.widget.stopButton.isEnabled())
+        self.assertFalse(self.widget.isBatch)
+        self.assertFalse(self.widget.isCalculating)
         self.widget.batchResultsWindow.close()
         self.assertIsNone(self.widget.batchResultsWindow)
         # Last test
-        self.widget.removeData()
         self.removeAllData()
         self.baseBatchState()
@@ -218 +229 @@
             self.widget.noOfTermsInput.setText("")
             n = self.widget.getNFunc()
-            self.assertEqual(cm.output, ['ERROR:root:Incorrect number of terms specified: '])
+            self.assertEqual(cm.output, ['ERROR:sas.qtgui.Perspectives.Inversion.InversionPerspective:Incorrect number of terms specified: '])
         self.assertEqual(self.widget.getNFunc(), 10)
         # string
@@ -224 +235 @@
             self.widget.noOfTermsInput.setText("Nordvest Pizza")
             n = self.widget.getNFunc()
-            self.assertEqual(cm.output, ['ERROR:root:Incorrect number of terms specified: Nordvest Pizza'])
+            self.assertEqual(cm.output, ['ERROR:sas.qtgui.Perspectives.Inversion.InversionPerspective:Incorrect number of terms specified: Nordvest Pizza'])
         self.assertEqual(self.widget.getNFunc(), 10)
         self.removeAllData()