r5244 - /branches/consistency_tests_1.3/test_suite/unit_tests/value_testing_base.py -- April 01, 2008 - 22:34

Author: semor
Date: Tue Apr  1 22:34:43 2008
New Revision: 5244

URL: http://svn.gna.org/viewcvs/relax?rev=5244&view=rev
Log:
Changes to the consistency tests code to reflect the model-free changes of 
r5220.

These changes are similar to those made to the J(w) mapping code in r5223.


Modified:
    branches/consistency_tests_1.3/test_suite/unit_tests/value_testing_base.py

Modified: 
branches/consistency_tests_1.3/test_suite/unit_tests/value_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/test_suite/unit_tests/value_testing_base.py?rev=5244&r1=5243&r2=5244&view=diff
==============================================================================
--- 
branches/consistency_tests_1.3/test_suite/unit_tests/value_testing_base.py 
(original)
+++ 
branches/consistency_tests_1.3/test_suite/unit_tests/value_testing_base.py 
Tue Apr  1 22:34:43 2008
@@ -215,11 +215,11 @@
         cdp = relax_data_store[relax_data_store.current_pipe]
 
         # Set the parameter.
-        self.value_fns.set(param='nucleus', val='C')
-
-        # Test the parameter.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].nucleus, 'C')
-        self.assertEqual(cdp.mol[0].res[1].spin[0].nucleus, 'C')
+        self.value_fns.set(param='heteronucleus', val='13C')
+
+        # Test the parameter.
+        self.assertEqual(cdp.mol[0].res[0].spin[0].heteronuc_type, '13C')
+        self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc_type, '13C')
 
 
     def test_set_ct_all_spins_orientation(self):
@@ -411,11 +411,11 @@
         cdp = relax_data_store[relax_data_store.current_pipe]
 
         # Set the parameter.
-        self.value_fns.set(param='nucleus')
-
-        # Test the parameter.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].nucleus, 'N')
-        self.assertEqual(cdp.mol[0].res[1].spin[0].nucleus, 'N')
+        self.value_fns.set(param='heteronucleus')
+
+        # Test the parameter.
+        self.assertEqual(cdp.mol[0].res[0].spin[0].heteronuc_type, '15N')
+        self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc_type, '15N')
 
 
     def test_set_ct_defaults_orientation(self):
@@ -575,7 +575,7 @@
 
 
     def test_set_ct_single_spin_nucleus(self):
-        """Set the consistency tests heteronucleus type for a single spin.
+        """Set the consistency testing heteronucleus type for a single spin.
 
         The functions tested are both generic_fns.value.set() and 
prompt.value.set().
         """
@@ -587,11 +587,11 @@
         cdp = relax_data_store[relax_data_store.current_pipe]
 
         # Set the parameter.
-        self.value_fns.set(param='nucleus', val='C', spin_id='@112')
-
-        # Test the parameter.
-        self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'nucleus'))
-        self.assertEqual(cdp.mol[0].res[1].spin[0].nucleus, 'C')
+        self.value_fns.set(param='heteronucleus', val='13C', spin_id='@112')
+
+        # Test the parameter.
+        self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 
'heteronuc_type'))
+        self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc_type, '13C')
 
 
     def test_set_ct_single_spin_orientation(self):