r25055 - /trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py -- August 18, 2014 - 17:59

Author: tlinnet
Date: Mon Aug 18 17:59:16 2014
New Revision: 25055

URL: http://svn.gna.org/viewcvs/relax?rev=25055&view=rev
Log:
Fix for unit test, testing how models are sorted before analysis.

This now resembles the previous state.

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=25055&r1=25054&r2=25055&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  
  Mon Aug 18 17:59:16 2014
@@ -251,7 +251,7 @@
         ## Test sort of models, when models are all R1rho models with fitted 
R1.
         # Define all the models tested in the analysis.
         self_models = [MODEL_R2EFF, MODEL_NOREX_R1RHO_FIT_R1, 
MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1, 
MODEL_NS_R1RHO_2SITE_FIT_R1]
-        expected_result = [MODEL_R2EFF, MODEL_NOREX_R1RHO_FIT_R1, 
MODEL_MP05_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_TP02_FIT_R1, MODEL_DPL94_FIT_R1, 
MODEL_NS_R1RHO_2SITE_FIT_R1]
+        expected_result = [MODEL_R2EFF, MODEL_NOREX_R1RHO_FIT_R1, 
MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1, 
MODEL_NS_R1RHO_2SITE_FIT_R1]
 
         # Test the return.
         self.assertEqual(sort_models(models=self_models), expected_result)
@@ -259,7 +259,7 @@
         ## Test sort of models, when models are all CPMG models.
         # Define all the models tested in the analysis.
         self_models = [MODEL_R2EFF, MODEL_NOREX, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_B14_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_3D, 
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_STAR, 
MODEL_NS_CPMG_2SITE_STAR_FULL]
-        expected_result = [MODEL_R2EFF, MODEL_NOREX, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_B14, MODEL_B14_FULL, MODEL_TSMFK01, 
MODEL_IT99, MODEL_CR72, MODEL_CR72_FULL, MODEL_NS_CPMG_2SITE_3D, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR_FULL]
+        expected_result = [MODEL_R2EFF, MODEL_NOREX, MODEL_CR72, 
MODEL_CR72_FULL, MODEL_IT99, MODEL_TSMFK01, MODEL_B14, MODEL_B14_FULL, 
MODEL_NS_CPMG_2SITE_EXPANDED, MODEL_NS_CPMG_2SITE_3D, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR_FULL]
 
         # Test the return.
         self.assertEqual(sort_models(models=self_models), expected_result)
@@ -275,7 +275,7 @@
         ## Test sort of models, when models are mix of CPMG and CPMG MMQ 
models.
         # Define all the models tested in the analysis.
         self_models = [MODEL_R2EFF, MODEL_NOREX, MODEL_NS_MMQ_3SITE, 
MODEL_NS_MMQ_2SITE, MODEL_MMQ_CR72, MODEL_CR72, MODEL_B14, 
MODEL_NS_MMQ_3SITE_LINEAR]
-        expected_result = [MODEL_R2EFF, MODEL_NOREX, MODEL_B14, MODEL_CR72, 
MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE_LINEAR, 
MODEL_NS_MMQ_3SITE]
+        expected_result = [MODEL_R2EFF, MODEL_NOREX, MODEL_CR72, MODEL_B14, 
MODEL_MMQ_CR72, MODEL_NS_MMQ_2SITE, MODEL_NS_MMQ_3SITE_LINEAR, 
MODEL_NS_MMQ_3SITE]
 
         ## Test the return.
         self.assertEqual(sort_models(models=self_models), expected_result)