Changeset da9a0722 in sasview

Timestamp:

Jan 30, 2018 8:00:39 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:

5e66738

Parents:

63319b0

Message:

unit test updates

Location:

src/sas/qtgui

Files:

• GUITests.py (modified) (2 diffs)
• Perspectives/Fitting/ComplexConstraint.py (modified) (4 diffs)
• Perspectives/Fitting/ConstraintWidget.py (modified) (3 diffs)
• Perspectives/Fitting/UnitTesting/ComplexConstraintTest.py (added)
• Perspectives/Fitting/UnitTesting/ConstraintWidgetTest.py (added)
• Perspectives/Fitting/UnitTesting/MultiConstraintTest.py (modified) (2 diffs, 1 prop)

src/sas/qtgui/GUITests.py

@@ -57 +57 @@
 from Perspectives.Fitting.UnitTesting import FittingOptionsTest
 from Perspectives.Fitting.UnitTesting import MultiConstraintTest
+from Perspectives.Fitting.UnitTesting import ComplexConstraintTest
 from Perspectives.Fitting.UnitTesting import ConstraintWidgetTest
 
@@ -118 +119 @@
         unittest.makeSuite(MultiConstraintTest.MultiConstraintTest,       'test'),
         unittest.makeSuite(ConstraintWidgetTest.ConstraintWidgetTest,     'test'),
+        unittest.makeSuite(ComplexConstraintTest.ComplexConstraintTest,   'test'),
 
         #  Invariant

src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py

@@ -22 +22 @@
 
         self.setupUi(self)
-        #self.setFixedSize(self.minimumSizeHint())
         self.setModal(True)
 
@@ -34 +33 @@
         self.setupWidgets()
         self.setupSignals()
-        #self.setupTooltip()
+        self.setupTooltip()
 
         self.setFixedSize(self.minimumSizeHint())
@@ -86 +85 @@
         Tooltip for txtConstraint
         """
-        tooltip = "E.g.\n%s = 2.0 * (%s)\n" %(self.params[0], self.params[1])
-        tooltip += "%s = sqrt(%s) + 5"%(self.params[0], self.params[1])
+        p1 = self.tab_names[0] + ":" + self.cbParam1.currentText()
+        p2 = self.tab_names[1]+"."+self.cbParam2.currentText()
+        tooltip = "E.g.\n%s = 2.0 * (%s)\n" %(p1, p2)
+        tooltip += "%s = sqrt(%s) + 5"%(p1, p2)
         self.txtConstraint.setToolTip(tooltip)
 
@@ -130 +131 @@
         self.cbParam2.setCurrentIndex(index1)
         self.cbOperator.setCurrentIndex(indexOp)
-        #self.setupTooltip()
+        self.setupTooltip()
 
     def validateFormula(self):

src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

@@ -357 +357 @@
         Determines if the tab can be imported and included in the widget
         """
+        if not isinstance(tab, str): return False
         if not self.currentType in tab: return False
         object = ObjectLibrary.getObject(tab)
@@ -396 +397 @@
         menu.addSeparator()
 
-        #menu.addAction(self.actionRemoveConstraint)
         if num_rows >= 2:
             menu.addAction(self.actionMutualMultiConstrain)
 
         # Define the callbacks
-        #self.actionConstrain.triggered.connect(self.addSimpleConstraint)
-        #self.actionRemoveConstraint.triggered.connect(self.deleteConstraint)
         self.actionMutualMultiConstrain.triggered.connect(self.showMultiConstraint)
         self.actionSelect.triggered.connect(self.selectModels)
@@ -443 +441 @@
 
         # Define the callbacks
-        #self.actionConstrain.triggered.connect(self.addSimpleConstraint)
         self.actionRemoveConstraint.triggered.connect(self.deleteConstraint)
-        #self.actionMutualMultiConstrain.triggered.connect(self.showMultiConstraint)
         self.actionSelect.triggered.connect(self.selectConstraints)
         self.actionDeselect.triggered.connect(self.deselectConstraints)

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

@@ -2 +2 @@
 import unittest
 import numpy as np
+import webbrowser
 
 from unittest.mock import MagicMock
@@ -98 +99 @@
         # log10(    p2    ) +  p2
         self.assertTrue(self.widget.validateConstraint("log10(    p2    ) +  p2  "))
+
+    def testOnHelp(self):
+        """
+        Test the default help renderer
+        """
+        webbrowser.open = MagicMock()
+
+        # invoke the tested method
+        self.widget.onHelp()
+
+        # see that webbrowser open was attempted
+        webbrowser.open.assert_called_once()