Changeset 144fe21 in sasview for src/sas/qtgui/Plotting

Timestamp:

Jul 26, 2018 5: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 05:28:51)

git-committer:

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

Message:

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

Location:

src/sas/qtgui/Plotting/UnitTesting

Files:

• Plotter2DTest.py (modified) (1 diff)
• PlotterBaseTest.py (modified) (3 diffs)
• PlotterTest.py (modified) (1 diff)

src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py

@@ -148 +148 @@
         self.assertEqual(len(actions), 7)
 
-        # Trigger Save Image and make sure the method is called
-        self.assertEqual(actions[0].text(), "Save Image")
-        self.plotter.toolbar.save_figure = MagicMock()
-        actions[0].trigger()
-        self.assertTrue(self.plotter.toolbar.save_figure.called)
-
         # Trigger Print Image and make sure the method is called
         self.assertEqual(actions[1].text(), "Print Image")

src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py

@@ -47 +47 @@
         self.assertIsInstance(self.plotter, QtWidgets.QWidget)
         self.assertIsInstance(self.plotter.canvas, FigureCanvas)
-        self.assertIsInstance(self.plotter.toolbar, NavigationToolbar)
         self.assertIsInstance(self.plotter.properties, ScaleProperties)
 
@@ -84 +83 @@
         self.plotter.closeEvent(None)
         self.assertTrue(PlotHelper.deletePlot.called)
-
-    def testOnImageSave(self):
-        ''' test the workspace save '''
-        self.plotter.toolbar.save_figure = MagicMock()
-        self.plotter.onImageSave()
-        self.assertTrue(self.plotter.toolbar.save_figure.called)
 
     def testOnImagePrint(self):
@@ -132 +125 @@
         actions = self.plotter.contextMenu.actions()
         self.assertEqual(len(actions), 4)
-
-        # Trigger Save Image and make sure the method is called
-        self.assertEqual(actions[0].text(), "Save Image")
-        self.plotter.toolbar.save_figure = MagicMock()
-        actions[0].trigger()
-        self.assertTrue(self.plotter.toolbar.save_figure.called)
 
         # Trigger Print Image and make sure the method is called

src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

@@ -104 +104 @@
         actions = self.plotter.contextMenu.actions()
         self.assertEqual(len(actions), 7)
-
-        # Trigger Save Image and make sure the method is called
-        self.assertEqual(actions[0].text(), "Save Image")
-        self.plotter.toolbar.save_figure = MagicMock()
-        actions[0].trigger()
-        self.assertTrue(self.plotter.toolbar.save_figure.called)
 
         # Trigger Print Image and make sure the method is called