From 2db01bbe52005adb4f4e7e31d4b73c8179acde81 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Wed, 11 Dec 2013 09:55:54 -0600
Subject: [PATCH] Add some higher-level methods to mapping unit test.

---
 test/unit/test_galaxy_mapping.py | 37 ++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/test/unit/test_galaxy_mapping.py b/test/unit/test_galaxy_mapping.py
index 8c8fac09f56..27ff66e6efc 100644
--- a/test/unit/test_galaxy_mapping.py
+++ b/test/unit/test_galaxy_mapping.py
@@ -3,10 +3,10 @@ import galaxy.model.mapping as mapping
 
 
 class MappingTests( unittest.TestCase ):
+
     def test_basic( self ):
-        # Start the database and connect the mapping
-        model = mapping.init( "/tmp", "sqlite:///:memory:", create_tables=True )
-        assert model.engine is not None
+        model = self.model
+
         # Make some changes and commit them
         u = model.User( email="james@foo.bar.baz", password="password" )
         # gs = model.GalaxySession()
@@ -14,15 +14,14 @@ class MappingTests( unittest.TestCase ):
         #h1.queries.append( model.Query( "h1->q1" ) )
         #h1.queries.append( model.Query( "h1->q2" ) )
         h2 = model.History( name=( "H" * 1024 ) )
-        model.session.add_all( ( u, h1, h2 ) )
+        self.persist( u, h1, h2 )
         #q1 = model.Query( "h2->q1" )
         metadata = dict( chromCol=1, startCol=2, endCol=3 )
         d1 = model.HistoryDatasetAssociation( extension="interval", metadata=metadata, history=h2, create_dataset=True, sa_session=model.session )
         #h2.queries.append( q1 )
         #h2.queries.append( model.Query( "h2->q2" ) )
-        model.session.add( ( d1 ) )
-        model.session.flush()
-        model.session.expunge_all()
+        self.persist( d1 )
+
         # Check
         users = model.session.query( model.User ).all()
         assert len( users ) == 1
@@ -41,13 +40,33 @@ class MappingTests( unittest.TestCase ):
         #assert hists[1].datasets[0].file_name == os.path.join( "/tmp", *directory_hash_id( id ) ) + ( "/dataset_%d.dat" % id )
         # Do an update and check
         hists[1].name = "History 2b"
-        model.session.flush()
-        model.session.expunge_all()
+        self.expunge()
         hists = model.session.query( model.History ).all()
         assert hists[0].name == "History 1"
         assert hists[1].name == "History 2b"
         # gvk TODO need to ad test for GalaxySessions, but not yet sure what they should look like.
 
+    @classmethod
+    def setUpClass(cls):
+        # Start the database and connect the mapping
+        cls.model = mapping.init( "/tmp", "sqlite:///:memory:", create_tables=True )
+        assert cls.model.engine is not None
+
+    @classmethod
+    def query( cls, type ):
+        return cls.model.session.query( type )
+
+    @classmethod
+    def persist(cls, *args):
+        for arg in args:
+            cls.model.session.add( arg )
+        cls.expunge()
+
+    @classmethod
+    def expunge(cls):
+        cls.model.session.flush()
+        cls.model.session.expunge_all()
+
 
 def get_suite():
     suite = unittest.TestSuite()