Changeset 80468f6 in sasview for src/sas/qtgui/Utilities

Timestamp:

May 7, 2018 6:43:54 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:

fca1f50

Parents:

b5cc06e

Message:

Fixed a few unit test files

Location:

src/sas/qtgui/Utilities/UnitTesting

Files:

• GridPanelTest.py (modified) (4 diffs)
• PluginDefinitionTest.py (modified) (1 diff, 1 prop)
• TabbedModelEditorTest.py (modified) (5 diffs, 1 prop)

src/sas/qtgui/Utilities/UnitTesting/GridPanelTest.py

@@ -16 +16 @@
 
 from sas.sascalc.fit.AbstractFitEngine import FResult
+from sas.sascalc.fit.AbstractFitEngine import FitData1D
 from sasmodels.sasview_model import load_standard_models
 from sas.qtgui.Plotting.PlotterData import Data1D
@@ -32 +33 @@
         # dummy perspective
         class dummy_manager(object):
+            _parent = QtWidgets.QWidget()
             def communicator(self):
                 return GuiUtils.Communicate()
@@ -56 +58 @@
         self.assertIsNotNone(m)
         data = Data1D(x=[1,2], y=[3,4], dx=[0.1, 0.1], dy=[0.,0.])
+        fit_data = FitData1D(x=[1,2], y=[3,4], data=data)
         param_list = ['sld_shell', 'sld_solvent']
-        output = FResult(model=model, data=data, param_list=param_list)
+        output = FResult(model=model, data=fit_data, param_list=param_list)
+        output.sas_data = data
         output.theory = np.array([0.1,0.2])
         output.pvec = np.array([0.1, 0.02])
@@ -63 +67 @@
         output.fitness = 9000.0
         output.fitter_id = 200
+        output.stderr = [0.001, 0.001]
         output_data = [[output],[output]]
         return output_data

src/sas/qtgui/Utilities/UnitTesting/PluginDefinitionTest.py

@@ -16 +16 @@
 from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter
 
-#if not QApplication.instance():
-#    app = QApplication(sys.argv)
-app = QApplication(sys.argv)
+if not QApplication.instance():
+    app = QApplication(sys.argv)
 
 class PluginDefinitionTest(unittest.TestCase):

src/sas/qtgui/Utilities/UnitTesting/TabbedModelEditorTest.py

@@ -16 +16 @@
 
 # Local
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 from sas.qtgui.Utilities.TabbedModelEditor import TabbedModelEditor
 from sas.qtgui.Utilities.PluginDefinition import PluginDefinition
@@ -21 +22 @@
 
 
-#if not QApplication.instance():
-#    app = QApplication(sys.argv)
-app = QApplication(sys.argv)
+if not QApplication.instance():
+    app = QApplication(sys.argv)
 
 class TabbedModelEditorTest(unittest.TestCase):
@@ -30 +30 @@
         Prepare the editors
         """
-        self.widget = TabbedModelEditor(None)
-        self.widget_edit = TabbedModelEditor(None, edit_only=True)
+        class dummy_manager(object):
+            _parent = QWidget()
+            communicate = GuiUtils.Communicate()
+
+        self.widget = TabbedModelEditor(parent=dummy_manager)
+        self.widget_edit = TabbedModelEditor(parent=dummy_manager, edit_only=True)
 
     def tearDown(self):
@@ -139 +143 @@
 
 
-    def testPluginModelModified(self):
+    def testpluginTitleSet(self):
         """Test reaction to direct edit in plugin wizard"""
         self.assertFalse(self.widget.is_modified)
 
         # Call the tested method with no filename defined
-        self.widget.pluginModelModified()
+        self.widget.pluginTitleSet()
 
         # Assure the apply button is disabled
@@ -157 +161 @@
         self.assertIn("*", self.widget.windowTitle())
         self.assertIn(new_name, self.widget.windowTitle())
-        self.assertTrue(self.widget.editor_widget.isEnabled())
         self.assertTrue(self.widget.buttonBox.button(QDialogButtonBox.Apply).isEnabled())
         self.assertTrue(self.widget.is_modified)