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

Author: bugman
Date: Sat Jan  5 19:13:30 2008
New Revision: 4358

URL: http://svn.gna.org/viewcvs/relax?rev=4358&view=rev
Log:
Converted the CSA value setting test to the new 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=4358&r1=4357&r2=4358&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:13:30 2008
@@ -51,7 +51,6 @@
         # Test of setting the CSA.
         if test_name == 'set csa':
             # The name of the test.
-            self.name = "Setting the CSA value through the user function 
value.set()"
 
             # The test.
             self.test = self.set_csa
@@ -1188,11 +1187,8 @@
         return 1
 
 
-    def set_csa(self, pipe):
-        """Testing the setting of the CSA value."""
-
-        # Create the data pipe.
-        self.relax.interpreter._Pipe.create(pipe, 'mf')
+    def test_set_csa(self):
+        """Setting the CSA value 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'
@@ -1203,12 +1199,11 @@
         # Set the CSA value.
         self.relax.interpreter._Value.set(N15_CSA, 'csa')
 
+        # Alias the current data pipe.
+        cdp = relax_data_store[relax_data_store.current_pipe]
+
         # Test the 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
-
-        return 1
+        self.assertEqual(cdp.mol[0].res[1].spin[0].csa, N15_CSA)
 
 
     def set_csa_bond_length(self, pipe):