r8219 - /branches/multi_structure/test_suite/unit_tests/_prompt/test_structure.py -- December 18, 2008 - 15:23

Author: bugman
Date: Thu Dec 18 15:23:31 2008
New Revision: 8219

URL: http://svn.gna.org/viewcvs/relax?rev=8219&view=rev
Log:
Fixes for 4 of the structure.read_pdb() user function arg unit tests.


Modified:
    branches/multi_structure/test_suite/unit_tests/_prompt/test_structure.py

Modified: 
branches/multi_structure/test_suite/unit_tests/_prompt/test_structure.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_structure/test_suite/unit_tests/_prompt/test_structure.py?rev=8219&r1=8218&r2=8219&view=diff
==============================================================================
--- branches/multi_structure/test_suite/unit_tests/_prompt/test_structure.py 
(original)
+++ branches/multi_structure/test_suite/unit_tests/_prompt/test_structure.py 
Thu Dec 18 15:23:31 2008
@@ -202,16 +202,16 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the None, int, and int list arguments, and skip them.
-            if data[0] == 'None' or data[0] == 'int' or data[0] == 'int 
list':
+            # Catch the None, bin, int, and int list arguments, and skip 
them.
+            if data[0] == 'None' or data[0] == 'bin' or data[0] == 'int' or 
data[0] == 'int list':
                 continue
 
             # The argument test.
             self.assertRaises(RelaxNoneIntListIntError, 
self.structure_fns.read_pdb, file='test.pdb', read_mol=data[1])
 
 
-    def test_read_pdb_argfail_set_mol_names(self):
-        """The set_mol_names arg test of the structure.read_pdb() user 
function."""
+    def test_read_pdb_argfail_set_mol_name(self):
+        """The set_mol_name arg test of the structure.read_pdb() user 
function."""
 
         # Loop over the data types.
         for data in DATA_TYPES:
@@ -220,7 +220,7 @@
                 continue
 
             # The argument test.
-            self.assertRaises(RelaxNoneStrListStrError, 
self.structure_fns.read_pdb, file='test.pdb', set_mol_names=data[1])
+            self.assertRaises(RelaxNoneStrListStrError, 
self.structure_fns.read_pdb, file='test.pdb', set_mol_name=data[1])
 
 
     def test_read_pdb_argfail_read_model(self):
@@ -228,25 +228,25 @@
 
         # Loop over the data types.
         for data in DATA_TYPES:
-            # Catch the None, int, and int list arguments, and skip them.
-            if data[0] == 'None' or data[0] == 'int' or data[0] == 'int 
list':
+            # Catch the None, bin, int, and int list arguments, and skip 
them.
+            if data[0] == 'None' or data[0] == 'bin' or data[0] == 'int' or 
data[0] == 'int list':
                 continue
 
             # The argument test.
             self.assertRaises(RelaxNoneIntListIntError, 
self.structure_fns.read_pdb, file='test.pdb', read_model=data[1])
 
 
-    def test_read_pdb_argfail_set_model_nums(self):
-        """The set_model_nums arg test of the structure.read_pdb() user 
function."""
-
-        # Loop over the data types.
-        for data in DATA_TYPES:
-            # Catch the None, int, and int list arguments, and skip them.
-            if data[0] == 'None' or data[0] == 'int' or data[0] == 'int 
list':
-                continue
-
-            # The argument test.
-            self.assertRaises(RelaxNoneIntListIntError, 
self.structure_fns.read_pdb, file='test.pdb', set_model_nums=data[1])
+    def test_read_pdb_argfail_set_model_num(self):
+        """The set_model_num arg test of the structure.read_pdb() user 
function."""
+
+        # Loop over the data types.
+        for data in DATA_TYPES:
+            # Catch the None, bin, int, and int list arguments, and skip 
them.
+            if data[0] == 'None' or data[0] == 'bin' or data[0] == 'int' or 
data[0] == 'int list':
+                continue
+
+            # The argument test.
+            self.assertRaises(RelaxNoneIntListIntError, 
self.structure_fns.read_pdb, file='test.pdb', set_model_num=data[1])
 
 
     def test_read_pdb_argfail_parser(self):