r3968 - in /1.3: generic_fns/diffusion_tensor.py test_suite/unit_tests/diffusion_tensor_testing_base.py -- November 25, 2007 - 22:15

Author: bugman
Date: Sun Nov 25 22:15:50 2007
New Revision: 3968

URL: http://svn.gna.org/viewcvs/relax?rev=3968&view=rev
Log:
Added a unit test for the deletion of diffusion tensor data.


Modified:
    1.3/generic_fns/diffusion_tensor.py
    1.3/test_suite/unit_tests/diffusion_tensor_testing_base.py

Modified: 1.3/generic_fns/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/diffusion_tensor.py?rev=3968&r1=3967&r2=3968&view=diff
==============================================================================
--- 1.3/generic_fns/diffusion_tensor.py (original)
+++ 1.3/generic_fns/diffusion_tensor.py Sun Nov 25 22:15:50 2007
@@ -120,22 +120,21 @@
         return 1.0
 
 
-def delete(run=None):
+def delete():
     """Function for deleting diffusion tensor data."""
 
-    # Test if the run exists.
-    if not run in relax_data_store.run_names:
-        raise RelaxNoPipeError, run
-
-    # Test if diffusion tensor data for the run exists.
-    if not relax_data_store.diff.has_key(run):
-        raise RelaxNoTensorError, run
+    # Test if the current data pipe exists.
+    pipes.test(relax_data_store.current_pipe)
+
+    # Test if diffusion tensor data exists.
+    if not diff_data_exists():
+        raise RelaxTensorError
 
     # Delete the diffusion data.
-    del(relax_data_store.diff[run])
-
-    # Clean up the runs.
-    pipes.eliminate_unused_pipes()
+    del(relax_data_store[relax_data_store.current_pipe].diff_tensor)
+
+    # Put the container back (but empty).
+    self.diff_tensor = DiffTensorData()
 
 
 def diff_data_exists():

Modified: 1.3/test_suite/unit_tests/diffusion_tensor_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/diffusion_tensor_testing_base.py?rev=3968&r1=3967&r2=3968&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/diffusion_tensor_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/diffusion_tensor_testing_base.py Sun Nov 25 
22:15:50 2007
@@ -54,6 +54,23 @@
         """Reset the relax data storage object."""
 
         relax_data_store.__reset__()
+
+
+    def test_delete(self):
+        """Test the deletion of the diffusion tensor data structure.
+
+        The functions tested are both generic_fns.diffusion_tensor.delete() 
and
+        prompt.diffusion_tensor.delete().
+        """
+
+        # Set the tm value.
+        relax_data_store['orig'].diff_tensor.tm = 0.0
+
+        # Delete the tensor data.
+        self.diffusion_tensor_fns.delete()
+
+        # Test that tm is not 0.0.
+        self.assertNotEqual(relax_data_store['orig'].diff_tensor.tm, 0.0)
 
 
     def test_init_bad_angle_units(self):