Author: bugman
Date: Fri Apr 25 11:37:00 2008
New Revision: 6002
URL: http://svn.gna.org/viewcvs/relax?rev=6002&view=rev
Log:
Fixes for all the unit tests of the spin naming an numbering functions.
Modified:
1.3/test_suite/unit_tests/_prompt/test_spin.py
1.3/test_suite/unit_tests/spin_testing_base.py
Modified: 1.3/test_suite/unit_tests/_prompt/test_spin.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_spin.py?rev=6002&r1=6001&r2=6002&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_prompt/test_spin.py (original)
+++ 1.3/test_suite/unit_tests/_prompt/test_spin.py Fri Apr 25 11:37:00 2008
@@ -158,8 +158,21 @@
self.assertRaises(RelaxNoneStrError, self.spin_fns.display,
spin_id=data[1])
- def test_rename_argfail_spin_id(self):
- """Test the proper failure of the spin.rename() user function for
the spin_id argument."""
+ def test_name_argfail_spin_id(self):
+ """Test the proper failure of the spin.name() user function for the
spin_id argument."""
+
+ # Loop over the data types.
+ for data in DATA_TYPES:
+ # Catch the None and str arguments, and skip them.
+ if data[0] == 'None' or data[0] == 'str':
+ continue
+
+ # The argument test.
+ self.assertRaises(RelaxNoneStrError, self.spin_fns.name,
spin_id=data[1])
+
+
+ def test_name_argfail_name(self):
+ """Test the proper failure of the spin.name() user function for the
name argument."""
# Loop over the data types.
for data in DATA_TYPES:
@@ -168,37 +181,24 @@
continue
# The argument test.
- self.assertRaises(RelaxStrError, self.spin_fns.rename,
spin_id=data[1])
-
-
- def test_rename_argfail_new_name(self):
- """Test the proper failure of the spin.rename() user function for
the new_name argument."""
-
- # Loop over the data types.
- for data in DATA_TYPES:
- # Catch the str arguments, and skip them.
- if data[0] == 'str':
- continue
-
- # The argument test.
- self.assertRaises(RelaxStrError, self.spin_fns.rename,
new_name=data[1])
-
-
- def test_renumber_argfail_spin_id(self):
- """Test the proper failure of the spin.renumber() user function for
the spin_id argument."""
-
- # Loop over the data types.
- for data in DATA_TYPES:
- # Catch the str arguments, and skip them.
- if data[0] == 'str':
- continue
-
- # The argument test.
- self.assertRaises(RelaxStrError, self.spin_fns.renumber,
spin_id=data[1])
-
-
- def test_renumber_argfail_new_number(self):
- """Test the proper failure of the spin.renumber() user function for
the new_number argument."""
+ self.assertRaises(RelaxStrError, self.spin_fns.name,
name=data[1])
+
+
+ def test_number_argfail_spin_id(self):
+ """Test the proper failure of the spin.number() user function for
the spin_id argument."""
+
+ # Loop over the data types.
+ for data in DATA_TYPES:
+ # Catch the None and str arguments, and skip them.
+ if data[0] == 'None' or data[0] == 'str':
+ continue
+
+ # The argument test.
+ self.assertRaises(RelaxNoneStrError, self.spin_fns.number,
spin_id=data[1])
+
+
+ def test_number_argfail_number(self):
+ """Test the proper failure of the spin.number() user function for
the number argument."""
# Loop over the data types.
for data in DATA_TYPES:
@@ -207,4 +207,4 @@
continue
# The argument test.
- self.assertRaises(RelaxIntError, self.spin_fns.renumber,
spin_id='@111', new_number=data[1])
+ self.assertRaises(RelaxIntError, self.spin_fns.number,
spin_id='@111', number=data[1])
Modified: 1.3/test_suite/unit_tests/spin_testing_base.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/spin_testing_base.py?rev=6002&r1=6001&r2=6002&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/spin_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/spin_testing_base.py Fri Apr 25 11:37:00 2008
@@ -343,18 +343,18 @@
self.spin_fns.display('#New mol:6@3239')
- def test_rename(self):
+ def test_name(self):
"""Test the renaming of a spin.
- The function tested is both generic_fns.spin.rename() and
prompt.spin.rename().
+ The function tested is both generic_fns.spin.name() and
prompt.spin.name().
"""
# Rename some spins.
- self.spin_fns.rename(spin_id='@C26', new_name='C25')
- self.spin_fns.rename(spin_id=':2@78', new_name='Ca')
- self.spin_fns.rename(spin_id='#New mol:6@3239', new_name='NHe')
-
- # Test that the spins have been renamed (and that the others have
not).
+ self.spin_fns.name(spin_id='@C26', name='C25')
+ self.spin_fns.name(spin_id=':2@78', name='Ca')
+ self.spin_fns.name(spin_id='#New mol:6@3239', name='NHe')
+
+ # Test that the spins have been named (and that the others have not).
self.assertEqual(relax_data_store['orig'].mol[0].res[0].spin[0].name, 'C8')
self.assertEqual(relax_data_store['orig'].mol[0].res[0].spin[1].name, 'C19')
self.assertEqual(relax_data_store['orig'].mol[0].res[0].spin[2].name, 'C21')
@@ -366,14 +366,14 @@
self.assertEqual(relax_data_store['orig'].mol[1].res[1].spin[1].name, 'NHe')
- def test_rename_many(self):
+ def test_name_many(self):
"""Test the renaming of multiple spins.
- The function tested is both generic_fns.spin.rename() and
prompt.spin.rename().
+ The function tested is both generic_fns.spin.name() and
prompt.spin.name().
"""
# Rename all NHs.
- self.spin_fns.rename(spin_id='@NH', new_name='N')
+ self.spin_fns.name(spin_id='@NH', name='N')
# Test the renaming of the NHs (and that the other spins have not
changed).
self.assertEqual(relax_data_store['orig'].mol[0].res[0].spin[0].name, 'C8')
@@ -387,23 +387,23 @@
self.assertEqual(relax_data_store['orig'].mol[1].res[1].spin[1].name, 'N')
- def test_renumber(self):
- """Test the renumbering of a spin.
-
- The function tested is both generic_fns.spin.renumber() and
prompt.spin.renumber().
+ def test_number(self):
+ """Test the numbering of a spin.
+
+ The function tested is both generic_fns.spin.number() and
prompt.spin.number().
"""
# Rename a few spins.
- self.spin_fns.renumber(spin_id='@111', new_number=1)
- self.spin_fns.renumber(spin_id='@6', new_number=2)
- self.spin_fns.renumber(spin_id='@7', new_number=3)
- self.spin_fns.renumber(spin_id='@8', new_number=4)
- self.spin_fns.renumber(spin_id='@9', new_number=5)
- self.spin_fns.renumber(spin_id='@78', new_number=6)
- self.spin_fns.renumber(spin_id='@239', new_number=7)
- self.spin_fns.renumber(spin_id='@3239', new_number=9)
-
- # Test that the spins have been renumbered.
+ self.spin_fns.number(spin_id='@111', number=1)
+ self.spin_fns.number(spin_id='@6', number=2)
+ self.spin_fns.number(spin_id='@7', number=3)
+ self.spin_fns.number(spin_id='@8', number=4)
+ self.spin_fns.number(spin_id='@9', number=5)
+ self.spin_fns.number(spin_id='@78', number=6)
+ self.spin_fns.number(spin_id='@239', number=7)
+ self.spin_fns.number(spin_id='@3239', number=9)
+
+ # Test that the spins have been numbered.
self.assertEqual(relax_data_store['orig'].mol[0].res[0].spin[0].num,
1)
self.assertEqual(relax_data_store['orig'].mol[0].res[0].spin[1].num,
2)
self.assertEqual(relax_data_store['orig'].mol[0].res[0].spin[2].num,
3)
@@ -414,11 +414,11 @@
self.assertEqual(relax_data_store['orig'].mol[1].res[1].spin[1].num,
9)
- def test_renumber_many_fail(self):
+ def test_number_many_fail(self):
"""Test the renaming of multiple spins.
- The function tested is both generic_fns.spin.renumber() and
prompt.spin.renumber().
- """
-
- # Try renumbering all NHs.
- self.assertRaises(RelaxError, self.spin_fns.renumber, spin_id='@NH',
new_number=-6)
+ The function tested is both generic_fns.spin.number() and
prompt.spin.number().
+ """
+
+ # Try numbering all NHs.
+ self.assertRaises(RelaxError, self.spin_fns.number, spin_id='@NH',
number=-6)
r6002 - in /1.3/test_suite/unit_tests: _prompt/test_spin.py spin_testing_base.py