r24685 - /trunk/test_suite/unit_tests/_prompt/test_align_tensor.py -- July 23, 2014 - 18:09

Author: bugman
Date: Wed Jul 23 18:09:27 2014
New Revision: 24685

URL: http://svn.gna.org/viewcvs/relax?rev=24685&view=rev
Log:
Fix for the 
_prompt.test_align_tensor.Test_align_tensor.test_init_argfail_params unit 
test.

As the alignment tensor can now be initialised as None, the None value can be 
accepted and a
different RelaxError is raised when the params argument is incorrectly 
supplied.


Modified:
    trunk/test_suite/unit_tests/_prompt/test_align_tensor.py

Modified: trunk/test_suite/unit_tests/_prompt/test_align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_prompt/test_align_tensor.py?rev=24685&r1=24684&r2=24685&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_prompt/test_align_tensor.py    (original)
+++ trunk/test_suite/unit_tests/_prompt/test_align_tensor.py    Wed Jul 23 
18:09:27 2014
@@ -22,7 +22,7 @@
 # relax module imports.
 from pipe_control import align_tensor
 from prompt.interpreter import Interpreter
-from lib.errors import RelaxError, RelaxBoolError, RelaxFloatError, 
RelaxIntError, RelaxNoneListStrError, RelaxNoneStrError, RelaxTupleNumError, 
RelaxStrError
+from lib.errors import RelaxError, RelaxBoolError, RelaxFloatError, 
RelaxIntError, RelaxNoneListStrError, RelaxNoneStrError, 
RelaxNoneNumTupleNumError, RelaxStrError
 from test_suite.unit_tests.align_tensor_testing_base import 
Align_tensor_base_class
 
 # Unit test imports.
@@ -177,13 +177,13 @@
         # Loop over the data types.
         for data in DATA_TYPES:
             # Catch the tuple arguments.
-            if data[0] == 'tuple' or data[0] == 'float tuple' or data[0] == 
'str tuple':
+            if data[0] == 'None' or data[0] == 'tuple' or data[0] == 'float 
tuple' or data[0] == 'str tuple':
                 # Correct tuple length.
-                if len(data[1]) == 5:
+                if data[0] == 'None' or len(data[1]) == 5:
                     continue
 
             # The argument test.
-            self.assertRaises(RelaxTupleNumError, 
self.align_tensor_fns.init, align_id='Pf1', params=data[1])
+            self.assertRaises(RelaxNoneNumTupleNumError, 
self.align_tensor_fns.init, align_id='Pf1', params=data[1])
 
 
     def test_init_argfail_scale(self):