r4297 - /1.3/test_suite/unit_tests/value_testing_base.py -- January 04, 2008 - 10:52

Author: bugman
Date: Fri Jan  4 10:41:38 2008
New Revision: 4297

URL: http://svn.gna.org/viewcvs/relax?rev=4297&view=rev
Log:
Bug fixes for the unit tests of the setting of default values of the diff 
params.

The correct default values are now being checked, and some tests were made 
less stringent (using
assertAlmostEqual).


Modified:
    1.3/test_suite/unit_tests/value_testing_base.py

Modified: 1.3/test_suite/unit_tests/value_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/value_testing_base.py?rev=4297&r1=4296&r2=4297&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/value_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/value_testing_base.py Fri Jan  4 10:41:38 2008
@@ -134,7 +134,7 @@
         self.value_fns.set(param='Diso')
 
         # Test the parameter.
-        self.assertEqual(cdp.diff_tensor.Diso, 1.666e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Diso, 1.666e7)
 
 
     def test_set_mf_diff_sphere_default_Da(self):
@@ -583,7 +583,7 @@
         self.value_fns.set(param='Dratio')
 
         # Test the parameter.
-        self.assertAlmostEqual(cdp.diff_tensor.Dratio, 1.2)
+        self.assertEqual(cdp.diff_tensor.Dratio, 1.0)
 
 
     def test_set_mf_diff_spheroid_default_alpha(self):
@@ -729,7 +729,7 @@
         self.value_fns.set(param=['Diso', 'Da'])
 
         # Test the parameter.
-        self.assertEqual(cdp.diff_tensor.Diso, 1.666e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Diso, 1.666e7)
         self.assertEqual(cdp.diff_tensor.Da, 0.0)
 
 
@@ -775,8 +775,8 @@
         self.value_fns.set(param=['Dpar', 'Dper'])
 
         # Test the parameter.
-        self.assertAlmostEqual(cdp.diff_tensor.Dpar, 1e7)
-        self.assertAlmostEqual(cdp.diff_tensor.Dper, 2e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Dpar, 1.666e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Dper, 1.666e7)
 
 
     def test_set_mf_diff_spheroid_default_Dper_Dpar(self):
@@ -798,8 +798,8 @@
         self.value_fns.set(param=['Dper', 'Dpar'])
 
         # Test the parameter.
-        self.assertAlmostEqual(cdp.diff_tensor.Dper, 1e7)
-        self.assertAlmostEqual(cdp.diff_tensor.Dpar, 2e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Dper, 1.666e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Dpar, 1.666e7)
 
 
     def test_set_mf_diff_spheroid_default_Diso_Dratio(self):
@@ -821,7 +821,7 @@
         self.value_fns.set(param=['Diso', 'Dratio'])
 
         # Test the parameter.
-        self.assertEqual(cdp.diff_tensor.Diso, 1.666e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Diso, 1.666e7)
         self.assertEqual(cdp.diff_tensor.Dratio, 1.0)
 
 
@@ -1217,9 +1217,9 @@
         self.value_fns.set(param=['Dx', 'Dy', 'Dz'])
 
         # Test the parameters.
-        self.assertEqual(cdp.diff_tensor.Dx, 1.666e7)
-        self.assertEqual(cdp.diff_tensor.Dy, 1.666e7)
-        self.assertEqual(cdp.diff_tensor.Dz, 1.666e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Dx, 1.666e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Dy, 1.666e7)
+        self.assertAlmostEqual(cdp.diff_tensor.Dz, 1.666e7)
 
 
     def test_set_mf_diff_ellipsoid_default_tm_Diso_Dr(self):