Author: bugman Date: Thu Jan 15 11:32:19 2009 New Revision: 8459 URL: http://svn.gna.org/viewcvs/relax?rev=8459&view=rev Log: Fixes for the Scientific python structural object __residue_loop() unit tests. Modified: branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py Modified: branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py URL: http://svn.gna.org/viewcvs/relax/branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py?rev=8459&r1=8458&r2=8459&view=diff ============================================================================== --- branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py (original) +++ branches/multi_structure/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py Thu Jan 15 11:32:19 2009 @@ -133,7 +133,7 @@ # Loop over the residues. res_count = 0 - for res, res_num, res_name in self.data._Scientific_data__residue_loop(self.data.structural_data[0].peptide_chains[0], None, 'protein'): + for res, res_num, res_name, res_index in self.data._Scientific_data__residue_loop(self.data.structural_data[0].peptide_chains[0]): res_count = res_count + 1 # Test the number of residues looped over. @@ -157,7 +157,7 @@ # Loop over the residues. res_count = 0 - for res, res_num, res_name in self.data._Scientific_data__residue_loop(self.data.structural_data[0].peptide_chains[0], 'Ap4Aase', 'protein', sel_obj): + for res, res_num, res_name, res_index in self.data._Scientific_data__residue_loop(self.data.structural_data[0].mol[0], sel_obj): res_count = res_count + 1 # Test the number of residues looped over. @@ -181,7 +181,7 @@ # Loop over the residues. res_count = 0 - for res, res_num, res_name in self.data._Scientific_data__residue_loop(self.data.structural_data[0].peptide_chains[0], None, 'protein', sel_obj): + for res, res_num, res_name, res_index in self.data._Scientific_data__residue_loop(self.data.structural_data[0].mol[0], sel_obj): res_count = res_count + 1 # Test the number of residues looped over.