r8917 - in /1.3/test_suite/unit_tests: molecule_testing_base.py residue_testing_base.py spin_testing_base.py -- March 06, 2009 - 14:37

Author: bugman
Date: Fri Mar  6 14:37:58 2009
New Revision: 8917

URL: http://svn.gna.org/viewcvs/relax?rev=8917&view=rev
Log:
Fixes for all the unit tests of the mol/res/spin naming and numbering.


Modified:
    1.3/test_suite/unit_tests/molecule_testing_base.py
    1.3/test_suite/unit_tests/residue_testing_base.py
    1.3/test_suite/unit_tests/spin_testing_base.py

Modified: 1.3/test_suite/unit_tests/molecule_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/molecule_testing_base.py?rev=8917&r1=8916&r2=8917&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/molecule_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/molecule_testing_base.py Fri Mar  6 14:37:58 
2009
@@ -369,7 +369,7 @@
         dp = pipes.get_pipe('orig')
 
         # Rename the molecule.
-        self.molecule_fns.name(mol_id='#New mol', name='K')
+        self.molecule_fns.name(mol_id='#New mol', name='K', force=True)
 
         # Test that the molecule has been renamed.
         self.assertEqual(dp.mol[1].name, 'K')

Modified: 1.3/test_suite/unit_tests/residue_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/residue_testing_base.py?rev=8917&r1=8916&r2=8917&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/residue_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/residue_testing_base.py Fri Mar  6 14:37:58 2009
@@ -466,7 +466,7 @@
         self.residue_fns.create(-10, 'His')
 
         # Rename the residue.
-        self.residue_fns.name(res_id=':-10', name='K')
+        self.residue_fns.name(res_id=':-10', name='K', force=True)
 
         # Test that the residue has been renamed.
         self.assertEqual(dp.mol[0].res[0].name, 'K')
@@ -497,7 +497,7 @@
         self.residue_fns.copy(res_from=':1', res_to=':4,Met')
 
         # Rename all alanines.
-        self.residue_fns.name(res_id=':Ala', name='Gln')
+        self.residue_fns.name(res_id=':Ala', name='Gln', force=True)
 
         # Test the renaming of alanines.
         self.assertEqual(dp.mol[0].res[1].name, 'Gln')
@@ -533,7 +533,7 @@
         self.residue_fns.create(-10, 'His')
 
         # Rename the residue.
-        self.residue_fns.number(res_id=':-10', number=10)
+        self.residue_fns.number(res_id=':-10', number=10, force=True)
 
         # Test that the residue has been renumbered.
         self.assertEqual(dp.mol[0].res[0].num, 10)

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=8917&r1=8916&r2=8917&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/spin_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/spin_testing_base.py Fri Mar  6 14:37:58 2009
@@ -426,9 +426,9 @@
         """
 
         # Rename some spins.
-        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')
+        self.spin_fns.name(spin_id='@C26', name='C25', force=True)
+        self.spin_fns.name(spin_id=':2@78', name='Ca', force=True)
+        self.spin_fns.name(spin_id='#New mol:6@3239', name='NHe', force=True)
 
         # Get the data pipe.
         dp = pipes.get_pipe('orig')
@@ -453,7 +453,7 @@
         """
 
         # Rename all NHs.
-        self.spin_fns.name(spin_id='@NH', name='N')
+        self.spin_fns.name(spin_id='@NH', name='N', force=True)
 
         # Get the data pipe.
         dp = pipes.get_pipe('orig')
@@ -478,14 +478,14 @@
         """
 
         # Rename a few spins.
-        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)
+        self.spin_fns.number(spin_id='@111', number=1, force=True)
+        self.spin_fns.number(spin_id='@6', number=2, force=True)
+        self.spin_fns.number(spin_id='@7', number=3, force=True)
+        self.spin_fns.number(spin_id='@8', number=4, force=True)
+        self.spin_fns.number(spin_id='@9', number=5, force=True)
+        self.spin_fns.number(spin_id='@78', number=6, force=True)
+        self.spin_fns.number(spin_id='@239', number=7, force=True)
+        self.spin_fns.number(spin_id='@3239', number=9, force=True)
 
         # Get the data pipe.
         dp = pipes.get_pipe('orig')