r25121 - /trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py -- August 20, 2014 - 21:06

Author: tlinnet
Date: Wed Aug 20 21:06:29 2014
New Revision: 25121

URL: http://svn.gna.org/viewcvs/relax?rev=25121&view=rev
Log:
Modified to unit test, that when model:
MODEL_PARAMS_NS_R1RHO_3SITE

nest from:
MODEL_PARAMS_NS_R1RHO_2SITE

the conversion should be:
'r2', 'r2'
'pA', 'pA'
'dw_AB', 'dw'
'kex_AB', 'kex'
'pB', '1 - pA'
'dw_BC', 'dw'
'kex_BC', 'kex'
'kex_AC', 'kex'

Here '1 - pA' is a special conversion flag.

Modified:
    trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py

Modified: 
trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py?rev=25121&r1=25120&r2=25121&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py  
  (original)
+++ trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py  
  Wed Aug 20 21:06:29 2014
@@ -575,12 +575,12 @@
         # Test content of dictionary.
         self.assertEqual(par_dic['r2'], 'r2')
         self.assertEqual(par_dic['pA'], 'pA')
-        self.assertEqual(par_dic['dw_AB'], None)
-        self.assertEqual(par_dic['kex_AB'], None)
-        self.assertEqual(par_dic['pB'], None)
-        self.assertEqual(par_dic['dw_BC'], None)
-        self.assertEqual(par_dic['kex_BC'], None)
-        self.assertEqual(par_dic['kex_AC'], None)
+        self.assertEqual(par_dic['dw_AB'], 'dw')
+        self.assertEqual(par_dic['kex_AB'], 'kex')
+        self.assertEqual(par_dic['pB'], '1 - pA')
+        self.assertEqual(par_dic['dw_BC'], 'dw')
+        self.assertEqual(par_dic['kex_BC'], 'kex')
+        self.assertEqual(par_dic['kex_AC'], 'kex')
 
 
     def test_nesting_param_8(self):