Changeset 88d2e70 in sasview for test/sascalculator

Timestamp:

Oct 11, 2018 2:03:40 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249

Children:

7c4bb4d

Parents:

e090ba90

Message:

support for py37 in unit tests

File:

• test/sascalculator/test/utest_sld.py (modified) (3 diffs)

test/sascalculator/test/utest_sld.py

@@ -51 +51 @@
                                   molecule_formula=self.sld_formula)
         #test sld
-        self.assertAlmostEquals(sld_real * _SCALE, -5.6e-7, 1)
-        self.assertAlmostEquals(sld_im * _SCALE, 0)
+        self.assertAlmostEqual(sld_real * _SCALE, -5.6e-7, 1)
+        self.assertAlmostEqual(sld_im * _SCALE, 0)
         #test absorption value
-        self.assertAlmostEquals(abs, 0.0741, 2)
-        self.assertAlmostEquals(incoh, 5.62, 2)
+        self.assertAlmostEqual(abs, 0.0741, 2)
+        self.assertAlmostEqual(incoh, 5.62, 2)
         #Test length
-        self.assertAlmostEquals(length, 0.1755, 3)
+        self.assertAlmostEqual(length, 0.1755, 3)
         #test Cu sld
-        self.assertAlmostEquals(cu_real * _SCALE, 9.46e-6, 1)
-        self.assertAlmostEquals(cu_im * _SCALE, 3.01e-8)
+        self.assertAlmostEqual(cu_real * _SCALE, 9.46e-6, 1)
+        self.assertAlmostEqual(cu_im * _SCALE, 3.01e-8)
         # test Mo sld
-        self.assertAlmostEquals(mo_real * _SCALE, 9.43e-6)
-        self.assertAlmostEquals(mo_im * _SCALE, 5.65e-7,1)
+        self.assertAlmostEqual(mo_real * _SCALE, 9.43e-6)
+        self.assertAlmostEqual(mo_im * _SCALE, 5.65e-7,1)
 
 
@@ -91 +91 @@
                                   molecule_formula=self.sld_formula)
         #test sld
-        self.assertAlmostEquals(sld_real * _SCALE, 6.33e-6, 1)
-        self.assertAlmostEquals(sld_im * _SCALE, 0)
+        self.assertAlmostEqual(sld_real * _SCALE, 6.33e-6, 1)
+        self.assertAlmostEqual(sld_im * _SCALE, 0)
         #test absorption value
-        self.assertAlmostEquals(abs, 1.35e-4, 2)
-        self.assertAlmostEquals(incoh, 0.138, 2)
+        self.assertAlmostEqual(abs, 1.35e-4, 2)
+        self.assertAlmostEqual(incoh, 0.138, 2)
         #Test length
-        self.assertAlmostEquals(length, 1.549, 3)
+        self.assertAlmostEqual(length, 1.549, 3)
         #test Cu sld
-        self.assertAlmostEquals(cu_real * _SCALE, 9.36e-6, 1)
-        self.assertAlmostEquals(cu_im * _SCALE, 2.98e-8)
+        self.assertAlmostEqual(cu_real * _SCALE, 9.36e-6, 1)
+        self.assertAlmostEqual(cu_im * _SCALE, 2.98e-8)
         # test Mo sld
-        self.assertAlmostEquals(mo_real * _SCALE, 9.33e-6)
-        self.assertAlmostEquals(mo_im * _SCALE, 5.59e-9,1)
+        self.assertAlmostEqual(mo_real * _SCALE, 9.33e-6)
+        self.assertAlmostEqual(mo_im * _SCALE, 5.59e-9,1)
 
 
@@ -131 +131 @@
                                   molecule_formula=self.sld_formula)
         #test sld
-        self.assertAlmostEquals(sld_real * _SCALE, 1.04e-6, 1)
-        self.assertAlmostEquals(sld_im * _SCALE, -1.5e-7, 1)
+        self.assertAlmostEqual(sld_real * _SCALE, 1.04e-6, 1)
+        self.assertAlmostEqual(sld_im * _SCALE, -1.5e-7, 1)
         #test absorption value
-        self.assertAlmostEquals(abs, 180.0,0)
-        self.assertAlmostEquals(incoh, 0.0754, 2)
+        self.assertAlmostEqual(abs, 180.0,0)
+        self.assertAlmostEqual(incoh, 0.0754, 2)
         #Test length
-        self.assertAlmostEquals(length, 0.005551, 4)
+        self.assertAlmostEqual(length, 0.005551, 4)
         #test Cu sld
-        self.assertAlmostEquals(cu_real * _SCALE, 2.89e-5, 1)
-        self.assertAlmostEquals(cu_im * _SCALE, 2.81e-6)
+        self.assertAlmostEqual(cu_real * _SCALE, 2.89e-5, 1)
+        self.assertAlmostEqual(cu_im * _SCALE, 2.81e-6)
         # test Mo sld
-        self.assertAlmostEquals(mo_real * _SCALE, 2.84e-5, 1)
-        self.assertAlmostEquals(mo_im * _SCALE, 7.26e-7,1)
+        self.assertAlmostEqual(mo_real * _SCALE, 2.84e-5, 1)
+        self.assertAlmostEqual(mo_im * _SCALE, 7.26e-7,1)
 
 if __name__ == '__main__':