r2442 - in /branches/auto_select_merged/test_suite: __init__.py generic.py test_suite.py -- April 05, 2006 - 05:08

Author: bugman
Date: Wed Apr  5 05:08:06 2006
New Revision: 2442

URL: http://svn.gna.org/viewcvs/relax?rev=2442&view=rev
Log:
Merged in revisions 2440 to 2441 of the main 1.2 line.

The command used was:
$ svn merge -r2440:2441 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2


Added:
    branches/auto_select_merged/test_suite/generic.py
      - copied unchanged from r2441, 1.2/test_suite/generic.py
Modified:
    branches/auto_select_merged/test_suite/__init__.py
    branches/auto_select_merged/test_suite/test_suite.py

Modified: branches/auto_select_merged/test_suite/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/test_suite/__init__.py?rev=2442&r1=2441&r2=2442&view=diff
==============================================================================
--- branches/auto_select_merged/test_suite/__init__.py (original)
+++ branches/auto_select_merged/test_suite/__init__.py Wed Apr  5 05:08:06 
2006
@@ -21,5 +21,10 @@
 
###############################################################################
 
 
-__all__ = ['test',
-           'run_create']
+__all__ = ['test_suite',
+           'diffusion_tensor',
+           'generic.py',
+           'model_free',
+           'relax_fit',
+           'run_create',
+           'sequence']

Modified: branches/auto_select_merged/test_suite/test_suite.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/auto_select_merged/test_suite/test_suite.py?rev=2442&r1=2441&r2=2442&view=diff
==============================================================================
--- branches/auto_select_merged/test_suite/test_suite.py (original)
+++ branches/auto_select_merged/test_suite/test_suite.py Wed Apr  5 05:08:06 
2006
@@ -27,6 +27,7 @@
 
 # Import the tests.
 from diffusion_tensor import Diffusion_tensor
+from generic import Generic
 from model_free import Mf
 from relax_fit import Relax_fit
 from run_create import Run_create
@@ -135,6 +136,22 @@
 
         # Execute the tests.
         self.exec_tests(self.mf_test_array)
+
+
+        # Generic tests.
+        ################
+
+        # Heading.
+        self.heading("The generic tests")
+
+        # Initialise the array containing each test element.
+        self.generic_test_array = []
+
+        # The tests.
+        self.generic_test_array.append(Generic(self.relax, 'value_diff'))
+
+        # Execute the tests.
+        self.exec_tests(self.generic_test_array)
 
 
         # Summary.
@@ -263,6 +280,17 @@
             self.summary_line(test)
 
 
+        # Generic tests.
+        ################
+
+        # Heading.
+        sys.stdout.write("\nThe generic tests:\n")
+
+        # Loop over the tests.
+        for test in self.generic_test_array:
+            self.summary_line(test)
+
+
         # Synposis.
         ###########