Author: bugman
Date: Thu Dec 18 13:43:09 2008
New Revision: 8218
URL: http://svn.gna.org/viewcvs/relax?rev=8218&view=rev
Log:
Removed the model arg unit test of structure.read_pdb() and added 4 new 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=8218&r1=8217&r2=8218&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 13:43:09 2008
@@ -26,7 +26,7 @@
# relax module imports.
from data import Relax_data_store; ds = Relax_data_store()
from prompt.structure import Structure
-from relax_errors import RelaxBinError, RelaxBoolError, RelaxFloatError,
RelaxIntError, RelaxNoneIntError, RelaxNoneStrError, RelaxNumError,
RelaxStrError
+from relax_errors import RelaxBinError, RelaxBoolError, RelaxFloatError,
RelaxIntError, RelaxNoneIntError, RelaxNoneIntListIntError,
RelaxNoneStrError, RelaxNoneStrListStrError, RelaxNumError, RelaxStrError
from test_suite.unit_tests.structure_testing_base import Structure_base_class
# Unit test imports.
@@ -197,8 +197,99 @@
self.assertRaises(RelaxNoneStrError,
self.structure_fns.read_pdb, file='test.pdb', dir=data[1])
- def test_read_pdb_argfail_model(self):
- """The model arg test of the structure.read_pdb() user function."""
+ def test_read_pdb_argfail_read_mol(self):
+ """The read_mol 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', 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."""
+
+ # Loop over the data types.
+ for data in DATA_TYPES:
+ # Catch the None, str, and str list arguments, and skip them.
+ if data[0] == 'None' or data[0] == 'str' or data[0] == 'str
list':
+ continue
+
+ # The argument test.
+ self.assertRaises(RelaxNoneStrListStrError,
self.structure_fns.read_pdb, file='test.pdb', set_mol_names=data[1])
+
+
+ def test_read_pdb_argfail_read_model(self):
+ """The read_model 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', 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_parser(self):
+ """The parser arg test of the structure.read_pdb() user function."""
+
+ # Loop over the data types.
+ for data in DATA_TYPES:
+ # Catch the str arguments, and skip them.
+ if data[0] == 'str':
+ continue
+
+ # The argument test.
+ self.assertRaises(RelaxStrError, self.structure_fns.read_pdb,
parser=data[1])
+
+
+ def test_vectors_argfail_attached(self):
+ """The attached arg test of the structure.vectors() user function."""
+
+ # Loop over the data types.
+ for data in DATA_TYPES:
+ # Catch the str arguments, and skip them.
+ if data[0] == 'str':
+ continue
+
+ # The argument test.
+ self.assertRaises(RelaxStrError, self.structure_fns.vectors,
attached=data[1])
+
+
+ def test_vectors_argfail_spin_id(self):
+ """The spin_id arg test of the structure.vectors() user function."""
+
+ # Loop over the data types.
+ for data in DATA_TYPES:
+ # Catch the None and str arguments, and skip them.
+ if data[0] == 'None' or data[0] == 'str':
+ continue
+
+ # The argument test.
+ self.assertRaises(RelaxNoneStrError, self.structure_fns.vectors,
spin_id=data[1])
+
+
+ def test_vectors_argfail_struct_index(self):
+ """The struct_index arg test of the structure.vectors() user
function."""
# Loop over the data types.
for data in DATA_TYPES:
@@ -207,58 +298,6 @@
continue
# The argument test.
- self.assertRaises(RelaxNoneIntError,
self.structure_fns.read_pdb, file='test.pdb', model=data[1])
-
-
- def test_read_pdb_argfail_parser(self):
- """The parser arg test of the structure.read_pdb() user function."""
-
- # Loop over the data types.
- for data in DATA_TYPES:
- # Catch the str arguments, and skip them.
- if data[0] == 'str':
- continue
-
- # The argument test.
- self.assertRaises(RelaxStrError, self.structure_fns.read_pdb,
parser=data[1])
-
-
- def test_vectors_argfail_attached(self):
- """The attached arg test of the structure.vectors() user function."""
-
- # Loop over the data types.
- for data in DATA_TYPES:
- # Catch the str arguments, and skip them.
- if data[0] == 'str':
- continue
-
- # The argument test.
- self.assertRaises(RelaxStrError, self.structure_fns.vectors,
attached=data[1])
-
-
- def test_vectors_argfail_spin_id(self):
- """The spin_id arg test of the structure.vectors() user function."""
-
- # Loop over the data types.
- for data in DATA_TYPES:
- # Catch the None and str arguments, and skip them.
- if data[0] == 'None' or data[0] == 'str':
- continue
-
- # The argument test.
- self.assertRaises(RelaxNoneStrError, self.structure_fns.vectors,
spin_id=data[1])
-
-
- def test_vectors_argfail_struct_index(self):
- """The struct_index arg test of the structure.vectors() user
function."""
-
- # Loop over the data types.
- for data in DATA_TYPES:
- # Catch the None, bin, and int arguments, and skip them.
- if data[0] == 'None' or data[0] == 'bin' or data[0] == 'int':
- continue
-
- # The argument test.
self.assertRaises(RelaxNoneIntError, self.structure_fns.vectors,
struct_index=data[1])
r8218 - /branches/multi_structure/test_suite/unit_tests/_prompt/test_structure.py