Author: bugman
Date: Sun Jan 6 00:40:49 2008
New Revision: 4380
URL: http://svn.gna.org/viewcvs/relax?rev=4380&view=rev
Log:
Fixed all the unit tests of setting the heteronucleus type.
The variable will be called 'nucleus' and not 'heteronuc'.
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=4380&r1=4379&r2=4380&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/value_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/value_testing_base.py Sun Jan 6 00:40:49 2008
@@ -2524,7 +2524,7 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].csa, -160e-6)
- def test_set_jw_all_spins_heteronuc(self):
+ def test_set_jw_all_spins_nucleus(self):
"""Set the RSDM heteronucleus type for all spins.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
@@ -2537,11 +2537,11 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='heteronuc', val='C')
-
- # Test the parameter.
- self.assertEqual(cdp.mol[0].res[0].spin[0].heteronuc, 'C')
- self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'C')
+ 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')
def test_set_jw_all_spins_diff_j0_jwx_jwh(self):
@@ -2680,7 +2680,7 @@
self.assertAlmostEqual(cdp.mol[0].res[1].spin[0].csa, -172e-6)
- def test_set_jw_defaults_heteronuc(self):
+ def test_set_jw_defaults_nucleus(self):
"""Set the RSDM heteronucleus type to the default value.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
@@ -2693,11 +2693,11 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='heteronuc')
-
- # Test the parameter.
- self.assertEqual(cdp.mol[0].res[0].spin[0].heteronuc, 'N')
- self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'N')
+ 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')
def test_set_jw_defaults_j0_jwx_jwh(self):
@@ -2816,7 +2816,7 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].csa, -160e-6)
- def test_set_jw_single_spin_heteronuc(self):
+ def test_set_jw_single_spin_nucleus(self):
"""Set the RSDM heteronucleus type for a single spin.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
@@ -2829,11 +2829,11 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='heteronuc', val='C', spin_id='@112')
-
- # Test the parameter.
- self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'heteronuc'))
- self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'C')
+ 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')
def test_set_jw_single_spin_diff_j0_jwx_jwh(self):
@@ -3090,7 +3090,7 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].csa, -172e-6)
- def test_set_mf_all_spins_heteronuc(self):
+ def test_set_mf_all_spins_nucleus(self):
"""Set the model-free heteronucleus type for all spins.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
@@ -3103,11 +3103,11 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='heteronuc', val='C')
-
- # Test the parameter.
- self.assertEqual(cdp.mol[0].res[0].spin[0].heteronuc, 'C')
- self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'C')
+ 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')
def test_set_mf_all_spins_diff_s2f_s2s(self):
@@ -3354,7 +3354,7 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].csa, -172 * 1e-6)
- def test_set_mf_defaults_heteronuc(self):
+ def test_set_mf_defaults_nucleus(self):
"""Set the model-free heteronucleus type to the default value.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
@@ -3367,11 +3367,11 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='heteronuc')
-
- # Test the parameter.
- self.assertEqual(cdp.mol[0].res[0].spin[0].heteronuc, 'N')
- self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'N')
+ 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')
def test_set_mf_defaults_s2f_s2s(self):
@@ -3596,7 +3596,7 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].csa, -172e-6)
- def test_set_mf_single_spin_heteronuc(self):
+ def test_set_mf_single_spin_nucleus(self):
"""Set the model-free heteronucleus type for a single spin.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
@@ -3609,11 +3609,11 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='heteronuc', val='C', spin_id='@112')
-
- # Test the parameter.
- self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'heteronuc'))
- self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'C')
+ 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')
def test_set_mf_single_spin_diff_s2f_s2s(self):
r4380 - /1.3/test_suite/unit_tests/value_testing_base.py