Author: bugman Date: Thu Apr 10 14:33:09 2008 New Revision: 5550 URL: http://svn.gna.org/viewcvs/relax?rev=5550&view=rev Log: Bug fix for the force arg test of the structure.create_diff_tensor_pdb() user function. This should be a bool arg. Modified: 1.3/test_suite/unit_tests/_prompt/test_structure.py Modified: 1.3/test_suite/unit_tests/_prompt/test_structure.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_prompt/test_structure.py?rev=5550&r1=5549&r2=5550&view=diff ============================================================================== --- 1.3/test_suite/unit_tests/_prompt/test_structure.py (original) +++ 1.3/test_suite/unit_tests/_prompt/test_structure.py Thu Apr 10 14:33:09 2008 @@ -85,29 +85,68 @@ # Loop over the data types. for data in DATA_TYPES: + # Catch the bool arguments, and skip them. + if data[0] == 'bool': + continue + + # The argument test. + self.assertRaises(RelaxBinError, self.structure_fns.create_diff_tensor_pdb, force=data[1]) + + + def test_create_vector_dist_argfail_length(self): + """The length arg test of the structure.create_vector_dist() user function.""" + + # Loop over the data types. + for data in DATA_TYPES: + # Catch the float arguments, and skip them. + if data[0] == 'float': + continue + + # The argument test. + self.assertRaises(RelaxFloatError, self.structure_fns.create_vector_dist, length=data[1]) + + + def test_create_vector_dist_argfail_symmetry(self): + """The symmetry arg test of the structure.create_vector_dist() user function.""" + + # 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.structure_fns.create_diff_tensor_pdb, force=data[1]) - - - def test_create_vector_dist_argfail_length(self): - """The length arg test of the structure.create_vector_dist() user function.""" - - # Loop over the data types. - for data in DATA_TYPES: - # Catch the float arguments, and skip them. - if data[0] == 'float': - continue - - # The argument test. - self.assertRaises(RelaxFloatError, self.structure_fns.create_vector_dist, length=data[1]) - - - def test_create_vector_dist_argfail_symmetry(self): - """The symmetry arg test of the structure.create_vector_dist() user function.""" + self.assertRaises(RelaxBinError, self.structure_fns.create_vector_dist, symmetry=data[1]) + + + def test_create_vector_dist_argfail_file(self): + """The file arg test of the structure.create_vector_dist() 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.create_vector_dist, file=data[1]) + + + def test_create_vector_dist_argfail_dir(self): + """The dir arg test of the structure.create_vector_dist() 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.create_vector_dist, dir=data[1]) + + + def test_create_vector_dist_argfail_force(self): + """The force arg test of the structure.create_vector_dist() user function.""" # Loop over the data types. for data in DATA_TYPES: @@ -116,45 +155,6 @@ continue # The argument test. - self.assertRaises(RelaxBinError, self.structure_fns.create_vector_dist, symmetry=data[1]) - - - def test_create_vector_dist_argfail_file(self): - """The file arg test of the structure.create_vector_dist() 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.create_vector_dist, file=data[1]) - - - def test_create_vector_dist_argfail_dir(self): - """The dir arg test of the structure.create_vector_dist() 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.create_vector_dist, dir=data[1]) - - - def test_create_vector_dist_argfail_force(self): - """The force arg test of the structure.create_vector_dist() user function.""" - - # 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.structure_fns.create_vector_dist, force=data[1])