r3802 - /1.3/test_suite/unit_tests/state_testing_base.py -- November 22, 2007 - 11:06

Author: bugman
Date: Thu Nov 22 11:06:46 2007
New Revision: 3802

URL: http://svn.gna.org/viewcvs/relax?rev=3802&view=rev
Log:
Modified the state base class unit tests to use the new saved state file.

This file is located in test_suite/shared_data/saved_states/.


Modified:
    1.3/test_suite/unit_tests/state_testing_base.py

Modified: 1.3/test_suite/unit_tests/state_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/state_testing_base.py?rev=3802&r1=3801&r2=3802&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/state_testing_base.py (original)
+++ 1.3/test_suite/unit_tests/state_testing_base.py Thu Nov 22 11:06:46 2007
@@ -38,11 +38,52 @@
     def setUp(self):
         """Set up for all the data pipe unit tests."""
 
+        # Reset the relax data storage object.
+        relax_data_store.__reset__()
+
+
+    def tearDown(self):
+        """Reset the relax data storage object."""
+
+        # Delete the temporary file descriptor.
+        try:
+            del self.tmp_file
+        except AttributeError:
+            pass
+
+        # Reset the relax data store.
+        relax_data_store.__reset__()
+
+
+    def test_load(self):
+        """The unpickling and restoration of the relax data storage 
singleton.
+
+        This tests the normal operation of the generic_fns.state.load() 
function.
+        """
+
+        # Test the contents of the empty singleton.
+        self.assertEqual(relax_data_store.keys(), [])
+        self.assertEqual(relax_data_store.current_pipe, None)
+        self.assert_(not hasattr(relax_data_store, 'y'))
+
+        # Load the state.
+        self.state.load_state(state='basic_single_pipe', 
dir='../../shared_data/saved_states')
+
+        # Test the contents of the restored singleton.
+        self.assertEqual(relax_data_store.keys(), ['orig'])
+        self.assertEqual(relax_data_store.current_pipe, 'orig')
+        self.assertEqual(relax_data_store['orig'].x, 1)
+        self.assertEqual(relax_data_store.y, 'Hello')
+
+
+    def test_save(self):
+        """The pickling and saving of the relax data storage singleton.
+
+        This tests the normal operation of the generic_fns.state.save() 
function.
+        """
+
         # Create a temporary file descriptor.
         self.tmp_file = tmpfile()
-
-        # Reset the relax data storage object.
-        relax_data_store.__reset__()
 
         # Add a data pipe to the data store.
         relax_data_store.add(pipe_name='orig', pipe_type='mf')
@@ -53,54 +94,5 @@
         # Add a single object to the storage object.
         relax_data_store.y = 'Hello'
 
-
-    def tearDown(self):
-        """Reset the relax data storage object."""
-
-        # Delete the temporary file descriptor.
-        del self.tmp_file
-
-        # Reset the relax data store.
-        relax_data_store.__reset__()
-
-        # Clean up the temporarily created dump files.
-        try:
-            remove('test.bz2')
-        except OSError:
-            pass
-
-
-    def test_load(self):
-        """The unpickling and restoration of the relax data storage 
singleton.
-
-        This tests the normal operation of the generic_fns.state.load() 
function.
-        """
-
         # Save the state.
         self.state.save_state(state=self.tmp_file)
-
-        # Reset the relax data store.
-        relax_data_store.__reset__()
-
-        # Test the contents of the empty singleton.
-        self.assertEqual(relax_data_store.keys(), [])
-        self.assertEqual(relax_data_store.current_pipe, None)
-        self.assert_(not hasattr(relax_data_store, 'y'))
-
-        # Load the state.
-        self.state.load_state(state=self.tmp_file)
-
-        # Test the contents of the restored singleton.
-        self.assertEqual(relax_data_store.keys(), ['orig'])
-        self.assertEqual(relax_data_store.current_pipe, 'orig')
-        self.assertEqual(relax_data_store['orig'].x, 1)
-
-
-    def test_save(self):
-        """The pickling and saving of the relax data storage singleton.
-
-        This tests the normal operation of the generic_fns.state.save() 
function.
-        """
-
-        # Save the state.
-        self.state.save_state(state=self.tmp_file)