r4527 - /1.3/test_suite/unit_tests/_prompt/test_minimisation.py -- January 09, 2008 - 11:26

Author: bugman
Date: Wed Jan  9 11:26:16 2008
New Revision: 4527

URL: http://svn.gna.org/viewcvs/relax?rev=4527&view=rev
Log:
Changed all the bin minimisation arg unit tests to tests for boolean args.


Modified:
    1.3/test_suite/unit_tests/_prompt/test_minimisation.py

Modified: 1.3/test_suite/unit_tests/_prompt/test_minimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_minimisation.py?rev=4527&r1=4526&r2=4527&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_prompt/test_minimisation.py (original)
+++ 1.3/test_suite/unit_tests/_prompt/test_minimisation.py Wed Jan  9 
11:26:16 2008
@@ -26,7 +26,7 @@
 # relax module imports.
 from data import Data as relax_data_store
 from prompt.minimisation import Minimisation
-from relax_errors import RelaxError, RelaxBinError, RelaxIntError, 
RelaxIntListIntError, RelaxListError, RelaxListNumError, RelaxNoneError, 
RelaxNoneNumError, RelaxStrError
+from relax_errors import RelaxError, RelaxBoolError, RelaxIntError, 
RelaxIntListIntError, RelaxListError, RelaxListNumError, RelaxNoneError, 
RelaxNoneNumError, RelaxStrError
 from test_suite.unit_tests.minimisation_testing_base import 
Minimisation_base_class
 
 # Unit test imports.
@@ -118,12 +118,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the bin arguments, and skip them.
-            if data[0] == 'bin':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxBinError, 
self.minimisation_fns.grid_search, constraints=data[1])
+            # Catch the bool arguments, and skip them.
+            if data[0] == 'bool':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxBoolError, 
self.minimisation_fns.grid_search, constraints=data[1])
 
 
     def test_grid_search_argfail_verbosity(self):
@@ -210,12 +210,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the bin arguments, and skip them.
-            if data[0] == 'bin':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxBinError, self.minimisation_fns.minimise, 
'Newton', constraints=data[1])
+            # Catch the bool arguments, and skip them.
+            if data[0] == 'bool':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxBoolError, 
self.minimisation_fns.minimise, 'Newton', constraints=data[1])
 
 
     def test_minimise_argfail_scaling(self):
@@ -223,12 +223,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the bin arguments, and skip them.
-            if data[0] == 'bin':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxBinError, self.minimisation_fns.minimise, 
'Newton', scaling=data[1])
+            # Catch the bool arguments, and skip them.
+            if data[0] == 'bool':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxBoolError, 
self.minimisation_fns.minimise, 'Newton', scaling=data[1])
 
 
     def test_minimise_argfail_verbosity(self):