Author: bugman Date: Wed Mar 27 15:16:16 2013 New Revision: 19232 URL: http://svn.gna.org/viewcvs/relax?rev=19232&view=rev Log: Ported r8673 from the old relax_disp branch into the new branch. The command used was: svn merge -r8672:8673 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp@r18123 . ..... r8673 | semor | 2009-01-27 16:18:37 +0100 (Tue, 27 Jan 2009) | 3 lines Changed paths: M /branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py Added two more unit tests. ..... Modified: branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py Modified: branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py?rev=19232&r1=19231&r2=19232&view=diff ============================================================================== --- branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py (original) +++ branches/relax_disp/test_suite/unit_tests/_prompt/test_relax_disp.py Wed Mar 27 15:16:16 2013 @@ -63,3 +63,28 @@ # The argument test. self.assertRaises(RelaxNoneNumError, self.relax_disp_fns.cpmg_delayT, delayT=data[1]) + + + def test_relax_cpmg_frq_argfail_cpmg_frq(self): + """The cpmg_frq arg test of the relax_disp.cpmg_frq() user function.""" + + # Loop over the data types. + for data in DATA_TYPES: + # Catch the float, int and None arguments, and skip them. + if data[0] == 'float' or data[0] == 'int' or data[0] == 'None': + continue + + # The argument test. + self.assertRaises(RelaxNoneNumError, self.relax_disp_fns.cpmg_frq, cpmg_frq=data[1]) + + def test_relax_cpmg_frq_argfail_spectrum_id(self): + """The spectrum_id arg test of the relax_disp.cpmg_frq() 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.relax_disp_fns.cpmg_frq, spectrum_id=data[1])