r25131 - /trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py -- August 20, 2014 - 23:03

Author: tlinnet
Date: Wed Aug 20 23:03:50 2014
New Revision: 25131

URL: http://svn.gna.org/viewcvs/relax?rev=25131&view=rev
Log:
Fixes to unit tests, after parameter conversion have been corrected.

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=25131&r1=25130&r2=25131&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 23:03:50 2014
@@ -553,7 +553,7 @@
         self.assertEqual(par_dic['pB'], 'pB')
         self.assertEqual(par_dic['dw_BC'], 'dw_BC')
         self.assertEqual(par_dic['kex_BC'], 'kex_BC')
-        self.assertEqual(par_dic['kex_AC'], None)
+        self.assertEqual(par_dic['kex_AC'], '0.0')
 
 
     def test_nesting_param_7(self):
@@ -633,7 +633,7 @@
         self.assertEqual(par_dic['dw_BC'], 'dw_BC')
         self.assertEqual(par_dic['dwH_BC'], 'dwH_BC')
         self.assertEqual(par_dic['kex_BC'], 'kex_BC')
-        self.assertEqual(par_dic['kex_AC'], None)
+        self.assertEqual(par_dic['kex_AC'], '0.0')
 
 
     def test_nesting_param_10(self):
@@ -655,14 +655,14 @@
         # 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['dwH_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['dwH_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['dwH_AB'], 'dwH')
+        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['dwH_BC'], 'dwH')
+        self.assertEqual(par_dic['kex_BC'], 'kex')
+        self.assertEqual(par_dic['kex_AC'], 'kex')
 
 
     def test_sort_models(self):