Changeset 0a6e097 in sasview

Timestamp:

May 1, 2017 4:20:03 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:

d48cc19

Parents:

28a09b0

Message:

Unit tests for the GSC fixed, additional files uploaded

Location:

src/sas/qtgui

Files:

• Calculators/UnitTesting/GenericScatteringCalculatorTest.py (modified) (12 diffs)
• UnitTesting/A_Raw_Example-1.omf (added)
• UnitTesting/diamdsml.pdb (added)
• UnitTesting/sld_file.sld (added)

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -16 +16 @@
 from UnitTesting.TestUtils import QtSignalSpy
 from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
-from GenericScatteringCalculator import GenericScatteringCalculator
-from GenericScatteringCalculator import Plotter3D
+from sas.qtgui.Calculators.GenericScatteringCalculator import GenericScatteringCalculator
+from sas.qtgui.Calculators.GenericScatteringCalculator import Plotter3D
 
 from sas.sasgui.guiframe.data_manager import DataManager
-from GuiManager import GuiManager
-from sas.qtgui.GuiUtils import *
+from sas.qtgui.MainWindow.GuiManager import GuiManager
+from sas.qtgui.Utilities.GuiUtils import *
 from sas.sascalc.calculator import sas_gen
 
@@ -173 +173 @@
         Load sld data and check modifications of GUI
         """
-        filename = "../../../sasview/test/save_states/sld_file.sld"
+        filename = os.path.join("UnitTesting", "sld_file.sld")
         QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
         self.widget.loadFile()
@@ -205 +205 @@
         # Mx,y,z x,y,znodes and x,y,zstepsize buttons
         self.assertFalse(self.widget.txtMx.isEnabled())
-        self.assertEqual(self.widget.txtMx.text(), '8.0795e-07')
+        self.assertAlmostEqual(float(self.widget.txtMx.text()), 8.0795e-07, 4)
         self.assertFalse(self.widget.txtMy.isEnabled())
-        self.assertEqual(self.widget.txtMy.text(), '8.0795e-07')
+        self.assertAlmostEqual(float(self.widget.txtMy.text()), 8.0795e-07, 4)
         self.assertFalse(self.widget.txtMz.isEnabled())
-        self.assertEqual(self.widget.txtMz.text(), '3.1739e-07')
+        self.assertAlmostEqual(float(self.widget.txtMz.text()), 3.1739e-07, 4)
         self.assertTrue(self.widget.txtNucl.isEnabled())
         self.assertEqual(self.widget.txtNucl.text(), '0')
@@ -236 +236 @@
         Load pdb data and check modifications of GUI
         """
-        filename = "diamdsml.pdb"
+        filename = os.path.join("UnitTesting", "diamdsml.pdb")
+
         QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
         self.widget.loadFile()
@@ -275 +276 @@
         self.assertEqual(self.widget.txtMz.text(), '0')
         self.assertFalse(self.widget.txtNucl.isEnabled())
-        self.assertEqual(self.widget.txtNucl.text(), '7.0003e-06')
+        self.assertAlmostEqual(float(self.widget.txtNucl.text()), 7.0003e-06, 4)
 
         self.assertFalse(self.widget.txtXnodes.isEnabled())
@@ -298 +299 @@
         Load omf data and check modifications of GUI
         """
-        filename = "../../../sasview/test/1d_data/A_Raw_Example-1.omf"
+        filename = os.path.join("UnitTesting", "A_Raw_Example-1.omf")
+
         QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
         self.widget.loadFile()
@@ -325 +327 @@
         # Mx,y,z x,y,znodes and x,y,zstepsize buttons
         self.assertFalse(self.widget.txtMx.isEnabled())
-        self.assertEqual(self.widget.txtMx.text(), '7.855e-09')
+        self.assertAlmostEqual(float(self.widget.txtMx.text()), 7.855e-09, 4)
         self.assertFalse(self.widget.txtMy.isEnabled())
-        self.assertEqual(self.widget.txtMy.text(), '4.5169e-08')
+        self.assertAlmostEqual(float(self.widget.txtMy.text()), 4.517e-08, 4)
         self.assertFalse(self.widget.txtMz.isEnabled())
-        self.assertEqual(self.widget.txtMz.text(), '9.9511e-10')
+        self.assertAlmostEqual(float(self.widget.txtMz.text()), 9.9511e-10, 4)
         self.assertTrue(self.widget.txtNucl.isEnabled())
         self.assertEqual(self.widget.txtNucl.text(), '0')
@@ -364 +366 @@
         """
         # load data
-        filename = "diamdsml.pdb"
+        filename = os.path.join("UnitTesting", "diamdsml.pdb")
+
         QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
         self.widget.loadFile()
@@ -383 +386 @@
         """
         self.assertFalse(self.widget.cmdDraw.isEnabled())
-        # filename = "../../../sasview/test/upcoming_formats/dna.pdb"
-        filename = "diamdsml.pdb"
+        filename = os.path.join("UnitTesting", "diamdsml.pdb")
         QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
         self.widget.loadFile()
@@ -403 +405 @@
         Test Save feature to .sld file
         """
-        filename = "../../../sasview/test/save_states/sld_file.sld"
+        filename = os.path.join("UnitTesting", "sld_file.sld")
+
         QtGui.QFileDialog.getOpenFileName = MagicMock(return_value=filename)
         self.widget.loadFile()
@@ -409 +412 @@
         time.sleep(0.1)
 
-        filename1 = "../../../sasview/test/save_states/test"
+        filename1 = "test"
         QtGui.QFileDialog.getSaveFileName = MagicMock(return_value=filename1)
 
@@ -417 +420 @@
         self.assertTrue(os.path.getsize(filename1 + '.sld') > 0)
 
-        os.remove("../../../sasview/test/save_states/test.sld")
+        os.remove("test.sld")