Changeset d9150d8 in sasview for src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

Timestamp:

Jul 10, 2018 6:03:11 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:

4dd5766

Parents:

515c23df

git-author:

Piotr Rozyczko <rozyczko@…> (07/10/18 05:57:36)

git-committer:

Piotr Rozyczko <rozyczko@…> (07/10/18 06:03:11)

Message:

Delete open plots on data removal SASVIEW-958

File:

• src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/UnitTesting/DataExplorerTest.py

@@ -67 +67 @@
         # Buttons - data tab
         self.assertEqual(self.form.cmdLoad.text(), "Load data")
-        self.assertEqual(self.form.cmdDeleteData.text(), "Delete")
+        self.assertEqual(self.form.cmdDeleteData.text(), "Delete Data")
         self.assertEqual(self.form.cmdDeleteTheory.text(), "Delete")
         self.assertEqual(self.form.cmdFreeze.text(), "Freeze Theory")
@@ -819 +819 @@
         pass
 
-    def notestDeleteItem(self):
+    def testDeleteItem(self):
         """
         Delete selected item from data explorer
@@ -876 +876 @@
         self.assertEqual(self.form.model.rowCount(), 3)
 
+    def testClosePlotsForItem(self):
+        """
+        Delete selected item from data explorer should also delete corresponding plots
+        """
+        # Mock the confirmation dialog with return=No
+        QMessageBox.question = MagicMock(return_value=QMessageBox.No)
+
+        loader = Loader()
+        manager = DataManager()
+        PlotHelper.clear()
+        self.form.enableGraphCombo(None)
+
+        # Make sure the controls are disabled
+        self.assertFalse(self.form.cbgraph.isEnabled())
+        self.assertFalse(self.form.cmdAppend.isEnabled())
+
+        # Populate the model
+        filename = ["cyl_400_20.txt"]
+        self.form.readData(filename)
+
+        # Mask plotting
+        self.form.parent.workspace = MagicMock()
+
+        # Call the plotting method
+        self.form.newPlot()
+
+        time.sleep(1)
+        QApplication.processEvents()
+
+        # The plot was registered
+        self.assertEqual(len(PlotHelper.currentPlots()), 1)
+        self.assertEqual(len(self.form.plot_widgets), 1)
+        self.assertEqual(list(self.form.plot_widgets.keys()), ['Graph3'])
+
+        # data index
+        model_item = self.form.model.item(0,0)
+
+        # Call the method
+        self.form.closePlotsForItem(model_item)
+
+        # See that no plot remained
+        self.assertEqual(len(PlotHelper.currentPlots()), 0)
+        self.assertEqual(len(self.form.plot_widgets), 0)
+
 
 if __name__ == "__main__":