Author: tlinnet
Date: Tue Aug 19 11:44:10 2014
New Revision: 25068
URL: http://svn.gna.org/viewcvs/relax?rev=25068&view=rev
Log:
Division of unit tests of specific_analyses/relax_disp/model.py into
different functions.
Also added more print information to each tests.
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=25068&r1=25067&r2=25068&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
Tue Aug 19 11:44:10 2014
@@ -29,7 +29,7 @@
"""Unit tests for the functions of the
specific_analyses.relax_disp.variables module."""
- def test_nesting_model_cpmg(self):
+ def test_nesting_model_cpmg_1(self):
"""Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG experiments."""
## Test numerical model return.
@@ -38,9 +38,18 @@
# Define which current model is selected
model = MODEL_NS_CPMG_2SITE_STAR
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_CPMG_2SITE_3D)
+ model_nest = MODEL_NS_CPMG_2SITE_3D
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_2(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG experiments."""
## Test numerical full model return.
# Define all the models tested in the analysis.
@@ -48,9 +57,18 @@
# Define which current model is selected
model = MODEL_NS_CPMG_2SITE_STAR_FULL
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_CPMG_2SITE_3D_FULL)
+ model_nest = MODEL_NS_CPMG_2SITE_3D_FULL
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_3(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG experiments."""
## Test silico simple return from a full model request.
# Define all the models tested in the analysis.
@@ -58,9 +76,18 @@
# Define which current model is selected
model = MODEL_B14_FULL
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_CPMG_2SITE_EXPANDED)
+ model_nest = MODEL_NS_CPMG_2SITE_EXPANDED
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_4(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG experiments."""
## Test LM63 model request.
# Define all the models tested in the analysis.
@@ -68,9 +95,18 @@
# Define which current model is selected
model = MODEL_LM63_3SITE
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_LM63)
+ model_nest = MODEL_LM63
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_5(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG experiments."""
## Test MODEL_CR72_FULL model request.
# Define all the models tested in the analysis.
@@ -78,9 +114,18 @@
# Define which current model is selected
model = MODEL_CR72_FULL
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_CR72)
+ model_nest = MODEL_CR72
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_6(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG experiments."""
## Test MODEL_CR72_FULL model request, when models are ordered
different.
# Define all the models tested in the analysis.
@@ -88,9 +133,18 @@
# Define which current model is selected
model = MODEL_CR72_FULL
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_B14_FULL)
+ model_nest = MODEL_B14_FULL
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_7(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG experiments."""
## Test MODEL_CR72 model request, when models are LM63.
# Define all the models tested in the analysis.
@@ -98,9 +152,18 @@
# Define which current model is selected
model = MODEL_CR72
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_LM63)
+ model_nest = MODEL_LM63
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_8(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG experiments."""
## Test MODEL_IT99 model request, when models are CR72.
# Define all the models tested in the analysis.
@@ -108,9 +171,18 @@
# Define which current model is selected
model = MODEL_IT99
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_CR72)
+ model_nest = MODEL_CR72
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_9(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG experiments."""
## Test MODEL_CR72 model request, when models are MODEL_IT99.
# Define all the models tested in the analysis.
@@ -118,12 +190,17 @@
# Define which current model is selected
model = MODEL_CR72
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_IT99)
-
-
- def test_nesting_model_cpmg_mmq(self):
+ model_nest = MODEL_IT99
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_mmq_1(self):
"""Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG MMQ experiments."""
## Test MODEL_MMQ_CR72 model request, when models are MODEL_CR72.
@@ -132,9 +209,18 @@
# Define which current model is selected
model = MODEL_MMQ_CR72
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_CR72)
+ model_nest = MODEL_CR72
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_mmq_2(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG MMQ experiments."""
## Test MODEL_NS_MMQ_3SITE_LINEAR model request, when models are
MODEL_NS_MMQ_2SITE.
# Define all the models tested in the analysis.
@@ -142,9 +228,18 @@
# Define which current model is selected
model = MODEL_NS_MMQ_3SITE_LINEAR
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_MMQ_2SITE)
+ model_nest = MODEL_NS_MMQ_2SITE
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_mmq_3(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG MMQ experiments."""
## Test MODEL_NS_MMQ_3SITE model request, when models are
MODEL_NS_MMQ_3SITE_LINEAR.
# Define all the models tested in the analysis.
@@ -152,9 +247,18 @@
# Define which current model is selected
model = MODEL_NS_MMQ_3SITE
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_MMQ_3SITE_LINEAR)
+ model_nest = MODEL_NS_MMQ_3SITE_LINEAR
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_cpmg_mmq_4(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for CPMG MMQ experiments."""
## Test MODEL_NS_MMQ_3SITE model request, when models are
MODEL_NS_MMQ_2SITE.
# Define all the models tested in the analysis.
@@ -162,12 +266,17 @@
# Define which current model is selected
model = MODEL_NS_MMQ_3SITE
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_MMQ_2SITE)
-
-
- def test_nesting_model_r1rho_ns(self):
+ model_nest = MODEL_NS_MMQ_2SITE
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_r1rho_ns_1(self):
"""Unit test of function nesting_model, which determine which model
to nest from, testing for numerical R1rho experiments."""
## Test MODEL_NS_R1RHO_3SITE_LINEAR model request, when models are
MODEL_NS_R1RHO_2SITE.
@@ -176,9 +285,18 @@
# Define which current model is selected
model = MODEL_NS_R1RHO_3SITE_LINEAR
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_R1RHO_2SITE)
+ model_nest = MODEL_NS_R1RHO_2SITE
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_r1rho_ns_2(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for numerical R1rho experiments."""
## Test MODEL_NS_R1RHO_3SITE model request, when models are
MODEL_NS_R1RHO_3SITE_LINEAR.
# Define all the models tested in the analysis.
@@ -186,9 +304,18 @@
# Define which current model is selected
model = MODEL_NS_R1RHO_3SITE
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_R1RHO_3SITE_LINEAR)
+ model_nest = MODEL_NS_R1RHO_3SITE_LINEAR
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_r1rho_ns_3(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for numerical R1rho experiments."""
## Test MODEL_NS_R1RHO_3SITE model request, when models are
MODEL_NS_R1RHO_2SITE.
# Define all the models tested in the analysis.
@@ -196,12 +323,17 @@
# Define which current model is selected
model = MODEL_NS_R1RHO_3SITE
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_R1RHO_2SITE)
-
-
- def test_nesting_model_r1rho(self):
+ model_nest = MODEL_NS_R1RHO_2SITE
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_r1rho_1(self):
"""Unit test of function nesting_model, which determine which model
to nest from, testing for R1rho experiments."""
## Test MODEL_MP05_FIT_R1 model request, when models are all R1rho
models with fitted R1.
@@ -210,9 +342,18 @@
# Define which current model is selected
model = MODEL_MP05_FIT_R1
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_TAP03_FIT_R1)
+ model_nest = MODEL_TAP03_FIT_R1
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_r1rho_2(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for R1rho experiments."""
## Test MODEL_TP02_FIT_R1 model request, when models are all R1rho
models with fitted R1, and MODEL_NS_R1RHO_2SITE_FIT_R1 was fitted first.
# Define all the models tested in the analysis.
@@ -220,9 +361,18 @@
# Define which current model is selected
model = MODEL_TP02_FIT_R1
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_R1RHO_2SITE_FIT_R1)
+ model_nest = MODEL_NS_R1RHO_2SITE_FIT_R1
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_r1rho_3(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for R1rho experiments."""
## Test MODEL_DPL94_FIT_R1 model request, when models are all R1rho
models with fitted R1, and MODEL_NS_R1RHO_2SITE_FIT_R1 was fitted first.
# Define all the models tested in the analysis.
@@ -230,9 +380,18 @@
# Define which current model is selected
model = MODEL_DPL94_FIT_R1
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_NS_R1RHO_2SITE_FIT_R1)
+ model_nest = MODEL_NS_R1RHO_2SITE_FIT_R1
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
+
+
+ def test_nesting_model_r1rho_4(self):
+ """Unit test of function nesting_model, which determine which model
to nest from, testing for R1rho experiments."""
## Test MODEL_TP02_FIT_R1 model request, when model are all R1rho
models with fitted R1, and MODEL_DPL94_FIT_R1 was fitted first.
# Define all the models tested in the analysis.
@@ -240,9 +399,14 @@
# Define which current model is selected
model = MODEL_TP02_FIT_R1
-
- # Test the return.
- self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, MODEL_DPL94_FIT_R1)
+ model_nest = MODEL_DPL94_FIT_R1
+
+ print("self.models is:", self_models)
+ print("Current model to analyse is:", model)
+ print("Expected nest model is:", model_nest)
+
+ # Test the return.
+ self.assertEqual(nesting_model(self_models=self_models,
model=model)[1].model, model_nest)
def test_sort_models(self):
r25068 - /trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py