Changeset 2e3e959 in sasview for src/sas/qtgui/UnitTesting/LinearFitTest.py

Timestamp:

Jan 13, 2017 4:28:30 AM (7 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:

239214f

Parents:

db5cd8d

Message:

Code review issues addressed.
More unit tests for plotting.

File:

• src/sas/qtgui/UnitTesting/LinearFitTest.py (modified) (7 diffs)

src/sas/qtgui/UnitTesting/LinearFitTest.py

@@ -4 +4 @@
 
 from PyQt4 import QtGui
-from PyQt4 import QtCore
 from mock import MagicMock
 
@@ -10 +9 @@
 import path_prepare
 
-from UnitTesting.TestUtils import QtSignalSpy
 from sas.sasgui.guiframe.dataFitting import Data1D
 import sas.qtgui.Plotter as Plotter
@@ -61 +59 @@
         # Compare
         self.assertItemsEqual(return_values[0], [1.0, 3.0])
-        self.assertItemsEqual(return_values[1], [10.004054329087303, 12.030439848443539])
+        self.assertAlmostEqual(return_values[1][0], 10.004054329, 6)
+        self.assertAlmostEqual(return_values[1][1], 12.030439848, 6)
 
         # Set the log scale
@@ -69 +68 @@
         # Compare
         self.assertItemsEqual(return_values[0], [1.0, 3.0])
-        self.assertItemsEqual(return_values[1], [9.9877329376711437, 11.843650824649025])
+        self.assertAlmostEqual(return_values[1][0], 9.987732937, 6)
+        self.assertAlmostEqual(return_values[1][1], 11.84365082, 6)
 
     def testOrigData(self):
@@ -81 +81 @@
 
         self.assertItemsEqual(x, orig_x)
-        self.assertItemsEqual(y, orig_y)
-        self.assertItemsEqual(dy, orig_dy)
+        self.assertEqual(y[0], orig_y[0])
+        self.assertAlmostEqual(y[1], orig_y[1], 8)
+        self.assertAlmostEqual(y[2], orig_y[2], 8)
+        self.assertEqual(dy[0], orig_dy[0])
+        self.assertAlmostEqual(dy[1], orig_dy[1], 8)
+        self.assertAlmostEqual(dy[2], orig_dy[2], 8)
 
         # x, y
@@ -107 +111 @@
 
         self.assertItemsEqual(x, orig_x)
-        self.assertItemsEqual(y, orig_y)
-        self.assertItemsEqual(dy, orig_dy)
+        self.assertEqual(y[0], orig_y[0])
+        self.assertAlmostEqual(y[1], orig_y[1], 8)
+        self.assertAlmostEqual(y[2], orig_y[2], 8)
+        self.assertEqual(dy[0], orig_dy[0])
+        self.assertAlmostEqual(dy[1], orig_dy[1], 8)
+        self.assertAlmostEqual(dy[2], orig_dy[2], 8)
 
     def testCheckFitValues(self):
@@ -114 +122 @@
         # Good values
         self.assertTrue(self.widget.checkFitValues(self.widget.txtFitRangeMin))
-        self.assertEqual(self.widget.txtFitRangeMin.palette().color(10).name(), "#f0f0f0")
+        # Colors platform dependent
+        #self.assertEqual(self.widget.txtFitRangeMin.palette().color(10).name(), "#f0f0f0")
         # Bad values
         self.widget.x_is_log = True