r5545 - /1.3/test_suite/unit_tests/_prompt/test_sequence.py -- April 10, 2008 - 12:39

Author: bugman
Date: Thu Apr 10 12:38:59 2008
New Revision: 5545

URL: http://svn.gna.org/viewcvs/relax?rev=5545&view=rev
Log:
More fixes for the sequence.display() user function arg unit tests.


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

Modified: 1.3/test_suite/unit_tests/_prompt/test_sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_sequence.py?rev=5545&r1=5544&r2=5545&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/_prompt/test_sequence.py (original)
+++ 1.3/test_suite/unit_tests/_prompt/test_sequence.py Thu Apr 10 12:38:59 
2008
@@ -26,7 +26,7 @@
 # relax module imports.
 from data import Data as relax_data_store
 from prompt.sequence import Sequence
-from relax_errors import RelaxBinError, RelaxNoneIntError, 
RelaxNoneStrError, RelaxStrError
+from relax_errors import RelaxBinError, RelaxBoolError, RelaxNoneIntError, 
RelaxNoneStrError, RelaxStrError
 from test_suite.unit_tests.sequence_testing_base import Sequence_base_class
 
 # Unit test imports.
@@ -59,12 +59,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the None, int, and bin arguments, and skip them.
-            if data[0] == 'None' or data[0] == 'int' or data[0] == 'bin':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxNoneIntError, self.sequence_fns.display, 
mol_name_flag=data[1])
+            # Catch the bool arguments, and skip them.
+            if data[0] == 'bool':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxBoolError, self.sequence_fns.display, 
mol_name_flag=data[1])
 
 
     def test_display_argfail_res_num_flag(self):
@@ -72,12 +72,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the None, int, and bin arguments, and skip them.
-            if data[0] == 'None' or data[0] == 'int' or data[0] == 'bin':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxNoneIntError, self.sequence_fns.display, 
res_num_flag=data[1])
+            # Catch the bool arguments, and skip them.
+            if data[0] == 'bool':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxBoolError, self.sequence_fns.display, 
res_num_flag=data[1])
 
 
     def test_display_argfail_res_name_flag(self):
@@ -85,12 +85,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the None, int, and bin arguments, and skip them.
-            if data[0] == 'None' or data[0] == 'int' or data[0] == 'bin':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxNoneIntError, self.sequence_fns.display, 
res_name_flag=data[1])
+            # Catch the bool arguments, and skip them.
+            if data[0] == 'bool':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxBoolError, self.sequence_fns.display, 
res_name_flag=data[1])
 
 
     def test_display_argfail_spin_num_flag(self):
@@ -98,12 +98,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the None, int, and bin arguments, and skip them.
-            if data[0] == 'None' or data[0] == 'int' or data[0] == 'bin':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxNoneIntError, self.sequence_fns.display, 
spin_num_flag=data[1])
+            # Catch the bool arguments, and skip them.
+            if data[0] == 'bool':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxBoolError, self.sequence_fns.display, 
spin_num_flag=data[1])
 
 
     def test_display_argfail_spin_name_flag(self):
@@ -111,12 +111,12 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the None, int, and bin arguments, and skip them.
-            if data[0] == 'None' or data[0] == 'int' or data[0] == 'bin':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxNoneIntError, self.sequence_fns.display, 
spin_name_flag=data[1])
+            # Catch the bool arguments, and skip them.
+            if data[0] == 'bool':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxBoolError, self.sequence_fns.display, 
spin_name_flag=data[1])
 
 
     def test_read_argfail_file(self):