r2480 - in /1.2/test_suite: model_free.py test_suite.py -- April 17, 2006 - 09:45

Author: bugman
Date: Mon Apr 17 09:44:48 2006
New Revision: 2480

URL: http://svn.gna.org/viewcvs/relax?rev=2480&view=rev
Log:
Shifted the model-free results reading test of results.read() to the end of 
the list.


Modified:
    1.2/test_suite/model_free.py
    1.2/test_suite/test_suite.py

Modified: 1.2/test_suite/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/test_suite/model_free.py?rev=2480&r1=2479&r2=2480&view=diff
==============================================================================
--- 1.2/test_suite/model_free.py (original)
+++ 1.2/test_suite/model_free.py Mon Apr 17 09:44:48 2006
@@ -37,6 +37,46 @@
             # The test.
             self.test = self.read_relax_data
 
+        # Test of setting the CSA.
+        if test_name == 'set csa':
+            # The name of the test.
+            self.name = "Setting the CSA value through the user function 
value.set()"
+
+            # The test.
+            self.test = self.set_csa
+
+        # Test of setting the bond length.
+        if test_name == 'set bond length':
+            # The name of the test.
+            self.name = "Setting the bond length through the user function 
value.set()"
+
+            # The test.
+            self.test = self.set_csa
+
+         # Test of setting the CSA and the bond length.
+        if test_name == 'set csa and bond length':
+            # The name of the test.
+            self.name = "Setting both the CSA value and bond length through 
the user function value.set()"
+
+            # The test.
+            self.test = self.set_csa_bond_length
+
+       # Test of selecting model-free model m4.
+        if test_name == 'select m4':
+            # The name of the test.
+            self.name = "Selecting model m4 with parameters {S2, te, Rex} 
using model_free.select_model()"
+
+            # The test.
+            self.test = self.select_m4
+
+        # Test of creating model-free model m4.
+        if test_name == 'create m4':
+            # The name of the test.
+            self.name = "Creating model m4 with parameters {S2, te, Rex} 
using model_free.create_model()"
+
+            # The test.
+            self.test = self.select_m4
+
         # Results reading test.
         if test_name == 'read results':
             # The name of the test.
@@ -44,46 +84,6 @@
 
             # The test.
             self.test = self.read_results
-
-        # Test of setting the CSA.
-        if test_name == 'set csa':
-            # The name of the test.
-            self.name = "Setting the CSA value through the user function 
value.set()"
-
-            # The test.
-            self.test = self.set_csa
-
-        # Test of setting the bond length.
-        if test_name == 'set bond length':
-            # The name of the test.
-            self.name = "Setting the bond length through the user function 
value.set()"
-
-            # The test.
-            self.test = self.set_csa
-
-         # Test of setting the CSA and the bond length.
-        if test_name == 'set csa and bond length':
-            # The name of the test.
-            self.name = "Setting both the CSA value and bond length through 
the user function value.set()"
-
-            # The test.
-            self.test = self.set_csa_bond_length
-
-       # Test of selecting model-free model m4.
-        if test_name == 'select m4':
-            # The name of the test.
-            self.name = "Selecting model m4 with parameters {S2, te, Rex} 
using model_free.select_model()"
-
-            # The test.
-            self.test = self.select_m4
-
-        # Test of creating model-free model m4.
-        if test_name == 'create m4':
-            # The name of the test.
-            self.name = "Creating model m4 with parameters {S2, te, Rex} 
using model_free.create_model()"
-
-            # The test.
-            self.test = self.select_m4
 
 
     def create_m4(self, run):

Modified: 1.2/test_suite/test_suite.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/test_suite/test_suite.py?rev=2480&r1=2479&r2=2480&view=diff
==============================================================================
--- 1.2/test_suite/test_suite.py (original)
+++ 1.2/test_suite/test_suite.py Mon Apr 17 09:44:48 2006
@@ -134,12 +134,12 @@
 
         # User function results.read() test.
         self.mf_test_array.append(Mf(self.relax, 'read relaxation data'))
-        self.mf_test_array.append(Mf(self.relax, 'read results'))
         self.mf_test_array.append(Mf(self.relax, 'set csa'))
         self.mf_test_array.append(Mf(self.relax, 'set bond length'))
         self.mf_test_array.append(Mf(self.relax, 'set csa and bond length'))
         self.mf_test_array.append(Mf(self.relax, 'select m4'))
         self.mf_test_array.append(Mf(self.relax, 'create m4'))
+        self.mf_test_array.append(Mf(self.relax, 'read results'))
 
         # Execute the tests.
         self.exec_tests(self.mf_test_array)