Author: bugman
Date: Sun Jan 6 00:37:50 2008
New Revision: 4379
URL: http://svn.gna.org/viewcvs/relax?rev=4379&view=rev
Log:
Removed all the setting of the homonucleus unit tests.
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=4379&r1=4378&r2=4379&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:37:50 2008
@@ -2544,26 +2544,6 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'C')
- def test_set_jw_all_spins_homonuc(self):
- """Set the RSDM homonucleus type for all spins.
-
- The functions tested are both generic_fns.value.set() and
prompt.value.set().
- """
-
- # Set the current data pipe to 'jw'.
- relax_data_store.current_pipe = 'jw'
-
- # Alias the current data pipe.
- cdp = relax_data_store[relax_data_store.current_pipe]
-
- # Set the parameter.
- self.value_fns.set(param='homonuc', val='H')
-
- # Test the parameter.
- self.assertEqual(cdp.mol[0].res[0].spin[0].homonuc, 'H')
- self.assertEqual(cdp.mol[0].res[1].spin[0].homonuc, 'H')
-
-
def test_set_jw_all_spins_diff_j0_jwx_jwh(self):
"""Set different RSDM parameters J(0), J(wX), J(wH) for all spins.
@@ -2720,8 +2700,8 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'N')
- def test_set_jw_defaults_homonuc(self):
- """Set the RSDM homonucleus type to the default value.
+ def test_set_jw_defaults_j0_jwx_jwh(self):
+ """Set different RSDM parameters J(0), J(wX), J(wH) to the default
values (there are none!).
The functions tested are both generic_fns.value.set() and
prompt.value.set().
"""
@@ -2733,15 +2713,11 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='homonuc')
-
- # Test the parameter.
- self.assertEqual(cdp.mol[0].res[0].spin[0].homonuc, 'H')
- self.assertEqual(cdp.mol[0].res[1].spin[0].homonuc, 'H')
-
-
- def test_set_jw_defaults_j0_jwx_jwh(self):
- """Set different RSDM parameters J(0), J(wX), J(wH) to the default
values (there are none!).
+ self.assertRaises(RelaxParamSetError, self.value_fns.set,
param=['J(0)', 'jwx', 'J(wH)'])
+
+
+ def test_set_jw_single_spin_j0(self):
+ """Set the RSDM parameter J(0) for a single spin.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
"""
@@ -2753,11 +2729,15 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.assertRaises(RelaxParamSetError, self.value_fns.set,
param=['J(0)', 'jwx', 'J(wH)'])
-
-
- def test_set_jw_single_spin_j0(self):
- """Set the RSDM parameter J(0) for a single spin.
+ self.value_fns.set(param='j0', val=4.5e-9, spin_id='@112')
+
+ # Test the parameter.
+ self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'j0'))
+ self.assertEqual(cdp.mol[0].res[1].spin[0].j0, 4.5e-9)
+
+
+ def test_set_jw_single_spin_jwx(self):
+ """Set the RSDM parameter J(wX) for a single spin.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
"""
@@ -2769,15 +2749,15 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='j0', val=4.5e-9, spin_id='@112')
-
- # Test the parameter.
- self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'j0'))
- self.assertEqual(cdp.mol[0].res[1].spin[0].j0, 4.5e-9)
-
-
- def test_set_jw_single_spin_jwx(self):
- """Set the RSDM parameter J(wX) for a single spin.
+ self.value_fns.set(param='jwx', val=2.3e-10, spin_id='@112')
+
+ # Test the parameter.
+ self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'jwx'))
+ self.assertEqual(cdp.mol[0].res[1].spin[0].jwx, 2.3e-10)
+
+
+ def test_set_jw_single_spin_jwh(self):
+ """Set the RSDM parameter J(wH) for a single spin.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
"""
@@ -2789,15 +2769,15 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='jwx', val=2.3e-10, spin_id='@112')
-
- # Test the parameter.
- self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'jwx'))
- self.assertEqual(cdp.mol[0].res[1].spin[0].jwx, 2.3e-10)
-
-
- def test_set_jw_single_spin_jwh(self):
- """Set the RSDM parameter J(wH) for a single spin.
+ self.value_fns.set(param='J(wH)', val=1.7e-12, spin_id='@112')
+
+ # Test the parameter.
+ self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'jwh'))
+ self.assertEqual(cdp.mol[0].res[1].spin[0].jwh, 1.7e-12)
+
+
+ def test_set_jw_single_spin_r(self):
+ """Set the RSDM bond length parameter for a single spin.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
"""
@@ -2809,15 +2789,15 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='J(wH)', val=1.7e-12, spin_id='@112')
-
- # Test the parameter.
- self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'jwh'))
- self.assertEqual(cdp.mol[0].res[1].spin[0].jwh, 1.7e-12)
-
-
- def test_set_jw_single_spin_r(self):
- """Set the RSDM bond length parameter for a single spin.
+ self.value_fns.set(param='Bond_length', val=1.04e-10, spin_id='@112')
+
+ # Test the parameter.
+ self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'r'))
+ self.assertEqual(cdp.mol[0].res[1].spin[0].r, 1.04e-10)
+
+
+ def test_set_jw_single_spin_csa(self):
+ """Set the RSDM CSA parameter for a single spin.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
"""
@@ -2829,15 +2809,15 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='Bond_length', val=1.04e-10, spin_id='@112')
-
- # Test the parameter.
- self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'r'))
- self.assertEqual(cdp.mol[0].res[1].spin[0].r, 1.04e-10)
-
-
- def test_set_jw_single_spin_csa(self):
- """Set the RSDM CSA parameter for a single spin.
+ self.value_fns.set(param='csa', val=-160e-6, spin_id='@112')
+
+ # Test the parameter.
+ self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'csa'))
+ self.assertEqual(cdp.mol[0].res[1].spin[0].csa, -160e-6)
+
+
+ def test_set_jw_single_spin_heteronuc(self):
+ """Set the RSDM heteronucleus type for a single spin.
The functions tested are both generic_fns.value.set() and
prompt.value.set().
"""
@@ -2849,51 +2829,11 @@
cdp = relax_data_store[relax_data_store.current_pipe]
# Set the parameter.
- self.value_fns.set(param='csa', val=-160e-6, spin_id='@112')
-
- # Test the parameter.
- self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'csa'))
- self.assertEqual(cdp.mol[0].res[1].spin[0].csa, -160e-6)
-
-
- def test_set_jw_single_spin_heteronuc(self):
- """Set the RSDM heteronucleus type for a single spin.
-
- The functions tested are both generic_fns.value.set() and
prompt.value.set().
- """
-
- # Set the current data pipe to 'jw'.
- relax_data_store.current_pipe = 'jw'
-
- # Alias the current data pipe.
- 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')
-
-
- def test_set_jw_single_spin_homonuc(self):
- """Set the RSDM homonucleus type for a single spin.
-
- The functions tested are both generic_fns.value.set() and
prompt.value.set().
- """
-
- # Set the current data pipe to 'jw'.
- relax_data_store.current_pipe = 'jw'
-
- # Alias the current data pipe.
- cdp = relax_data_store[relax_data_store.current_pipe]
-
- # Set the parameter.
- self.value_fns.set(param='homonuc', val='H', spin_id='@112')
-
- # Test the parameter.
- self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'homonuc'))
- self.assertEqual(cdp.mol[0].res[1].spin[0].homonuc, 'H')
def test_set_jw_single_spin_diff_j0_jwx_jwh(self):
@@ -3170,26 +3110,6 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'C')
- def test_set_mf_all_spins_homonuc(self):
- """Set the model-free homonucleus type for all spins.
-
- The functions tested are both generic_fns.value.set() and
prompt.value.set().
- """
-
- # Set the current data pipe to 'mf'.
- relax_data_store.current_pipe = 'mf'
-
- # Alias the current data pipe.
- cdp = relax_data_store[relax_data_store.current_pipe]
-
- # Set the parameter.
- self.value_fns.set(param='homonuc', val='H')
-
- # Test the parameter.
- self.assertEqual(cdp.mol[0].res[0].spin[0].homonuc, 'H')
- self.assertEqual(cdp.mol[0].res[1].spin[0].homonuc, 'H')
-
-
def test_set_mf_all_spins_diff_s2f_s2s(self):
"""Set the model-free S2f and S2s parameters for all spins to
different values.
@@ -3454,26 +3374,6 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'N')
- def test_set_mf_defaults_homonuc(self):
- """Set the model-free homonucleus type to the default value.
-
- The functions tested are both generic_fns.value.set() and
prompt.value.set().
- """
-
- # Set the current data pipe to 'mf'.
- relax_data_store.current_pipe = 'mf'
-
- # Alias the current data pipe.
- cdp = relax_data_store[relax_data_store.current_pipe]
-
- # Set the parameter.
- self.value_fns.set(param='homonuc')
-
- # Test the parameter.
- self.assertEqual(cdp.mol[0].res[0].spin[0].homonuc, 'H')
- self.assertEqual(cdp.mol[0].res[1].spin[0].homonuc, 'H')
-
-
def test_set_mf_defaults_s2f_s2s(self):
"""Set the model-free S2f and S2s parameters to the default values.
@@ -3716,26 +3616,6 @@
self.assertEqual(cdp.mol[0].res[1].spin[0].heteronuc, 'C')
- def test_set_mf_single_spin_homonuc(self):
- """Set the model-free homonucleus type for a single spin.
-
- The functions tested are both generic_fns.value.set() and
prompt.value.set().
- """
-
- # Set the current data pipe to 'mf'.
- relax_data_store.current_pipe = 'mf'
-
- # Alias the current data pipe.
- cdp = relax_data_store[relax_data_store.current_pipe]
-
- # Set the parameter.
- self.value_fns.set(param='homonuc', val='H', spin_id='@112')
-
- # Test the parameter.
- self.assert_(not hasattr(cdp.mol[0].res[0].spin[0], 'homonuc'))
- self.assertEqual(cdp.mol[0].res[1].spin[0].homonuc, 'H')
-
-
def test_set_mf_single_spin_diff_s2f_s2s(self):
"""Set the model-free S2f and S2s parameters for a single spin to
different values.
r4379 - /1.3/test_suite/unit_tests/value_testing_base.py