r4360 - /1.3/test_suite/system_tests/model_free.py -- January 05, 2008 - 19:19

Author: bugman
Date: Sat Jan  5 19:19:01 2008
New Revision: 4360

URL: http://svn.gna.org/viewcvs/relax?rev=4360&view=rev
Log:
Converted the CSA and bond length value setting test to the new system test 
framework.


Modified:
    1.3/test_suite/system_tests/model_free.py

Modified: 1.3/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=4360&r1=4359&r2=4360&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Sat Jan  5 19:19:01 2008
@@ -48,22 +48,6 @@
 
     def old_code(self):
 
-        # Test of setting the bond length.
-        if test_name == 'set bond length':
-            # The name of the test.
-            self.name = "Setting the bond length through the user function 
value.set()"
-
-            # The test.
-            self.test = self.set_csa
-
-        # Test of setting the CSA and the bond length.
-        if test_name == 'set csa and bond length':
-            # The name of the test.
-            self.name = "Setting both the CSA value and bond length through 
the user function value.set()"
-
-            # The test.
-            self.test = self.set_csa_bond_length
-
         # Test of selecting model-free model m4.
         if test_name == 'select m4':
             # The name of the test.
@@ -1195,11 +1179,8 @@
         self.assertEqual(cdp.mol[0].res[1].spin[0].csa, N15_CSA)
 
 
-    def set_csa_bond_length(self, pipe):
-        """Testing the setting of the CSA value and bond length 
simultaneously."""
-
-        # Create the data pipe.
-        self.relax.interpreter._Pipe.create(pipe, 'mf')
+    def test_set_csa_bond_length(self):
+        """Setting both the CSA value and bond length through the user 
function value.set()."""
 
         # Path of the files.
         path = sys.path[-1] + 
'/test_suite/system_tests/data/model_free/S2_0.970_te_2048_Rex_0.149'
@@ -1210,17 +1191,12 @@
         # Set the CSA value and bond length simultaneously.
         self.relax.interpreter._Value.set([N15_CSA, NH_BOND_LENGTH], ['csa', 
'bond_length'])
 
-        # Test the CSA value.
-        if relax_data_store[pipe].mol[0].res[1].spin[0].csa != N15_CSA:
-            print "The CSA value has not been set correctly."
-            return
-
-        # Test the bond length.
-        if relax_data_store[pipe].mol[0].res[1].spin[0].r != NH_BOND_LENGTH:
-            print "The bond length has not been set correctly."
-            return
-
-        return 1
+        # Alias the current data pipe.
+        cdp = relax_data_store[relax_data_store.current_pipe]
+
+        # Test the values.
+        self.assertEqual(cdp.mol[0].res[1].spin[0].csa, N15_CSA)
+        self.assertEqual(cdp.mol[0].res[1].spin[0].r, NH_BOND_LENGTH)
 
 
     def test_values(self, val1, val2, error=None, name=None, scale=1.0, 
max=0):