Changeset b46f285 in sasview for src/sas/qtgui/UnitTesting

Timestamp:

Jan 9, 2017 9:49:16 AM (8 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:

87cc73a

Parents:

a66ff280

Message:

Unit tests for linear fit

Location:

src/sas/qtgui/UnitTesting

Files:

• GuiUtilsTest.py (modified) (1 diff)
• LinearFitTest.py (added)
• Plotter2DTest.py (modified) (1 diff)
• PlotterTest.py (modified) (3 diffs)

src/sas/qtgui/UnitTesting/GuiUtilsTest.py

@@ -346 +346 @@
         self.assertFalse(os.path.isfile(file_name))
 
+    def testXYTransform(self):
+        """ Assure the unit/legend transformation is correct"""
+        data = Data1D(x=[1.0, 2.0, 3.0], y=[10.0, 11.0, 12.0],
+                      dx=[0.1, 0.2, 0.3], dy=[0.1, 0.2, 0.3])
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="x", yLabel="y")
+        self.assertEqual(xLabel, "()")
+        self.assertEqual(xscale, "linear")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="x^(2)", yLabel="1/y")
+        self.assertEqual(xLabel, "^{2}(()^{2})")
+        self.assertEqual(yLabel, "1/(()^{-1})")
+        self.assertEqual(xscale, "linear")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="x^(4)", yLabel="ln(y)")
+        self.assertEqual(xLabel, "^{4}(()^{4})")
+        self.assertEqual(yLabel, "\\ln{()}()")
+        self.assertEqual(xscale, "linear")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="ln(x)", yLabel="y^(2)")
+        self.assertEqual(xLabel, "\\ln{()}()")
+        self.assertEqual(yLabel, "^{2}(()^{2})")
+        self.assertEqual(xscale, "linear")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="log10(x)", yLabel="y*x^(2)")
+        self.assertEqual(xLabel, "()")
+        self.assertEqual(yLabel, " \\ \\ ^{2}(()^{2})")
+        self.assertEqual(xscale, "log")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="log10(x^(4))", yLabel="y*x^(4)")
+        self.assertEqual(xLabel, "^{4}(()^{4})")
+        self.assertEqual(yLabel, " \\ \\ ^{4}(()^{16})")
+        self.assertEqual(xscale, "log")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="x", yLabel="1/sqrt(y)")
+        self.assertEqual(yLabel, "1/\\sqrt{}(()^{-0.5})")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="x", yLabel="log10(y)")
+        self.assertEqual(yLabel, "()")
+        self.assertEqual(yscale, "log")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="x", yLabel="ln(y*x)")
+        self.assertEqual(yLabel, "\\ln{( \\ \\ )}()")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="x", yLabel="ln(y*x^(2))")
+        self.assertEqual(yLabel, "\\ln ( \\ \\ ^{2})(()^{2})")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="x", yLabel="ln(y*x^(4))")
+        self.assertEqual(yLabel, "\\ln ( \\ \\ ^{4})(()^{4})")
+        self.assertEqual(yscale, "linear")
+
+        xLabel, yLabel, xscale, yscale = xyTransform(data, xLabel="x", yLabel="log10(y*x^(4))")
+        self.assertEqual(yLabel, " \\ \\ ^{4}(()^{4})")
+        self.assertEqual(yscale, "log")
+
 class FormulaValidatorTest(unittest.TestCase):
     """ Test the formula validator """

src/sas/qtgui/UnitTesting/Plotter2DTest.py

@@ -74 +74 @@
         """ Test the right click menu """
         self.plotter.data = self.data
+        self.plotter.createContextMenuQuick()
         actions = self.plotter.contextMenu.actions()
         self.assertEqual(len(actions), 7)

src/sas/qtgui/UnitTesting/PlotterTest.py

@@ -69 +69 @@
         self.assertTrue(FigureCanvas.draw.called)
 
-    def testContextMenuQuickPlot(self):
+    def testCreateContextMenuQuick(self):
         """ Test the right click menu """
         self.plotter.createContextMenuQuick()
@@ -112 +112 @@
         self.assertTrue(self.plotter.properties.exec_.called)
 
-    def testXYTransform(self):
-        """ Assure the unit/legend transformation is correct"""
-        self.plotter.plot(self.data)
-
-        self.plotter.xyTransform(xLabel="x", yLabel="y")
+    def testXyTransform(self):
+        """ Tests the XY transformation and new chart update """
+        self.plotter.plot(self.data)
+
+        # Transform the points
+        self.plotter.xyTransform(xLabel="x", yLabel="log10(y)")
+
+        # Assure new plot has correct labels
         self.assertEqual(self.plotter.ax.get_xlabel(), "$()$")
         self.assertEqual(self.plotter.ax.get_ylabel(), "$()$")
-
-        self.plotter.xyTransform(xLabel="x^(2)", yLabel="1/y")
-        self.assertEqual(self.plotter.ax.get_xlabel(), "$^{2}(()^{2})$")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$1/(()^{-1})$")
-
-        self.plotter.xyTransform(xLabel="x^(4)", yLabel="ln(y)")
-        self.assertEqual(self.plotter.ax.get_xlabel(), "$^{4}(()^{4})$")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$\\ln{()}()$")
-
-        self.plotter.xyTransform(xLabel="ln(x)", yLabel="y^(2)")
-        self.assertEqual(self.plotter.ax.get_xlabel(), "$\\ln{()}()$")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$^{2}(()^{2})$")
-
-        self.plotter.xyTransform(xLabel="log10(x)", yLabel="y*x^(2)")
-        self.assertEqual(self.plotter.ax.get_xlabel(), "$()$")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$ \\ \\ ^{2}(()^{2})$")
-
-        self.plotter.xyTransform(xLabel="log10(x^(4))", yLabel="y*x^(4)")
-        self.assertEqual(self.plotter.ax.get_xlabel(), "$^{4}(()^{4})$")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$ \\ \\ ^{4}(()^{16})$")
-
-        self.plotter.xyTransform(xLabel="x", yLabel="1/sqrt(y)")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$1/\\sqrt{}(()^{-0.5})$")
-
-        self.plotter.xyTransform(xLabel="x", yLabel="log10(y)")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$()$")
-
-        self.plotter.xyTransform(xLabel="x", yLabel="ln(y*x)")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$\\ln{( \\ \\ )}()$")
-
-        self.plotter.xyTransform(xLabel="x", yLabel="ln(y*x^(2))")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$\\ln ( \\ \\ ^{2})(()^{2})$")
-
-        self.plotter.xyTransform(xLabel="x", yLabel="ln(y*x^(4))")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$\\ln ( \\ \\ ^{4})(()^{4})$")
-
-        self.plotter.xyTransform(xLabel="x", yLabel="log10(y*x^(4))")
-        self.assertEqual(self.plotter.ax.get_ylabel(), "$ \\ \\ ^{4}(()^{4})$")
+        # ... and scale
+        self.assertEqual(self.plotter.xscale, "linear")
+        self.assertEqual(self.plotter.yscale, "log")
+        # See that just one plot is present
+        self.assertEqual(len(self.plotter.plot_dict), 1)
+        self.assertEqual(len(self.plotter.ax.collections), 1)
 
     def testAddText(self):
@@ -250 +221 @@
         self.assertNotEqual(self.plotter.ax.get_ylim(), new_y)
 
+    def testOnLinearFit(self):
+        """ Checks the response to LinearFit call """
+        pass
+
+    def testOnRemovePlot(self):
+        """ Assure plots get removed when requested """
+        pass
+
+    def testRemovePlot(self):
+        """ Test plot removal """
+        pass
+
+    def testOnToggleHideError(self):
+        """ Test the error bar toggle on plots """
+        pass
+
+    def testOnFitDisplay(self):
+        """ Test the fit line display on the chart """
+        pass
+
 if __name__ == "__main__":
     unittest.main()