r4365 - in /1.3/test_suite/system_tests: __init__.py main.py model_selection.py -- January 05, 2008 - 20:58

Author: bugman
Date: Sat Jan  5 20:39:03 2008
New Revision: 4365

URL: http://svn.gna.org/viewcvs/relax?rev=4365&view=rev
Log:
Converted all of the model selection system/functional tests to the new 
unittest framework.


Modified:
    1.3/test_suite/system_tests/__init__.py
    1.3/test_suite/system_tests/main.py
    1.3/test_suite/system_tests/model_selection.py

Modified: 1.3/test_suite/system_tests/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/__init__.py?rev=4365&r1=4364&r2=4365&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/__init__.py (original)
+++ 1.3/test_suite/system_tests/__init__.py Sat Jan  5 20:39:03 2008
@@ -31,6 +31,7 @@
 from diffusion_tensor import Diffusion_tensor
 from generic import Generic
 from model_free import Mf
+from model_selection import Modsel
 from test_pipe_create import Test_pipe_create
 
 
@@ -69,6 +70,7 @@
         
suite_array.append(TestLoader().loadTestsFromTestCase(Diffusion_tensor))
         suite_array.append(TestLoader().loadTestsFromTestCase(Generic))
         suite_array.append(TestLoader().loadTestsFromTestCase(Mf))
+        suite_array.append(TestLoader().loadTestsFromTestCase(Modsel))
         
suite_array.append(TestLoader().loadTestsFromTestCase(Test_pipe_create))
 
         # Add the relax namespace to each TestCase object.

Modified: 1.3/test_suite/system_tests/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/main.py?rev=4365&r1=4364&r2=4365&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/main.py (original)
+++ 1.3/test_suite/system_tests/main.py Sat Jan  5 20:39:03 2008
@@ -29,7 +29,6 @@
 
 # Import the tests.
 from jw_mapping import Jw
-from model_selection import Modsel
 from relax_fit import Relax_fit
 from sequence import Sequence
 
@@ -107,22 +106,6 @@
 
         # Execute the tests.
         self.exec_tests(self.jw_test_array)
-
-
-        # Model selection tests.
-        ########################
-
-        # Heading.
-        heading("The model selection tests")
-
-        # Initialise the array containing each test element.
-        self.modsel_test_array = []
-
-        # The tests.
-        self.modsel_test_array.append(Modsel(self.relax, 'diff tensor'))
-
-        # Execute the tests.
-        self.exec_tests(self.modsel_test_array)
 
 
         # Fin.
@@ -225,21 +208,6 @@
             summary_line(test.name, test.passed)
 
 
-        # Model selection tests.
-        ########################
-
-        # Heading.
-        sys.stdout.write("\nThe model selection tests:\n")
-
-        # Loop over the tests.
-        for test in self.modsel_test_array:
-            # Synopsis.
-            global_pass = global_pass and test.passed
-
-            # Print the summary line.
-            summary_line(test.name, test.passed)
-
-
         # Synposis.
         ###########
 

Modified: 1.3/test_suite/system_tests/model_selection.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_selection.py?rev=4365&r1=4364&r2=4365&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_selection.py (original)
+++ 1.3/test_suite/system_tests/model_selection.py Sat Jan  5 20:39:03 2008
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2006-2007 Edward d'Auvergne                                  
 #
+# Copyright (C) 2006-2008 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -22,32 +22,23 @@
 
 # Python module imports.
 import sys
+from unittest import TestCase
 
 # relax module imports.
 from data import Data as relax_data_store
 
 
-# The relax data storage object.
+class Modsel(TestCase):
+    """Class for testing model selection."""
+
+    def tearDown(self):
+        """Reset the relax data storage object."""
+
+        relax_data_store.__reset__()
 
 
-
-class Modsel:
-    def __init__(self, relax, test_name):
-        """Class for testing model selection."""
-
-        self.relax = relax
-
-        # Diffusion tensor selection.
-        if test_name == 'diff tensor':
-            # The name of the test.
-            self.name = "AIC model selection between two diffusion tensors"
-
-            # The test.
-            self.test = self.diff
-
-
-    def diff(self, pipe):
-        """The test of selecting between diffusion tensors using AIC."""
+    def test_diff(self):
+        """AIC model selection between two diffusion tensors."""
 
         # Init.
         pipes = ['sphere', 'spheroid']
@@ -89,9 +80,5 @@
         self.relax.interpreter._Modsel.model_selection(method='AIC')
 
         # Test if the spheroid has been selected.
-        if not hasattr(relax_data_store['aic'], 'diff') or not 
relax_data_store['aic'].diff.type == 'spheroid':
-            print "\nThe spheroid diffusion tensor has not been selected."
-            return
-
-        # Success.
-        return 1
+        self._assert(hasattr(relax_data_store['aic'], 'diff'))
+        self.assertEqual(relax_data_store['aic'].diff.type, 'spheroid')