Author: bugman Date: Wed Oct 22 11:37:08 2008 New Revision: 7911 URL: http://svn.gna.org/viewcvs/relax?rev=7911&view=rev Log: Fixes for the arg unit tests of the spectrum.baseplane_rmsd() user function. Modified: branches/spectral_errors/test_suite/unit_tests/_prompt/test_spectrum.py Modified: branches/spectral_errors/test_suite/unit_tests/_prompt/test_spectrum.py URL: http://svn.gna.org/viewcvs/relax/branches/spectral_errors/test_suite/unit_tests/_prompt/test_spectrum.py?rev=7911&r1=7910&r2=7911&view=diff ============================================================================== --- branches/spectral_errors/test_suite/unit_tests/_prompt/test_spectrum.py (original) +++ branches/spectral_errors/test_suite/unit_tests/_prompt/test_spectrum.py Wed Oct 22 11:37:08 2008 @@ -39,8 +39,8 @@ spectrum_fns = Spectrum(fake_relax.fake_instance()) - def test_error_argfail_error(self): - """The error arg test of the spectrum.error() user function.""" + def test_baseplane_rmsd_argfail_error(self): + """The error arg test of the spectrum.baseplane_rmsd() user function.""" # Loop over the data types. for data in DATA_TYPES: @@ -49,11 +49,11 @@ continue # The argument test. - self.assertRaises(RelaxNumError, self.spectrum_fns.error, error=data[1]) - - - def test_error_argfail_spectrum_id(self): - """The spectrum_id arg test of the spectrum.error() user function.""" + self.assertRaises(RelaxNumError, self.spectrum_fns.baseplane_rmsd, error=data[1]) + + + def test_baseplane_rmsd_argfail_spectrum_id(self): + """The spectrum_id arg test of the spectrum.baseplane_rmsd() user function.""" # Loop over the data types. for data in DATA_TYPES: @@ -62,20 +62,20 @@ continue # The argument test. - self.assertRaises(RelaxStrError, self.spectrum_fns.error, spectrum_id=data[1]) - - - def test_error_argfail_spin_id(self): - """The spin_id arg test of the spectrum.error() 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.spectrum_fns.error, spectrum_id='x', spin_id=data[1]) + self.assertRaises(RelaxStrError, self.spectrum_fns.baseplane_rmsd, spectrum_id=data[1]) + + + def test_baseplane_rmsd_argfail_spin_id(self): + """The spin_id arg test of the spectrum.baseplane_rmsd() 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.spectrum_fns.baseplane_rmsd, spectrum_id='x', spin_id=data[1]) def test_integration_points_argfail_N(self):