r3201 - /1.3/test_suite/unit_tests/data/test___init__.py -- March 16, 2007 - 07:46

Author: bugman
Date: Fri Mar 16 07:45:47 2007
New Revision: 3201

URL: http://svn.gna.org/viewcvs/relax?rev=3201&view=rev
Log:
Fixes for the unit tests of the relax data storage singleton methods.

Modified:
    1.3/test_suite/unit_tests/data/test___init__.py

Modified: 1.3/test_suite/unit_tests/data/test___init__.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/data/test___init__.py?rev=3201&r1=3200&r2=3201&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/data/test___init__.py (original)
+++ 1.3/test_suite/unit_tests/data/test___init__.py Fri Mar 16 07:45:47 2007
@@ -32,13 +32,13 @@
     def __getattr__(self, attr):
         """Delegate to the Data class to get methods for testing"""
         return getattr(Data.__class__, attr)
-            
+
 
 class Empty_container:
     """An empty data container."""
 
 
-class Test_Data(TestCase):
+class Test___init__(TestCase):
     """Unit tests for the data.Data class."""
 
     def setUp(self):
@@ -61,14 +61,15 @@
         """Destroy the subclassed data store."""
 
         # Delete all references (which should decrement the singleton's ref 
counter to 0, hence destroying it).
-        del self.data_store
+        if hasattr(self, 'data_store'):
+            del self.data_store
 
 
     def test_add(self):
         """Unit test for testing the addition of a new data pipe by the 
'add()' method."""
 
         # Add a new data pipe.
-        self.data_store.add('new')
+        self.data_store.add(pipe_name='new', pipe_type='mf')
 
         # Test that the new data pipe exists.
         self.assert_(self.data_store.has_key('new'))
@@ -101,5 +102,3 @@
 
         # Test that the object's initial objects still exist.
         self.assert_(hasattr(self.data_store, 'current_pipe'))
-
-