Author: bugman Date: Tue Dec 11 18:03:24 2007 New Revision: 4191 URL: http://svn.gna.org/viewcvs/relax?rev=4191&view=rev Log: Updated the returning of alignment tensor parameter names unit test to include Sij and Pij. Modified: branches/N_state_model/test_suite/unit_tests/_generic_fns/test_align_tensor.py Modified: branches/N_state_model/test_suite/unit_tests/_generic_fns/test_align_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/test_suite/unit_tests/_generic_fns/test_align_tensor.py?rev=4191&r1=4190&r2=4191&view=diff ============================================================================== --- branches/N_state_model/test_suite/unit_tests/_generic_fns/test_align_tensor.py (original) +++ branches/N_state_model/test_suite/unit_tests/_generic_fns/test_align_tensor.py Tue Dec 11 18:03:24 2007 @@ -43,6 +43,22 @@ The function tested is generic_fns.align_tensor.return_data_name(). """ + # Test the return of Saupe order matrix components. + self.assertEqual(self.align_tensor_fns.return_data_name('sxx'), 'Sxx') + self.assertEqual(self.align_tensor_fns.return_data_name('Sxx'), 'Sxx') + self.assertEqual(self.align_tensor_fns.return_data_name('syy'), 'Syy') + self.assertEqual(self.align_tensor_fns.return_data_name('Syy'), 'Syy') + self.assertEqual(self.align_tensor_fns.return_data_name('szz'), 'Szz') + self.assertEqual(self.align_tensor_fns.return_data_name('Szz'), 'Szz') + self.assertEqual(self.align_tensor_fns.return_data_name('sxy'), 'Sxy') + self.assertEqual(self.align_tensor_fns.return_data_name('Sxy'), 'Sxy') + self.assertEqual(self.align_tensor_fns.return_data_name('sxz'), 'Sxz') + self.assertEqual(self.align_tensor_fns.return_data_name('Sxz'), 'Sxz') + self.assertEqual(self.align_tensor_fns.return_data_name('syz'), 'Syz') + self.assertEqual(self.align_tensor_fns.return_data_name('Syz'), 'Syz') + self.assertEqual(self.align_tensor_fns.return_data_name('sxxyy'), 'Sxxyy') + self.assertEqual(self.align_tensor_fns.return_data_name('Sxxyy'), 'Axxyy') + # Test the return of alignment tensor components. self.assertEqual(self.align_tensor_fns.return_data_name('axx'), 'Axx') self.assertEqual(self.align_tensor_fns.return_data_name('Axx'), 'Axx') @@ -59,6 +75,22 @@ self.assertEqual(self.align_tensor_fns.return_data_name('axxyy'), 'Axxyy') self.assertEqual(self.align_tensor_fns.return_data_name('Axxyy'), 'Axxyy') + # Test the return of probability matrix components. + self.assertEqual(self.align_tensor_fns.return_data_name('pxx'), 'Pxx') + self.assertEqual(self.align_tensor_fns.return_data_name('Pxx'), 'Pxx') + self.assertEqual(self.align_tensor_fns.return_data_name('pyy'), 'Pyy') + self.assertEqual(self.align_tensor_fns.return_data_name('Pyy'), 'Pyy') + self.assertEqual(self.align_tensor_fns.return_data_name('pzz'), 'Pzz') + self.assertEqual(self.align_tensor_fns.return_data_name('Pzz'), 'Pzz') + self.assertEqual(self.align_tensor_fns.return_data_name('pxy'), 'Pxy') + self.assertEqual(self.align_tensor_fns.return_data_name('Pxy'), 'Pxy') + self.assertEqual(self.align_tensor_fns.return_data_name('pxz'), 'Pxz') + self.assertEqual(self.align_tensor_fns.return_data_name('Pxz'), 'Pxz') + self.assertEqual(self.align_tensor_fns.return_data_name('pyz'), 'Pyz') + self.assertEqual(self.align_tensor_fns.return_data_name('Pyz'), 'Pyz') + self.assertEqual(self.align_tensor_fns.return_data_name('pxxyy'), 'Pxxyy') + self.assertEqual(self.align_tensor_fns.return_data_name('Pxxyy'), 'Pxxyy') + # Test the return of Euler angles. self.assertEqual(self.align_tensor_fns.return_data_name('a'), 'alpha') self.assertEqual(self.align_tensor_fns.return_data_name('alpha'), 'alpha')