r6663 - /branches/rdc_analysis/test_suite/unit_tests/_generic_fns/_structure/test_internal.py -- July 04, 2008 - 15:53

Author: bugman
Date: Fri Jul  4 15:02:42 2008
New Revision: 6663

URL: http://svn.gna.org/viewcvs/relax?rev=6663&view=rev
Log:
Fixes for the test_load_pdb() unit test.


Modified:
    
branches/rdc_analysis/test_suite/unit_tests/_generic_fns/_structure/test_internal.py

Modified: 
branches/rdc_analysis/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/test_suite/unit_tests/_generic_fns/_structure/test_internal.py?rev=6663&r1=6662&r2=6663&view=diff
==============================================================================
--- 
branches/rdc_analysis/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
 (original)
+++ 
branches/rdc_analysis/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
 Fri Jul  4 15:02:42 2008
@@ -205,10 +205,11 @@
         self.data.load_pdb(self.test_pdb_path)
 
         # Test the structural data.
-        self.assertEqual(self.data.file_name, self.test_pdb_path)
-        self.assertEqual(self.data.model, None)
+        self.assertEqual(len(self.data.file_name), 1)
+        self.assertEqual(self.data.file_name[0], self.test_pdb_path)
         self.assertEqual(len(self.data.structural_data), 1)
         self.assertEqual(type(self.data.structural_data), list)
+        self.assertEqual(self.data.structural_data[0].model, 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']