r4114 - /1.3/test_suite/unit_tests/relax_data_testing_base.py -- November 28, 2007 - 12:17

Author: bugman
Date: Wed Nov 28 12:17:13 2007
New Revision: 4114

URL: http://svn.gna.org/viewcvs/relax?rev=4114&view=rev
Log:
Bug fix for the test_read() unit test.


Modified:
    1.3/test_suite/unit_tests/relax_data_testing_base.py

Modified: 1.3/test_suite/unit_tests/relax_data_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/relax_data_testing_base.py?rev=4114&r1=4113&r2=4114&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/relax_data_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/relax_data_testing_base.py Wed Nov 28 12:17:13 
2007
@@ -95,17 +95,32 @@
             # The spin container.
             spin = cdp.mol[0].res[i].spin[0]
 
-            # Auxillary data.
-            self.assertEqual(spin.frq, [600e6])
-            self.assertEqual(spin.frq_labels, ['600'])
-            self.assertEqual(spin.noe_r1_table, [None])
-            self.assertEqual(spin.num_frq, 1)
-            self.assertEqual(spin.num_ri, 1)
-            self.assertEqual(spin.remap_table, [0])
-            self.assertEqual(spin.ri_labels, ['NOE'])
+            # No relaxation data.
+            if self.Ap4Aase_600_NOE_val[i] == None or 
self.Ap4Aase_600_NOE_err[i] == None:
+                # Auxillary data.
+                self.failIf(hasattr(spin, 'frq'))
+                self.failIf(hasattr(spin, 'frq_labels'))
+                self.failIf(hasattr(spin, 'noe_r1_table'))
+                self.failIf(hasattr(spin, 'num_frq'))
+                self.failIf(hasattr(spin, 'num_ri'))
+                self.failIf(hasattr(spin, 'remap_table'))
+                self.failIf(hasattr(spin, 'ri_labels'))
 
-            # Relaxation data.
-            self.assertEqual(spin.relax_data, [self.Ap4Aase_600_NOE_val[i]])
-            self.assertEqual(spin.relax_error, [self.Ap4Aase_600_NOE_err[i]])
+                # Relaxation data.
+                self.failIf(hasattr(spin, 'relax_data'))
+                self.failIf(hasattr(spin, 'relax_error'))
 
+            # Data exists
+            else:
+                # Auxillary data.
+                self.assertEqual(spin.frq, [600e6])
+                self.assertEqual(spin.frq_labels, ['600'])
+                self.assertEqual(spin.noe_r1_table, [None])
+                self.assertEqual(spin.num_frq, 1)
+                self.assertEqual(spin.num_ri, 1)
+                self.assertEqual(spin.remap_table, [0])
+                self.assertEqual(spin.ri_labels, ['NOE'])
 
+                # Relaxation data.
+                self.assertEqual(spin.relax_data, 
[self.Ap4Aase_600_NOE_val[i]])
+                self.assertEqual(spin.relax_error, 
[self.Ap4Aase_600_NOE_err[i]])