r5221 - /1.3/test_suite/unit_tests/value_testing_base.py -- March 23, 2008 - 18:56

Author: bugman
Date: Sun Mar 23 18:56:10 2008
New Revision: 5221

URL: http://svn.gna.org/viewcvs/relax?rev=5221&view=rev
Log:
Modified the unit tests due to the changed of r5220.


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=5221&r1=5220&r2=5221&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/value_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/value_testing_base.py Sun Mar 23 18:56:10 2008
@@ -2537,11 +2537,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_jw_all_spins_diff_j0_jwx_jwh(self):
@@ -2693,11 +2693,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_jw_defaults_j0_jwx_jwh(self):
@@ -2829,11 +2829,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_jw_single_spin_diff_j0_jwx_jwh(self):
@@ -3103,11 +3103,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_mf_all_spins_diff_s2f_s2s(self):
@@ -3367,11 +3367,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_mf_defaults_s2f_s2s(self):
@@ -3609,11 +3609,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_mf_single_spin_diff_s2f_s2s(self):