Changeset 144fe21 in sasview for src/sas/qtgui/Perspectives/Inversion

Timestamp:

Jul 26, 2018 3:30:15 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

dc71408

Parents:

e793f62

git-author:

Piotr Rozyczko <rozyczko@…> (07/26/18 03:28:51)

git-committer:

Piotr Rozyczko <rozyczko@…> (07/26/18 03:30:15)

Message:

new unit test runner script + test fixes. SASVIEW-970

File:

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

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

@@ -12 +12 @@
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 
-#if not QtWidgets.QApplication.instance():
-app = QtWidgets.QApplication(sys.argv)
+if not QtWidgets.QApplication.instance():
+    app = QtWidgets.QApplication(sys.argv)
 
 
@@ -19 +19 @@
     HELP_DIRECTORY_LOCATION = "html"
     communicate = Communicate()
-
     def communicator(self):
         return self.communicate
@@ -29 +28 @@
     def setUp(self):
         """ Create the InversionWindow """
-        self.widget = InversionWindow(dummy_manager())
+
+        self.widget = InversionWindow(parent=dummy_manager())
+        self.widget._parent = QtWidgets.QMainWindow()
+        self.widget.showBatchOutput = MagicMock()
+        self.widget.startThread = MagicMock()
+        self.widget.startThreadAll = MagicMock()
         self.widget.show()
+
         self.fakeData1 = GuiUtils.HashableStandardItem("A")
         self.fakeData2 = GuiUtils.HashableStandardItem("B")
@@ -96 +101 @@
         self.assertTrue(self.widget.allowBatch())
         self.assertFalse(self.widget.isBatch)
-        self.assertIsNone(self.widget.batchResultsWindow)
         self.assertFalse(self.widget.calculateAllButton.isEnabled())
         self.assertEqual(len(self.widget.batchResults), 0)
         self.assertEqual(len(self.widget.batchComplete), 0)
         self.widget.closeBatchResults()
-        self.assertIsNone(self.widget.batchResultsWindow)
 
     def zeroDataSetState(self):
@@ -206 +209 @@
         self.assertTrue(self.widget.isMinimized())
         self.assertIsNone(self.widget.dmaxWindow)
-        self.assertIsNone(self.widget.batchResultsWindow)
         self.widget.setClosable(False)
         self.assertFalse(self.widget.isClosable())