Author: bugman Date: Thu Jan 15 11:35:48 2009 New Revision: 8460 URL: http://svn.gna.org/viewcvs/relax?rev=8460&view=rev Log: Deleted all unit tests for the ScientificPython structural object __molecule_loop() method. This method no longer exists! 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=8460&r1=8459&r2=8460&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:35:48 2009 @@ -60,69 +60,6 @@ # Reset. ds.__reset__() - - - def test___molecule_loop(self): - """Test the private Scientific_data.__molecule_loop() method.""" - - # Load the PDB file. - self.data.load_pdb(self.test_pdb_path) - - # Loop over the molecules. - mol_count = 0 - for mol, mol_name, mol_type in self.data._Scientific_data__molecule_loop(self.data.structural_data[0]): - mol_count = mol_count + 1 - - # Test the number of molecules looped over. - self.assertEqual(mol_count, 1) - - # Test the molecular data. - self.assertEqual(mol_name, None) - self.assertEqual(mol_type, 'protein') - self.assertEqual(len(mol.residues), 12) - self.assertEqual(mol.sequence(), ['GLY', 'PRO', 'LEU', 'GLY', 'SER', 'MET', 'ASP', 'SER', 'PRO', 'PRO', 'GLU', 'GLY']) - - - def test___molecule_loop_selection(self): - """Test the private Scientific_data.__molecule_loop() method with a selection object.""" - - # Load the PDB file. - self.data.load_pdb(self.test_pdb_path) - - # Create the selection object (which should match the molecule name of None). - sel_obj = Selection('@1') - - # Loop over the molecules. - mol_count = 0 - for mol, mol_name, mol_type in self.data._Scientific_data__molecule_loop(self.data.structural_data[0], sel_obj): - mol_count = mol_count + 1 - - # Test the number of molecules looped over. - self.assertEqual(mol_count, 1) - - # Test the molecular data. - self.assertEqual(mol_name, None) - self.assertEqual(mol_type, 'protein') - self.assertEqual(len(mol.residues), 12) - self.assertEqual(mol.sequence(), ['GLY', 'PRO', 'LEU', 'GLY', 'SER', 'MET', 'ASP', 'SER', 'PRO', 'PRO', 'GLU', 'GLY']) - - - def test___molecule_loop_selection_no_match(self): - """Test the Scientific_data.__molecule_loop() method with a non-matching selection object.""" - - # Load the PDB file. - self.data.load_pdb(self.test_pdb_path) - - # Create the non-matching selection object. - sel_obj = Selection('#XXX') - - # Loop over the molecules. - mol_count = 0 - for mol, mol_name, mol_type in self.data._Scientific_data__molecule_loop(self.data.structural_data[0], sel_obj): - mol_count = mol_count + 1 - - # Test the number of molecules looped over. - self.assertEqual(mol_count, 0) def test___residue_loop(self):