Author: tlinnet
Date: Tue Aug 19 13:31:58 2014
New Revision: 25071
URL: http://svn.gna.org/viewcvs/relax?rev=25071&view=rev
Log:
Modified unit test regarding finding correct nested model.
This was discussed in:
http://thread.gmane.org/gmane.science.nmr.relax.devel/6684
More specific, thread:
http://thread.gmane.org/gmane.science.nmr.relax.devel/6694
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=25071&r1=25070&r2=25071&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 13:31:58 2014
@@ -152,14 +152,14 @@
# Define which current model is selected
model = MODEL_CR72
- 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)
+ model_nest = None
+
+ 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_nest)
def test_nesting_model_cpmg_8(self):
@@ -171,14 +171,14 @@
# Define which current model is selected
model = MODEL_IT99
- 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)
+ model_nest = None
+
+ 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_nest)
def test_nesting_model_cpmg_9(self):
@@ -190,14 +190,14 @@
# Define which current model is selected
model = MODEL_CR72
- 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)
+ model_nest = None
+
+ 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_nest)
def test_nesting_model_cpmg_mmq_1(self):
@@ -209,14 +209,14 @@
# Define which current model is selected
model = MODEL_MMQ_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)
+ model_nest = None
+
+ 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_nest)
def test_nesting_model_cpmg_mmq_2(self):
@@ -361,14 +361,14 @@
# Define which current model is selected
model = MODEL_TP02_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)
+ model_nest = None
+
+ 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_nest)
def test_nesting_model_r1rho_3(self):
@@ -380,14 +380,14 @@
# Define which current model is selected
model = MODEL_DPL94_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)
+ model_nest = None
+
+ 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_nest)
def test_nesting_model_r1rho_4(self):
@@ -399,14 +399,14 @@
# Define which current model is selected
model = MODEL_TP02_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)
+ model_nest = None
+
+ 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_nest)
def test_sort_models(self):
r25071 - /trunk/test_suite/unit_tests/_specific_analyses/_relax_disp/test_model.py