r4627 - /branches/N_state_model/test_suite/unit_tests/_prompt/test_align_tensor.py -- January 11, 2008 - 10:48

Author: bugman
Date: Fri Jan 11 10:48:49 2008
New Revision: 4627

URL: http://svn.gna.org/viewcvs/relax?rev=4627&view=rev
Log:
Fixes for the tensors arg to the align_tensor svd() and matrix_angles() user 
functions.


Modified:
    branches/N_state_model/test_suite/unit_tests/_prompt/test_align_tensor.py

Modified: 
branches/N_state_model/test_suite/unit_tests/_prompt/test_align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/test_suite/unit_tests/_prompt/test_align_tensor.py?rev=4627&r1=4626&r2=4627&view=diff
==============================================================================
--- branches/N_state_model/test_suite/unit_tests/_prompt/test_align_tensor.py 
(original)
+++ branches/N_state_model/test_suite/unit_tests/_prompt/test_align_tensor.py 
Fri Jan 11 10:48:49 2008
@@ -26,7 +26,7 @@
 # relax module imports.
 from generic_fns import align_tensor
 from prompt.align_tensor import Align_tensor
-from relax_errors import RelaxError, RelaxBinError, RelaxFloatError, 
RelaxIntError, RelaxListStrError, RelaxNoneStrError, RelaxNumTupleError, 
RelaxStrError
+from relax_errors import RelaxError, RelaxBinError, RelaxFloatError, 
RelaxIntError, RelaxNoneListstrError, RelaxNoneStrError, RelaxNumTupleError, 
RelaxStrError
 from test_suite.unit_tests.align_tensor_testing_base import 
Align_tensor_base_class
 
 # Unit test imports.
@@ -235,12 +235,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the str list arguments, and skip them.
-            if data[0] == 'str list':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxListStrError, 
self.align_tensor_fns.matrix_angles, tensors=data[1])
+            # Catch the None and str list arguments, and skip them.
+            if data[0] == 'None' or data[0] == 'str list':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxNoneListstrError, 
self.align_tensor_fns.matrix_angles, tensors=data[1])
 
 
     def test_svd_argfail_basis_set(self):
@@ -267,11 +267,11 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the str list arguments, and skip them.
-            if data[0] == 'str list':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxListStrError, self.align_tensor_fns.svd, 
tensors=data[1])
-
-
+            # Catch the None and str list arguments, and skip them.
+            if data[0] == 'None' or data[0] == 'str list':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxNoneListstrError, 
self.align_tensor_fns.svd, tensors=data[1])
+
+