r9575 - /1.3/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py -- October 06, 2009 - 12:32

Author: bugman
Date: Tue Oct  6 12:32:17 2009
New Revision: 9575

URL: http://svn.gna.org/viewcvs/relax?rev=9575&view=rev
Log:
Fixes for the unit tests of 
generic_fns.mol_res_spin.generate_spin_id_data_array().


Modified:
    1.3/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py

Modified: 1.3/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py?rev=9575&r1=9574&r2=9575&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py (original)
+++ 1.3/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py Tue Oct  6 
12:32:17 2009
@@ -666,7 +666,7 @@
         data = ['1', 'GLY']
 
         # The ID.
-        id = mol_res_spin.generate_spin_id_data_array(data)
+        id = mol_res_spin.generate_spin_id_data_array(data, res_num_col=1, 
res_name_col=2)
 
         # Test the string.
         self.assertEqual(id, ':1&:GLY')
@@ -682,7 +682,7 @@
         data = ['1', 'GLY', '234', 'NH']
 
         # The ID.
-        id = mol_res_spin.generate_spin_id_data_array(data, spin_num_col=2, 
spin_name_col=3)
+        id = mol_res_spin.generate_spin_id_data_array(data, res_num_col=1, 
res_name_col=2, spin_num_col=3, spin_name_col=4)
 
         # Test the string.
         self.assertEqual(id, ':1&:GLY@234&@NH')
@@ -698,7 +698,7 @@
         data = ['Ap4Aase', '234', 'NH']
 
         # The ID.
-        id = mol_res_spin.generate_spin_id_data_array(data, mol_name_col=0, 
res_num_col=None, res_name_col=None, spin_num_col=1, spin_name_col=2)
+        id = mol_res_spin.generate_spin_id_data_array(data, mol_name_col=1, 
res_num_col=None, res_name_col=None, spin_num_col=2, spin_name_col=3)
 
         # Test the string.
         self.assertEqual(id, '#Ap4Aase@234&@NH')
@@ -714,7 +714,7 @@
         data = ['Ap4Aase', '1', 'GLY']
 
         # The ID.
-        id = mol_res_spin.generate_spin_id_data_array(data, mol_name_col=0, 
res_num_col=1, res_name_col=2)
+        id = mol_res_spin.generate_spin_id_data_array(data, mol_name_col=1, 
res_num_col=2, res_name_col=3)
 
         # Test the string.
         self.assertEqual(id, '#Ap4Aase:1&:GLY')
@@ -730,7 +730,7 @@
         data = ['Ap4Aase', '1', 'GLY', '234', 'NH']
 
         # The ID.
-        id = mol_res_spin.generate_spin_id_data_array(data, mol_name_col=0, 
res_num_col=1, res_name_col=2, spin_num_col=3, spin_name_col=4)
+        id = mol_res_spin.generate_spin_id_data_array(data, mol_name_col=1, 
res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5)
 
         # Test the string.
         self.assertEqual(id, '#Ap4Aase:1&:GLY@234&@NH')
@@ -746,7 +746,7 @@
         data = ['1', 'GLY', None, None]
 
         # The ID.
-        id = mol_res_spin.generate_spin_id_data_array(data)
+        id = mol_res_spin.generate_spin_id_data_array(data, res_num_col=1, 
res_name_col=2)
 
         # Test the string.
         self.assertEqual(id, ':1&:GLY')