Author: bugman Date: Sun Nov 25 22:04:40 2007 New Revision: 3967 URL: http://svn.gna.org/viewcvs/relax?rev=3967&view=rev Log: Fixed the initialisation of the diffusion tensor system tests. The diffusion_tensor.init test now passes. Added: 1.3/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py - copied, changed from r3966, 1.3/test_suite/unit_tests/_generic_fns/test_molecule.py Modified: 1.3/test_suite/system_tests/diffusion_tensor.py Modified: 1.3/test_suite/system_tests/diffusion_tensor.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/diffusion_tensor.py?rev=3967&r1=3966&r2=3967&view=diff ============================================================================== --- 1.3/test_suite/system_tests/diffusion_tensor.py (original) +++ 1.3/test_suite/system_tests/diffusion_tensor.py Sun Nov 25 22:04:40 2007 @@ -126,8 +126,8 @@ # Initialise some data. self.relax.interpreter._Pipe.switch('sphere') - self.relax.interpreter._Diffusion_tensor.init('sphere', 10e-9, fixed=1) + self.relax.interpreter._Diffusion_tensor.init(10e-9, fixed=1) self.relax.interpreter._Pipe.switch('spheroid') - self.relax.interpreter._Diffusion_tensor.init('spheroid', (2e-8, 1.3, 60-360, 290), param_types=2, spheroid_type='prolate', fixed=1) + self.relax.interpreter._Diffusion_tensor.init((2e-8, 1.3, 60-360, 290), param_types=2, spheroid_type='prolate', fixed=1) self.relax.interpreter._Pipe.switch('ellipsoid') - self.relax.interpreter._Diffusion_tensor.init('ellipsoid', (9e-8, 5e6, 0.3, 60+360, 290, 100), fixed=0) + self.relax.interpreter._Diffusion_tensor.init((9e-8, 5e6, 0.3, 60+360, 290, 100), fixed=0) Copied: 1.3/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py (from r3966, 1.3/test_suite/unit_tests/_generic_fns/test_molecule.py) URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py?p2=1.3/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py&p1=1.3/test_suite/unit_tests/_generic_fns/test_molecule.py&r1=3966&r2=3967&rev=3967&view=diff ============================================================================== --- 1.3/test_suite/unit_tests/_generic_fns/test_molecule.py (original) +++ 1.3/test_suite/unit_tests/_generic_fns/test_diffusion_tensor.py Sun Nov 25 22:04:40 2007 @@ -24,14 +24,13 @@ from unittest import TestCase # relax module imports. -from generic_fns import molecule, residue -from test_suite.unit_tests.molecule_testing_base import Molecule_base_class +from generic_fns import diffusion_tensor +from test_suite.unit_tests.diffusion_tensor_testing_base import Diffusion_tensor_base_class -class Test_molecule(Molecule_base_class, TestCase): - """Unit tests for the functions of the 'generic_fns.molecule' module.""" +class Test_diffusion_tensor(Diffusion_tensor_base_class, TestCase): + """Unit tests for the functions of the 'generic_fns.diffusion_tensor' module.""" - # Place the generic_fns.molecule and generic_fns.residue modules into the class namespace. - molecule_fns = molecule - residue_fns = residue + # Place the generic_fns.diffusion_tensor module into the class namespace. + diffusion_tensor_fns = diffusion_tensor