r8548 - /branches/multi_structure/test_suite/system_tests/structure.py -- January 20, 2009 - 16:24

Author: bugman
Date: Tue Jan 20 16:24:06 2009
New Revision: 8548

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

This is for the new structural data data structure design, and matches r8547.



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=8548&r1=8547&r2=8548&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:24:06 2009
@@ -59,10 +59,15 @@
 
         # 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))
+        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.
         atom_name = ['N', 'CA', '1HA', '2HA', 'C', 'O', '1HT', '2HT', '3HT', 
'N', 'CD', 'CA', 'HA', 'CB', '1HB', '2HB', 'CG', '1HG', '2HG', '1HD', '2HD', 
'C', 'O', 'N', 'H', 'CA', 'HA', 'CB', '1HB', '2HB', 'CG', 'HG', 'CD1', 
'1HD1', '2HD1', '3HD1', 'CD2', '1HD2', '2HD2', '3HD2', 'C', 'O', 'N', 'H', 
'CA', '1HA', '2HA', 'C', 'O', 'N', 'H', 'CA', 'HA', 'CB', '1HB', '2HB', 'OG', 
'HG', 'C', 'O', 'N', 'H', 'CA', 'HA', 'CB', '1HB', '2HB', 'CG', '1HG', '2HG', 
'SD', 'CE', '1HE', '2HE', '3HE', 'C', 'O', 'N', 'H', 'CA', 'HA', 'CB', '1HB', 
'2HB', 'CG', 'OD1', 'OD2', 'C', 'O', 'N', 'H', 'CA', 'HA', 'CB', '1HB', 
'2HB', 'OG', 'HG', 'C', 'O', 'N', 'CD', 'CA', 'HA', 'CB', '1HB', '2HB', 'CG', 
'1HG', '2HG', '1HD', '2HD', 'C', 'O', 'N', 'CD', 'CA', 'HA', 'CB', '1HB', 
'2HB', 'CG', '1HG', '2HG', '1HD', '2HD', 'C', 'O', 'N', 'H', 'CA', 'HA', 
'CB', '1HB', '2HB', 'CG', '1HG', '2HG', 'CD', 'OE1', 'OE2', 'C', 'O', 'N', 
'H', 'CA', '1HA', '2HA', 'C', 'O']