Changeset e4676c8 in sasview for src/sas/qtgui/UnitTesting

Timestamp:

Nov 3, 2016 4:07:10 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:

ca8b853

Parents:

f140169

Message:

Added SLDCalculator unit tests. Refactored things a bit.

Location:

src/sas/qtgui/UnitTesting

Files:

• DensityCalculatorTest.py (modified) (2 diffs)
• GuiUtilsTest.py (modified) (1 diff)
• SLDCalculatorTest.py (added)

src/sas/qtgui/UnitTesting/DensityCalculatorTest.py

@@ -15 +15 @@
 from DensityPanel import DensityPanel
 from DensityPanel import toMolarMass
-from DensityPanel import FormulaValidator
+from GuiUtils import FormulaValidator
 
 import LocalConfig
@@ -37 +37 @@
     def testBadInputStr(self):
         self.assertEqual(toMolarMass("Im a bad string"), "")
-
-class FormulaValidatorTest(unittest.TestCase):
-    """ Test the formula validator """
-    def setUp(self):
-        '''Create the validator'''
-        self.validator = FormulaValidator()
-
-    def tearDown(self):
-        '''Destroy the validator'''
-        self.validator = None
-
-    def testValidateGood(self):
-        """Test a valid Formula """
-        formula_good = "H24O12C4C6N2Pu"
-        self.assertEqual(self.validator.validate(formula_good, 1)[0], QtGui.QValidator.Acceptable)
-
-        formula_good = "(H2O)0.5(D2O)0.5"
-        self.assertEqual(self.validator.validate(formula_good, 1)[0], QtGui.QValidator.Acceptable)
-
-    def testValidateBad(self):
-        """Test a valid Formula """
-        formula_bad = "H24 %%%O12C4C6N2Pu"
-        self.assertRaises(self.validator.validate(formula_bad, 1)[0])
-        self.assertEqual(self.validator.validate(formula_bad, 1)[0], QtGui.QValidator.Intermediate)
-
-        formula_bad = [1]
-        self.assertEqual(self.validator.validate(formula_bad, 1)[0], QtGui.QValidator.Intermediate)
 
 class DensityCalculatorTest(unittest.TestCase):

src/sas/qtgui/UnitTesting/GuiUtilsTest.py

@@ -324 +324 @@
         self.assertFalse(os.path.isfile(file_name))
 
+class FormulaValidatorTest(unittest.TestCase):
+    """ Test the formula validator """
+    def setUp(self):
+        '''Create the validator'''
+        self.validator = FormulaValidator()
+
+    def tearDown(self):
+        '''Destroy the validator'''
+        self.validator = None
+
+    def testValidateGood(self):
+        """Test a valid Formula """
+        formula_good = "H24O12C4C6N2Pu"
+        self.assertEqual(self.validator.validate(formula_good, 1)[0], QtGui.QValidator.Acceptable)
+
+        formula_good = "(H2O)0.5(D2O)0.5"
+        self.assertEqual(self.validator.validate(formula_good, 1)[0], QtGui.QValidator.Acceptable)
+
+    def testValidateBad(self):
+        """Test a valid Formula """
+        formula_bad = "H24 %%%O12C4C6N2Pu"
+        self.assertRaises(self.validator.validate(formula_bad, 1)[0])
+        self.assertEqual(self.validator.validate(formula_bad, 1)[0], QtGui.QValidator.Intermediate)
+
+        formula_bad = [1]
+        self.assertEqual(self.validator.validate(formula_bad, 1)[0], QtGui.QValidator.Intermediate)
+
 
 if __name__ == "__main__":