r8628 - /branches/multi_structure/test_suite/system_tests/structure.py -- January 23, 2009 - 11:33

Author: bugman
Date: Fri Jan 23 11:33:10 2009
New Revision: 8628

URL: http://svn.gna.org/viewcvs/relax?rev=8628&view=rev
Log:
Fixes for the test_read_pdb_mol_2_model_internal() system test.

The checks were incorrect.


Modified:
    branches/multi_structure/test_suite/system_tests/structure.py

Modified: branches/multi_structure/test_suite/system_tests/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_structure/test_suite/system_tests/structure.py?rev=8628&r1=8627&r2=8628&view=diff
==============================================================================
--- branches/multi_structure/test_suite/system_tests/structure.py (original)
+++ branches/multi_structure/test_suite/system_tests/structure.py Fri Jan 23 
11:33:10 2009
@@ -255,17 +255,15 @@
         # Test the structural data.
         self.assert_(hasattr(cdp, 'structure'))
         self.assert_(hasattr(cdp.structure, 'structural_data'))
-        self.assertEqual(len(cdp.structure.structural_data), 3)
-        self.assertEqual(len(cdp.structure.structural_data[0].mol), 1)
-        self.assertEqual(len(cdp.structure.structural_data[1].mol), 1)
-        self.assertEqual(len(cdp.structure.structural_data[2].mol), 1)
+        self.assertEqual(len(cdp.structure.structural_data), 1)
+        self.assertEqual(len(cdp.structure.structural_data[0].mol), 3)
 
         i = 0
-        for model in cdp.structure.structural_data:
-            self.assertEqual(model.mol[0].file_name, files[i])
-            self.assertEqual(model.mol[0].file_path, path)
-            self.assertEqual(model.mol[0].file_model, 1)
-            self.assertEqual(model.mol[0].file_mol_num, 1)
+        for mol in cdp.structure.structural_data[0].mol:
+            self.assertEqual(mol.file_name, files[i])
+            self.assertEqual(mol.file_path, path)
+            self.assertEqual(mol.file_model, 1)
+            self.assertEqual(mol.file_mol_num, 1)
             i = i + 1