Changeset 6edd344 in sasview

Timestamp:

Mar 29, 2019 12:11:34 PM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_opencl

Children:

7a1481f

Parents:

c02721c4

Message:

More unit test fixes.

Location:

src/sas/qtgui

Files:

• Calculators/UnitTesting/SLDCalculatorTest.py (modified) (4 diffs)
• Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (2 diffs)
• Plotting/Plotter.py (modified) (1 diff)
• Plotting/UnitTesting/PlotterTest.py (modified) (1 diff)

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

@@ -13 +13 @@
 
 # Local
-from sas.qtgui.Calculators.SldPanel import SldResult
+#from sas.qtgui.Calculators.SldPanel import SldResult
 from sas.qtgui.Calculators.SldPanel import SldPanel
-from sas.qtgui.Calculators.SldPanel import sldAlgorithm
+from sas.qtgui.Calculators.SldPanel import neutronSldAlgorithm, xraySldAlgorithm
 from sas.qtgui.Utilities.GuiUtils import FormulaValidator
 
@@ -22 +22 @@
 if not QtWidgets.QApplication.instance():
     app = QtWidgets.QApplication(sys.argv)
-
-class SldResultTest(unittest.TestCase):
-    """ Test the simple container class"""
-    def testObjectSize(self):
-        results = SldResult(0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
-                            0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
-        self.assertEqual(sys.getsizeof(results), 56)
 
 
@@ -38 +31 @@
         wavelength = 6.0
         
-        results = sldAlgorithm( molecular_formula,
+        results = neutronSldAlgorithm( molecular_formula,
                                 mass_density,
                                 wavelength)
-        self.assertIsInstance(results, SldResult)
+        #self.assertIsInstance(results, SldResult)
         self.assertAlmostEqual(results.neutron_length, 0.175463, 5)
         self.assertAlmostEqual(results.neutron_inc_xs, 5.365857, 5)
@@ -51 +44 @@
         wavelength = 666.0
         
-        results = sldAlgorithm( molecular_formula,
+        results = neutronSldAlgorithm( molecular_formula,
                                 mass_density,
                                 wavelength)
-        self.assertIsInstance(results, SldResult)
+        #self.assertIsInstance(results, SldResult)
         self.assertAlmostEqual(results.neutron_length,   0.059402, 5)
         self.assertAlmostEqual(results.neutron_inc_xs,   0.145427, 5)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -205 +205 @@
         model_index = self.widget.cbModel.findText("be_polyelectrolyte")
         self.widget.cbModel.setCurrentIndex(model_index)
+        QtWidgets.qApp.processEvents()
 
         # check the enablement of controls
@@ -1229 +1230 @@
         model_index = self.widget.cbModel.findText("pringle")
         self.widget.cbModel.setCurrentIndex(model_index)
+        QtWidgets.qApp.processEvents()
 
         # make sure the parameters are different than before

src/sas/qtgui/Plotting/Plotter.py

@@ -220 +220 @@
         Resize the legend window/font on canvas resize
         """
+        if not self.showLegend:
+            return
         width = _legendResize(event.width)
         # resize the legend to follow the canvas width.

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

@@ -409 +409 @@
 
         # Replace data in plot
-        self.plotter.replacePlot(1, data2)
+        self.plotter.replacePlot("Test name", data2)
 
         # See that the labels changed