r24688 - /branches/zooming_grid_search/test_suite/unit_tests/_prompt/test_diffusion_tensor.py -- July 23, 2014 - 18:47

Author: bugman
Date: Wed Jul 23 18:47:41 2014
New Revision: 24688

URL: http://svn.gna.org/viewcvs/relax?rev=24688&view=rev
Log:
Fix for the 
_prompt.test_diffusion_tensor.Test_diffusion_tensor.test_init_argfail_params 
unit test.
  
As the diffusion 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:
    
branches/zooming_grid_search/test_suite/unit_tests/_prompt/test_diffusion_tensor.py

Modified: 
branches/zooming_grid_search/test_suite/unit_tests/_prompt/test_diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/test_suite/unit_tests/_prompt/test_diffusion_tensor.py?rev=24688&r1=24687&r2=24688&view=diff
==============================================================================
--- 
branches/zooming_grid_search/test_suite/unit_tests/_prompt/test_diffusion_tensor.py
 (original)
+++ 
branches/zooming_grid_search/test_suite/unit_tests/_prompt/test_diffusion_tensor.py
 Wed Jul 23 18:47:41 2014
@@ -24,7 +24,7 @@
 
 # relax module imports.
 from prompt.interpreter import Interpreter
-from lib.errors import RelaxError, RelaxBoolError, RelaxIntError, 
RelaxNoneStrError, RelaxNumError, RelaxNumTupleNumError, RelaxStrError
+from lib.errors import RelaxError, RelaxBoolError, RelaxIntError, 
RelaxNoneStrError, RelaxNumError, RelaxNoneNumTupleNumError, RelaxStrError
 from test_suite.unit_tests.diffusion_tensor_testing_base import 
Diffusion_tensor_base_class
 
 # Unit test imports.
@@ -87,8 +87,8 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch a single float, int, or bin, and skip them.
-            if data[0] == 'int' or data[0] == 'bin' or data[0] == 'float':
+            # Catch None, a single float, int, or bin, and skip them.
+            if data[0] == 'None' or data[0] == 'int' or data[0] == 'bin' or 
data[0] == 'float':
                 continue
 
             # Catch the tuple arguments.
@@ -98,7 +98,7 @@
                     continue
 
             # The argument test.
-            self.assertRaises(RelaxNumTupleNumError, 
self.diffusion_tensor_fns.init, params=data[1])
+            self.assertRaises(RelaxNoneNumTupleNumError, 
self.diffusion_tensor_fns.init, params=data[1])
 
 
     def test_init_argfail_time_scale(self):