r8547 - /branches/multi_structure/test_suite/system_tests/structure.py -- January 20, 2009 - 16:21

Author: bugman
Date: Tue Jan 20 16:21:00 2009
New Revision: 8547

URL: http://svn.gna.org/viewcvs/relax?rev=8547&view=rev
Log:
Some fixes for the test_load_scientific_results() system test.

This is for the new structural data data structure design.


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=8547&r1=8546&r2=8547&view=diff
==============================================================================
--- branches/multi_structure/test_suite/system_tests/structure.py (original)
+++ branches/multi_structure/test_suite/system_tests/structure.py Tue Jan 20 
16:21:00 2009
@@ -117,17 +117,21 @@
 
         # Test the structure metadata.
         self.assert_(hasattr(cdp, 'structure'))
-        self.assertEqual(cdp.structure.file, ['Ap4Aase_res1-12.pdb'])
-        self.assertEqual(cdp.structure.path, [''])
         self.assert_(hasattr(cdp.structure, 'structural_data'))
         self.assert_(len(cdp.structure.structural_data))
-        print cdp.structure.structural_data
+        self.assert_(len(cdp.structure.structural_data[0].mol))
+
+        mol = cdp.structure.structural_data[0].mol[0]
+        self.assertEqual(mol.file_name, 'Ap4Aase_res1-12.pdb')
+        self.assertEqual(mol.file_path, '')
+        self.assertEqual(mol.file_model, 1)
+        self.assertEqual(mol.file_struct_num, 1)
 
         # The real atomic data.
         res_name = ['GLY', 'PRO', 'LEU', 'GLY', 'SER', 'MET', 'ASP', 'SER', 
'PRO', 'PRO', 'GLU', 'GLY']
 
         # Check the atomic data.
-        
self.assertEqual(cdp.structure.structural_data[0].peptide_chains[0].sequence(),
 res_name)
+        self.assertEqual(mol.sequence(), res_name)
 
 
     def test_read_pdb_internal1(self):