r3613 - in /1.3/test_suite/unit_tests: generic_fns/test_molecule.py molecule_testing_base.py -- November 20, 2007 - 10:06

Author: bugman
Date: Tue Nov 20 10:06:43 2007
New Revision: 3613

URL: http://svn.gna.org/viewcvs/relax?rev=3613&view=rev
Log:
Set up the residue functions to be used by the molecule unit tests (this is a 
bad design)!


Modified:
    1.3/test_suite/unit_tests/generic_fns/test_molecule.py
    1.3/test_suite/unit_tests/molecule_testing_base.py

Modified: 1.3/test_suite/unit_tests/generic_fns/test_molecule.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/generic_fns/test_molecule.py?rev=3613&r1=3612&r2=3613&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/generic_fns/test_molecule.py (original)
+++ 1.3/test_suite/unit_tests/generic_fns/test_molecule.py Tue Nov 20 
10:06:43 2007
@@ -36,3 +36,4 @@
 
     # Place the generic_fns.spin module into the class namespace.
     molecule_fns = molecule
+    residue_fns = residue

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=3613&r1=3612&r2=3613&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/molecule_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/molecule_testing_base.py Tue Nov 20 10:06:43 
2007
@@ -59,7 +59,7 @@
         """Function for setting up some data for the unit tests."""
 
         # Create the first residue and add some data to its spin container.
-        residue.create(1, 'Ala')
+        self.residue_fns.create(1, 'Ala')
         relax_data_store['orig'].mol[0].res[0].spin[0].num = 111
         relax_data_store['orig'].mol[0].res[0].spin[0].x = 1
         relax_data_store['orig'].mol[0].name = 'Old mol'
@@ -68,8 +68,8 @@
         relax_data_store['orig'].mol.add_item('New mol')
 
         # Copy the residue to the new molecule.
-        residue.copy(res_from=':1', res_to='#New mol')
-        residue.copy(res_from='#Old mol:1', res_to='#New mol:5')
+        self.residue_fns.copy(res_from=':1', res_to='#New mol')
+        self.residue_fns.copy(res_from='#Old mol:1', res_to='#New mol:5')
 
         # Change the first residue's data.
         relax_data_store['orig'].mol[0].res[0].spin[0].num = 222
@@ -84,7 +84,7 @@
 
         # Create the first molecule and residue and add some data to its 
spin container.
         self.molecule_fns.create('Old mol')
-        residue.create(1, 'Ala')
+        self.residue_fns.create(1, 'Ala')
         relax_data_store['orig'].mol[0].res[0].spin[0].num = 111
         relax_data_store['orig'].mol[0].res[0].spin[0].x = 1
 
@@ -126,7 +126,7 @@
 
         # Create the first molecule and residue and add some data to its 
spin container.
         self.molecule_fns.create('Old mol')
-        residue.create(1, 'Ala')
+        self.residue_fns.create(1, 'Ala')
         relax_data_store['orig'].mol[0].res[0].spin[0].num = 111
         relax_data_store['orig'].mol[0].res[0].spin[0].x = 1
 
@@ -142,7 +142,7 @@
 
         # Create the first molecule and residue and add some data to its 
spin container.
         self.molecule_fns.create('Old mol')
-        residue.create(1, 'Ala')
+        self.residue_fns.create(1, 'Ala')
         relax_data_store['orig'].mol[0].res[0].spin[0].num = 111
         relax_data_store['orig'].mol[0].res[0].spin[0].x = 1