Changeset 7fb471d in sasview for src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

Timestamp:

Nov 9, 2017 6:41:56 AM (6 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:

4992ff2

Parents:

cee5c78

git-author:

Piotr Rozyczko <rozyczko@…> (10/27/17 06:49:35)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:41:56)

Message:

Update for unit tests and minor functionality quirks

File:

• src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py (modified) (4 diffs, 1 prop)

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

@@ -6 +6 @@
 from PyQt4 import QtCore
 from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
-from mock import MagicMock
-from mock import patch
+from unittest.mock import MagicMock
+from unittest.mock import patch
 
 ####### TEMP
@@ -257 +257 @@
 
         # Just this one plot
-        self.assertEqual(len(self.plotter.plot_dict.keys()), 1)
+        self.assertEqual(len(list(self.plotter.plot_dict.keys())), 1)
         self.plotter.onLinearFit(1)
 
@@ -281 +281 @@
 
         # Assure we have two sets
-        self.assertEqual(len(self.plotter.plot_dict.keys()), 2)
+        self.assertEqual(len(list(self.plotter.plot_dict.keys())), 2)
 
         # Delete one set
         self.plotter.onRemovePlot(2)
         # Assure we have two sets
-        self.assertEqual(len(self.plotter.plot_dict.keys()), 1)
+        self.assertEqual(len(list(self.plotter.plot_dict.keys())), 1)
 
         self.plotter.manager = MagicMock()
@@ -293 +293 @@
         self.plotter.onRemovePlot(1)
         # Assure we have no plots
-        self.assertEqual(len(self.plotter.plot_dict.keys()), 0)
+        self.assertEqual(len(list(self.plotter.plot_dict.keys())), 0)
         # Assure the plotter window is closed
         self.assertFalse(self.plotter.isVisible())