r5951 - in /1.3: generic_fns/structure/ test_suite/system_tests/ test_suite/system_tests/scripts/ test_suite/unit_tests/_gen... -- April 23, 2008 - 18:36

Author: bugman
Date: Wed Apr 23 18:08:33 2008
New Revision: 5951

URL: http://svn.gna.org/viewcvs/relax?rev=5951&view=rev
Log:
Fixed all the test suite tests pointing to the renamed 'test.pdb' file.


Modified:
    1.3/generic_fns/structure/scientific.py
    1.3/test_suite/system_tests/scripts/angles.py
    1.3/test_suite/system_tests/sequence.py
    1.3/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py

Modified: 1.3/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/structure/scientific.py?rev=5951&r1=5950&r2=5951&view=diff
==============================================================================
--- 1.3/generic_fns/structure/scientific.py (original)
+++ 1.3/generic_fns/structure/scientific.py Wed Apr 23 18:08:33 2008
@@ -230,7 +230,7 @@
             # Loop over each individual molecule.
             for mol, mol_name, mol_type in self.__molecule_loop(struct, 
sel_obj):
                 # Loop over the residues of the protein in the PDB file.
-                for res, res_num, res_name in self.__residue_loop(mol, 
mol_type, sel_obj):
+                for res, res_num, res_name in self.__residue_loop(mol, 
mol_name, mol_type, sel_obj):
                     # Loop over the atoms of the residue.
                     for atom in res:
                         # Atom number, name, and position.

Modified: 1.3/test_suite/system_tests/scripts/angles.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/angles.py?rev=5951&r1=5950&r2=5951&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/angles.py (original)
+++ 1.3/test_suite/system_tests/scripts/angles.py Wed Apr 23 18:08:33 2008
@@ -5,7 +5,7 @@
 sequence.read(file='Ap4Aase.seq', dir=sys.path[-1] + 
'/test_suite/system_tests/data')
 
 # Read a PDB file.
-structure.read_pdb(file='test.pdb', dir=sys.path[-1] + 
'/test_suite/shared_data', model=1)
+structure.read_pdb(file='Ap4Aase_res1-12.pdb', dir=sys.path[-1] + 
'/test_suite/shared_data/structures', model=1)
 
 # Load the spins.
 structure.load_spins('@N')

Modified: 1.3/test_suite/system_tests/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/sequence.py?rev=5951&r1=5950&r2=5951&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/sequence.py (original)
+++ 1.3/test_suite/system_tests/sequence.py Wed Apr 23 18:08:33 2008
@@ -48,7 +48,7 @@
         """Load all aspartic acid atoms from the single residue in a loaded 
protein PDB file."""
 
         # Read the PDB file.
-        self.relax.interpreter._Structure.read_pdb(file='test.pdb', 
dir=sys.path[-1] + '/test_suite/shared_data', model=1)
+        
self.relax.interpreter._Structure.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=sys.path[-1] + '/test_suite/shared_data/structures', model=1)
 
         # Load all the ASP atoms (1 molecule, 1 ASP residue, and all atoms).
         self.relax.interpreter._Structure.load_spins(spin_id=':ASP')
@@ -95,7 +95,7 @@
         """Load the glycine backbone amide N and Ca spins from a loaded 
protein PDB file."""
 
         # Read the PDB file.
-        self.relax.interpreter._Structure.read_pdb(file='test.pdb', 
dir=sys.path[-1] + '/test_suite/shared_data', model=1)
+        
self.relax.interpreter._Structure.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=sys.path[-1] + '/test_suite/shared_data/structures', model=1)
 
         # Generate the sequence of nitrogen spins (1 molecule, all GLY 
residues, and only N spins).
         self.relax.interpreter._Structure.load_spins(spin_id=':GLY@N')
@@ -143,7 +143,7 @@
         """Load the glycine backbone amide N spins from a loaded protein PDB 
file."""
 
         # Read the PDB file.
-        self.relax.interpreter._Structure.read_pdb(file='test.pdb', 
dir=sys.path[-1] + '/test_suite/shared_data', model=1)
+        
self.relax.interpreter._Structure.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=sys.path[-1] + '/test_suite/shared_data/structures', model=1)
 
         # Generate the sequence (1 molecule, all GLY residues, and only N 
spins).
         self.relax.interpreter._Structure.load_spins(spin_id=':GLY@N')
@@ -182,7 +182,7 @@
         """Load the protein backbone amide N spins from a loaded PDB file."""
 
         # Read the PDB file.
-        self.relax.interpreter._Structure.read_pdb(file='test.pdb', 
dir=sys.path[-1] + '/test_suite/shared_data', model=1)
+        
self.relax.interpreter._Structure.read_pdb(file='Ap4Aase_res1-12.pdb', 
dir=sys.path[-1] + '/test_suite/shared_data/structures', model=1)
 
         # Generate the sequence (1 molecule, all residues, and only N spins).
         self.relax.interpreter._Structure.load_spins(spin_id='@N')

Modified: 1.3/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py?rev=5951&r1=5950&r2=5951&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py 
(original)
+++ 1.3/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py Wed 
Apr 23 18:08:33 2008
@@ -43,7 +43,7 @@
             self.path = sys.path[-1]
 
         # The path to a PDB file.
-        self.test_pdb_path = self.path+'/test_suite/shared_data/test.pdb'
+        self.test_pdb_path = 
self.path+'/test_suite/shared_data/structures/Ap4Aase_res1-12.pdb'
 
         # Instantiate the structural data object.
         self.data = Scientific_data()