r8617 - /branches/multi_structure/test_suite/system_tests/structure.py -- January 22, 2009 - 17:23

Author: bugman
Date: Thu Jan 22 17:23:05 2009
New Revision: 8617

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


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=8617&r1=8616&r2=8617&view=diff
==============================================================================
--- branches/multi_structure/test_suite/system_tests/structure.py (original)
+++ branches/multi_structure/test_suite/system_tests/structure.py Thu Jan 22 
17:23:05 2009
@@ -83,19 +83,19 @@
         z = [6.302, 7.391, 8.306, 7.526, 7.089, 6.087, 6.697, 5.822, 5.604, 
7.943, 9.155, 7.752, 7.908, 8.829, 9.212, 8.407, 9.880, 10.560, 10.415, 
9.754, 8.900, 6.374, 5.909, 5.719, 6.139, 4.391, 4.081, 4.415, 4.326, 5.367, 
3.307, 2.640, 3.889, 4.956, 3.700, 3.430, 2.493, 2.814, 2.633, 1.449, 3.403, 
3.572, 2.369, 2.281, 1.371, 0.855, 1.868, 0.359, 0.149, -0.269, -0.055, 
-1.268, -1.726, -0.608, 0.037, -1.377, 0.162, 0.731, -2.354, -2.175, -3.496, 
-3.603, -4.606, -4.199, -5.387, -5.803, -6.196, -4.563, -5.146, -4.350, 
-3.001, -1.895, -1.241, -1.307, -2.472, -5.551, -5.582, -6.328, -6.269, 
-7.274, -6.735, -7.913, -8.518, -7.133, -8.791, -9.871, -8.395, -8.346, 
-8.584, -8.977, -8.732, -10.002, -10.355, -11.174, -11.584, -11.936, -10.759, 
-11.425, -9.403, -8.469, -9.921, -11.030, -9.410, -8.336, -10.080, -9.428, 
-10.291, -11.333, -11.606, -12.128, -10.723, -11.893, -9.781, -10.959, 
-8.768, -7.344, -8.971, -9.765, -7.642, -7.816, -7.251, -6.715, -6.584, 
-5.765, -7.175, -6.955, -9.288, -9.222, -9.654, -9.696, -10.009, -10.928, 
-10.249, -10.194, -9.475, -11.596, -11.540, -11.813, -12.724, -13.193, 
-13.137, -8.947, -7.774, -9.383, -10.338, -8.477, -8.138, -9.017, -7.265, 
-6.226]
 
         # Test the atomic data.
-        str = cdp.structure.structural_data[0]
-        for i in xrange(len(str.atom_name)):
-            self.assertEqual(str.atom_name[i], atom_name[i])
-            self.assertEqual(str.bonded[i], bonded[i])
-            self.assertEqual(str.chain_id[i], chain_id[i])
-            self.assertEqual(str.element[i], element[i])
-            self.assertEqual(str.pdb_record[i], pdb_record[i])
-            self.assertEqual(str.res_name[i], res_name[i])
-            self.assertEqual(str.res_num[i], res_num[i])
-            self.assertEqual(str.seg_id[i], seg_id[i])
-            self.assertEqual(str.x[i], x[i])
-            self.assertEqual(str.y[i], y[i])
-            self.assertEqual(str.z[i], z[i])
+        mol = cdp.structure.structural_data[0].mol[0]
+        for i in xrange(len(mol.atom_name)):
+            self.assertEqual(mol.atom_name[i], atom_name[i])
+            self.assertEqual(mol.bonded[i], bonded[i])
+            self.assertEqual(mol.chain_id[i], chain_id[i])
+            self.assertEqual(mol.element[i], element[i])
+            self.assertEqual(mol.pdb_record[i], pdb_record[i])
+            self.assertEqual(mol.res_name[i], res_name[i])
+            self.assertEqual(mol.res_num[i], res_num[i])
+            self.assertEqual(mol.seg_id[i], seg_id[i])
+            self.assertEqual(mol.x[i], x[i])
+            self.assertEqual(mol.y[i], y[i])
+            self.assertEqual(mol.z[i], z[i])
 
 
     def test_load_internal_results2(self):