Changeset 7fb471d in sasview for src/sas/qtgui/Plotting

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

Location:

src/sas/qtgui/Plotting/UnitTesting

Files:

• AddTextTest.py (modified) (1 diff)
• BoxSumTest.py (modified) (1 diff)
• ColorMapTest.py (modified) (1 diff)
• LinearFitTest.py (modified) (6 diffs)
• PlotPropertiesTest.py (modified) (1 diff)
• Plotter2DTest.py (modified) (1 diff)
• PlotterBaseTest.py (modified) (1 diff)
• PlotterTest.py (modified) (4 diffs, 1 prop)
• SlicerModelTest.py (modified) (1 diff)
• SlicerParametersTest.py (modified) (2 diffs)

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

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

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

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

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

@@ -4 +4 @@
 
 from PyQt4 import QtGui
-from mock import MagicMock
+from unittest.mock import MagicMock
 import matplotlib as mpl
 

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

@@ -4 +4 @@
 
 from PyQt4 import QtGui
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # set up import paths
@@ -59 +59 @@
         return_values = self.widget.parent.emit.call_args[0][1]
         # Compare
-        self.assertItemsEqual(return_values[0], [1.0, 3.0])
+        self.assertCountEqual(return_values[0], [1.0, 3.0])
         self.assertAlmostEqual(return_values[1][0], 10.004054329, 6)
         self.assertAlmostEqual(return_values[1][1], 12.030439848, 6)
@@ -68 +68 @@
         return_values = self.widget.parent.emit.call_args[0][1]
         # Compare
-        self.assertItemsEqual(return_values[0], [1.0, 3.0])
+        self.assertCountEqual(return_values[0], [1.0, 3.0])
         self.assertAlmostEqual(return_values[1][0], 9.987732937, 6)
         self.assertAlmostEqual(return_values[1][1], 11.84365082, 6)
@@ -81 +81 @@
         x, y, dy = self.widget.origData()
 
-        self.assertItemsEqual(x, orig_x)
+        self.assertCountEqual(x, orig_x)
         self.assertEqual(y[0], orig_y[0])
         self.assertAlmostEqual(y[1], orig_y[1], 8)
@@ -98 +98 @@
         x, y, dy = self.widget.origData()
 
-        self.assertItemsEqual(x, orig_x)
-        self.assertItemsEqual(y, orig_y)
-        self.assertItemsEqual(dy, orig_dy)
+        self.assertCountEqual(x, orig_x)
+        self.assertCountEqual(y, orig_y)
+        self.assertCountEqual(dy, orig_dy)
 
         # x, log(y)
@@ -111 +111 @@
         x, y, dy = self.widget.origData()
 
-        self.assertItemsEqual(x, orig_x)
+        self.assertCountEqual(x, orig_x)
         self.assertEqual(y[0], orig_y[0])
         self.assertAlmostEqual(y[1], orig_y[1], 8)

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

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

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

@@ -7 +7 @@
 from PyQt4 import QtCore
 from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
-from mock import MagicMock
+from unittest.mock import MagicMock
 from mpl_toolkits.mplot3d import Axes3D
 

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

@@ -2 +2 @@
 import unittest
 import platform
-from mock import patch, MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

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())

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

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui

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

@@ -1 +1 @@
 import sys
 import unittest
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 from PyQt4 import QtGui
@@ -7 +7 @@
 from PyQt4 import QtTest
 from PyQt4 import QtWebKit
-
-from mock import MagicMock
 
 # set up import paths