r11656 - /branches/bmrb/test_suite/unit_tests/relax_data_testing_base.py -- October 22, 2010 - 23:10

Author: bugman
Date: Fri Oct 22 23:10:00 2010
New Revision: 11656

URL: http://svn.gna.org/viewcvs/relax?rev=11656&view=rev
Log:
Fix for the test_read() unit test of generic_fns.relax_data.read().

The relaxation data structures are now handled differently in this branch and 
all data structures
have the same from for all spins, even if data is missing.


Modified:
    branches/bmrb/test_suite/unit_tests/relax_data_testing_base.py

Modified: branches/bmrb/test_suite/unit_tests/relax_data_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/test_suite/unit_tests/relax_data_testing_base.py?rev=11656&r1=11655&r2=11656&view=diff
==============================================================================
--- branches/bmrb/test_suite/unit_tests/relax_data_testing_base.py (original)
+++ branches/bmrb/test_suite/unit_tests/relax_data_testing_base.py Fri Oct 22 
23:10:00 2010
@@ -90,32 +90,15 @@
             # The spin container.
             spin = cdp.mol[0].res[i].spin[0]
 
-            # 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'))
+            # 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.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]])
+            # Relaxation data.
+            self.assertEqual(spin.relax_data, [self.Ap4Aase_600_NOE_val[i]])
+            self.assertEqual(spin.relax_error, [self.Ap4Aase_600_NOE_err[i]])