r15124 - in /branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure: test_internal.py test_scientific.py -- January 02, 2012 - 22:36

Author: bugman
Date: Mon Jan  2 22:36:34 2012
New Revision: 15124

URL: http://svn.gna.org/viewcvs/relax?rev=15124&view=rev
Log:
Fix for some unit tests using the atom_loop() structural API method 
incorrectly.

The model_num_flag arg no longer exists.


Modified:
    
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
    
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py

Modified: 
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py?rev=15124&r1=15123&r2=15124&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
 (original)
+++ 
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
 Mon Jan  2 22:36:34 2012
@@ -184,9 +184,8 @@
 
         # Loop over the atoms.
         atom_count = 0
-        for model_num, mol_name, res_num, res_name, spin_num, spin_name, 
element, pos in self.data.atom_loop(atom_id='@163', model_num_flag=True, 
mol_name_flag=True, res_num_flag=True, res_name_flag=True, 
atom_num_flag=True, atom_name_flag=True, element_flag=True, pos_flag=True):
+        for mol_name, res_num, res_name, spin_num, spin_name, element, pos 
in self.data.atom_loop(atom_id='@163', mol_name_flag=True, res_num_flag=True, 
res_name_flag=True, atom_num_flag=True, atom_name_flag=True, 
element_flag=True, pos_flag=True):
             # Test the spin info.
-            self.assertEqual(model_num, 1)
             self.assertEqual(mol_name, self.test_pdb_root+'_mol1')
             self.assertEqual(res_num, 11)
             self.assertEqual(res_name, 'GLU')

Modified: 
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py?rev=15124&r1=15123&r2=15124&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
 (original)
+++ 
branches/frame_order_testing/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
 Mon Jan  2 22:36:34 2012
@@ -232,9 +232,8 @@
 
         # Loop over the atoms.
         atom_count = 0
-        for model_num, mol_name, res_num, res_name, spin_num, spin_name, 
element, pos in self.data.atom_loop(atom_id='@163', model_num_flag=True, 
mol_name_flag=True, res_num_flag=True, res_name_flag=True, 
atom_num_flag=True, atom_name_flag=True, element_flag=True, pos_flag=True):
+        for mol_name, res_num, res_name, spin_num, spin_name, element, pos 
in self.data.atom_loop(atom_id='@163', mol_name_flag=True, res_num_flag=True, 
res_name_flag=True, atom_num_flag=True, atom_name_flag=True, 
element_flag=True, pos_flag=True):
             # Test the spin info.
-            self.assertEqual(model_num, 1)
             self.assertEqual(mol_name, 'Ap4Aase_res1-12_mol1')
             self.assertEqual(res_num, 11)
             self.assertEqual(res_name, 'GLU')