Hi Troels, The changes are looking good. However here the test of has_exponential_exp_type() should be in its own unit test. Each unit test should be limited to one function. There can be a number of unit tests for the same function, but not one test for multiple functions. That's the reason for the word 'unit'. See https://en.wikipedia.org/wiki/Unit_testing for more details on the concept. Therefore there should be one test for this, as well as the count_relax_times() change introduced in one of the other commits.
Cheers, Edward On 25 February 2014 15:04, <[email protected]> wrote: > Author: tlinnet > Date: Tue Feb 25 15:04:58 2014 > New Revision: 22306 > > URL: http://svn.gna.org/viewcvs/relax?rev=22306&view=rev > Log: > Added check for return of has_exponential_exp_type to be False. > > Regarding bug #21665, (https://gna.org/bugs/?21665) - Running a CPMG analysis > with two fields at two delay times. > > Modified: > > trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py > > Modified: > trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py > URL: > http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py?rev=22306&r1=22305&r2=22306&view=diff > ============================================================================== > --- > trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py > (original) > +++ > trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_disp_data.py > Tue Feb 25 15:04:58 2014 > @@ -25,7 +25,7 @@ > # relax module imports. > from data_store import Relax_data_store; ds = Relax_data_store() > from pipe_control import state > -from specific_analyses.relax_disp.disp_data import count_relax_times, > get_curve_type, loop_exp_frq, loop_exp_frq_offset, loop_exp_frq_offset_point, > loop_exp_frq_offset_point_time, loop_time > +from specific_analyses.relax_disp.disp_data import count_relax_times, > get_curve_type, has_exponential_exp_type, loop_exp_frq, loop_exp_frq_offset, > loop_exp_frq_offset_point, loop_exp_frq_offset_point_time, loop_time > from status import Status; status = Status() > from test_suite.unit_tests.base_classes import UnitTestCase > > @@ -80,6 +80,11 @@ > self.assertEqual(frq, data[1][1]) > # Test the time count > self.assertEqual(count, 1) > + > + # Check the return of has_exponential_exp_type. > + exponential_exp_type = has_exponential_exp_type() > + print(exponential_exp_type) > + self.assertEqual(exponential_exp_type, False) > > # Check the return of get_curve_type function. > curve_type = get_curve_type() > > > _______________________________________________ > relax (http://www.nmr-relax.com) > > This is the relax-commits mailing list > [email protected] > > To unsubscribe from this list, get a password > reminder, or change your subscription options, > visit the list information page at > https://mail.gna.org/listinfo/relax-commits _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-devel mailing list [email protected] To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-devel
