Changeset 0261bc1 in sasview

Timestamp:

Nov 20, 2017 5:55: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:

f1ec901

Parents:

6a3e1fe

Message:

Added unit tests for recent functionality

Files:

• setup.py (modified) (1 diff)
• src/sas/qtgui/GUITests.py (modified) (2 diffs)
• src/sas/qtgui/MainWindow/DataManager.py (modified) (1 diff)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (4 diffs)
• src/sas/qtgui/Perspectives/Inversion/DMaxExplorerWidget.py (modified) (1 diff)
• src/sas/qtgui/Utilities/GuiUtils.py (modified) (8 diffs)
• src/sas/qtgui/Utilities/UnitTesting/GuiUtilsTest.py (modified) (3 diffs)

setup.py

@@ -386 +386 @@
     "src", "sas", "qtgui", "Perspectives", "Inversion", "UI")
 packages.extend(["sas.qtgui.Perspectives.Inversion", "sas.qtgui.Perspectives.Inversion.UI"])
+
+package_dir["sas.qtgui.Perspectives.Corfunc"] = os.path.join(
+    "src", "sas", "qtgui", "Perspectives", "Corfunc")
+package_dir["sas.qtgui.Perspectives.Corfunc.UI"] = os.path.join(
+    "src", "sas", "qtgui", "Perspectives", "Corfunc", "UI")
+packages.extend(["sas.qtgui.Perspectives.Corfunc", "sas.qtgui.Perspectives.Corfunc.UI"])
 
 ## Plotting

src/sas/qtgui/GUITests.py

@@ -82 +82 @@
         # Main window
         unittest.makeSuite(DataExplorerTest.DataExplorerTest,  'test'),
-
-        unittest.makeSuite(GuiUtilsTest.GuiUtilsTest,          'test'),
         unittest.makeSuite(DroppableDataLoadWidgetTest.DroppableDataLoadWidgetTest, 'test'),
         unittest.makeSuite(MainWindowTest.MainWindowTest,      'test'),
@@ -91 +89 @@
 
         # Utilities
-        unittest.makeSuite(TestUtilsTest.TestUtilsTest,         'test'),
-        unittest.makeSuite(SasviewLoggerTest.SasviewLoggerTest, 'test'),
+        unittest.makeSuite(TestUtilsTest.TestUtilsTest,           'test'),
+        unittest.makeSuite(SasviewLoggerTest.SasviewLoggerTest,   'test'),
+        unittest.makeSuite(GuiUtilsTest.GuiUtilsTest,             'test'),
+        unittest.makeSuite(GuiUtilsTest.DoubleValidatorTest,      'test'),
+        unittest.makeSuite(GuiUtilsTest.HashableStandardItemTest, 'test'),
 
         # Calculators

src/sas/qtgui/MainWindow/DataManager.py

@@ -126 +126 @@
         rename data
         """
-        ## name of the data allow to differentiate data when plotted
-        name = GuiUtils.parseName(name=name, expression="_")
+        # name of the data allow to differentiate data when plotted
+        try:
+            name = GuiUtils.parseName(name=name, expression="_")
+        except TypeError:
+            # bad name sent to rename
+            return None
 
         max_char = name.find("[")

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

@@ -591 +591 @@
             try:
                 value = GuiUtils.toDouble(item.text())
-            except ValueError:
+            except TypeError:
                 # Can't be converted properly, bring back the old value and exit
                 return
@@ -606 +606 @@
             try:
                 value = GuiUtils.toDouble(item.text())
-            except ValueError:
+            except TypeError:
                 # Can't be converted properly, bring back the old value and exit
                 return
@@ -639 +639 @@
         try:
             value = GuiUtils.toDouble(item.text())
-        except ValueError:
+        except TypeError:
             # Unparsable field
             return
@@ -1310 +1310 @@
         try:
             value = GuiUtils.toDouble(item.text())
-        except ValueError:
+        except TypeError:
             # Unparsable field
             return

src/sas/qtgui/Perspectives/Inversion/DMaxExplorerWidget.py

@@ -45 +45 @@
         self.setupUi(self)
 
-        self.setWindowTitle("Dₘₐₓ Explorer")
+        self.setWindowTitle("Dₐₓ Explorer")
 
         self.pr_state = pr_state

src/sas/qtgui/Utilities/GuiUtils.py

@@ -271 +271 @@
     """
     def __init__(self, parent=None):
-        super(QtGui.QStandardItem, self).__init__()
+        super(HashableStandardItem, self).__init__()
 
     def __hash__(self):
@@ -277 +277 @@
         #return hash(self.__init__)
         return 0
+
+    def clone(self):
+        ''' Assure __hash__ is cloned as well'''
+        clone = super(HashableStandardItem, self).clone()
+        clone.__hash__ = self.__hash__
+        return clone
 
 
@@ -561 +567 @@
     with open(path,'w') as out:
         has_errors = True
-        if data.dy is None or not data.dy:
+        if data.dy is None or not data.dy.any():
             has_errors = False
         # Sanity check
@@ -571 +577 @@
                 has_errors = False
         if has_errors:
-            if data.dx is not None and data.dx:
+            if data.dx is not None and data.dx.any():
                 out.write("<X>   <Y>   <dY>   <dX>\n")
             else:
@@ -580 +586 @@
         for i in range(len(data.x)):
             if has_errors:
-                if data.dx is not None and data.dx:
+                if data.dx is not None and data.dx.any():
                     if  data.dx[i] is not None:
                         out.write("%g  %g  %g  %g\n" % (data.x[i],
@@ -857 +863 @@
         return value[0]
     else:
-        raise ValueError
+        raise TypeError
 
 class DoubleValidator(QtGui.QDoubleValidator):
@@ -867 +873 @@
         Return invalid for commas
         """
-        if (',' in input):
+        if input is not None and ',' in input:
             return (QtGui.QValidator.Invalid, input, pos)
         return super(DoubleValidator, self).validate(input, pos)
@@ -875 +881 @@
         Correct (remove) potential preexisting content
         """
-        QtGui.QDoubleValidator.fixup(input)
+        super(DoubleValidator, self).fixup(input)
         input = input.replace(",", "")
 

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

@@ -414 +414 @@
         self.assertEqual(yscale, "log")
 
+    def testParseName(self):
+        '''test parse out a string from the beinning of a string'''
+        # good input
+        value = "_test"
+        self.assertEqual(parseName(value, '_'), 'test')
+        value = "____test____"
+        self.assertEqual(parseName(value, '_'), '___test____')
+        self.assertEqual(parseName(value, '___'), '_test____')
+        self.assertEqual(parseName(value, 'test'), '____test____')
+        # bad input
+        with self.assertRaises(TypeError):
+            parseName(value, None)
+        with self.assertRaises(TypeError):
+            parseName(None, '_')
+        value = []
+        with self.assertRaises(TypeError):
+            parseName(value, '_')
+        value = 1.44
+        with self.assertRaises(TypeError):
+            parseName(value, 'p')
+        value = 100
+        with self.assertRaises(TypeError):
+            parseName(value, 'p')
+
+    def testToDouble(self):
+        '''test homemade string-> double converter'''
+        #good values
+        value = "1"
+        self.assertEqual(toDouble(value), 1.0)
+        value = "1.2"
+        # has to be AlmostEqual due to numerical rounding
+        self.assertAlmostEqual(toDouble(value), 1.2, 6)
+        value = "2,1"
+        self.assertAlmostEqual(toDouble(value), 2.1, 6)
+
+        # bad values
+        value = None
+        with self.assertRaises(TypeError):
+            toDouble(value)
+        value = "MyDouble"
+        with self.assertRaises(TypeError):
+            toDouble(value)
+        value = [1,2.2]
+        with self.assertRaises(TypeError):
+            toDouble(value)
+
+
+class DoubleValidatorTest(unittest.TestCase):
+    """ Test the validator for floats """
+    def setUp(self):
+        '''Create the validator'''
+        self.validator = DoubleValidator()
+
+    def tearDown(self):
+        '''Destroy the validator'''
+        self.validator = None
+
+    def testValidateGood(self):
+        """Test a valid float """
+        QtCore.QLocale.setDefault(QtCore.QLocale('en_US'))
+        float_good = "170"
+        self.assertEqual(self.validator.validate(float_good, 1)[0], QtGui.QValidator.Acceptable)
+        float_good = "170.11"
+        ## investigate: a double returns Invalid here!
+        ##self.assertEqual(self.validator.validate(float_good, 1)[0], QtGui.QValidator.Acceptable)
+        float_good = "17e2"
+        self.assertEqual(self.validator.validate(float_good, 1)[0], QtGui.QValidator.Acceptable)
+
+    def testValidateBad(self):
+        """Test a bad float """
+        float_bad = None
+        self.assertEqual(self.validator.validate(float_bad, 1)[0], QtGui.QValidator.Intermediate)
+        float_bad = [1]
+        with self.assertRaises(TypeError):
+           self.validator.validate(float_bad, 1)
+        float_bad = "1,3"
+        self.assertEqual(self.validator.validate(float_bad, 1)[0], QtGui.QValidator.Invalid)
+
+    def notestFixup(self):
+        """Fixup of a float"""
+        float_to_fixup = "1,3"
+        self.validator.fixup(float_to_fixup)
+        self.assertEqual(float_to_fixup, "13")
+
 
 class FormulaValidatorTest(unittest.TestCase):
@@ -434 +518 @@
 
     def testValidateBad(self):
-        """Test a valid Formula """
+        """Test an invalid Formula """
         formula_bad = "H24 %%%O12C4C6N2Pu"
         self.assertRaises(self.validator.validate(formula_bad, 1)[0])
@@ -442 +526 @@
         self.assertEqual(self.validator.validate(formula_bad, 1)[0], QtGui.QValidator.Intermediate)
 
+class HashableStandardItemTest(unittest.TestCase):
+    """ Test the reimplementation of QStandardItem """
+    def setUp(self):
+        '''Create the validator'''
+        self.item = HashableStandardItem()
+
+    def tearDown(self):
+        '''Destroy the validator'''
+        self.item = None
+
+    def testHash(self):
+        '''assure the item returns hash'''
+        self.assertEqual(self.item.__hash__(), 0)
+
+    def testIndexing(self):
+        '''test that we can use HashableSI as an index'''
+        dictionary = {}
+        dictionary[self.item] = "wow!"
+        self.assertEqual(dictionary[self.item], "wow!")
+
+    def testClone(self):
+        '''let's see if we can clone the item'''
+        item_clone = self.item.clone()
+        self.assertEqual(item_clone.__hash__(), 0)
 
 if __name__ == "__main__":