[Checkins] SVN: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/ Adapted tests to use new testing utility

[Jürgen Kartnaller]

Log message for revision 68078:
  Adapted tests to use new testing utility

Changed:
  U   z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/__init__.py
  U   z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/intid/keyreference.txt
  U   z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/intid/tests.py
  U   z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/TRANSACTION.txt
  U   z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/test_zalchemy.py

-=-
Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/__init__.py
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/__init__.py	2006-05-10 16:04:17 UTC (rev 68077)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/__init__.py	2006-05-10 16:04:49 UTC (rev 68078)
@@ -14,6 +14,7 @@
 
 from datamanager import (
         getSession,
+        inSession,
         assignTable,
         assignClass,
         createTable,

Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/intid/keyreference.txt
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/intid/keyreference.txt	2006-05-10 16:04:17 UTC (rev 68077)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/intid/keyreference.txt	2006-05-10 16:04:49 UTC (rev 68078)
@@ -80,5 +80,3 @@
   >>> ref3 == ref2 == ref1
   True
 
-  >>> transaction.get().commit()
-

Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/intid/tests.py
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/intid/tests.py	2006-05-10 16:04:17 UTC (rev 68077)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/intid/tests.py	2006-05-10 16:04:49 UTC (rev 68078)
@@ -5,12 +5,12 @@
 import os, tempfile
 import shutil
 from z3c.zalchemy.datamanager import AlchemyEngineUtility
+import z3c.zalchemy.testing
 from zope import component
-import sqlalchemy
-from threading import local
 
 def setUp(test):
     setup.placefulSetUp()
+    z3c.zalchemy.testing.setUp(test)
     test.tmpDir = tempfile.mkdtemp()
     dbFile = os.path.join(test.tmpDir,'z3c.zalchemy.test.intid.db')
     
@@ -21,6 +21,7 @@
     
 
 def tearDown(test):
+    z3c.zalchemy.testing.tearDown(test)
     setup.placefulTearDown()
     shutil.rmtree(test.tmpDir)
 

Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/TRANSACTION.txt
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/TRANSACTION.txt	2006-05-10 16:04:17 UTC (rev 68077)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/TRANSACTION.txt	2006-05-10 16:04:49 UTC (rev 68078)
@@ -154,5 +154,4 @@
   
   >>> a.value == v
   True
-  >>> transaction.get().commit()
 

Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/test_zalchemy.py
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/test_zalchemy.py	2006-05-10 16:04:17 UTC (rev 68077)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/test_zalchemy.py	2006-05-10 16:04:49 UTC (rev 68078)
@@ -17,14 +17,18 @@
 from zope.app.testing import setup
 from zope.testing.doctestunit import DocFileSuite
 
+import z3c.zalchemy.testing
 
+
 def setUp(test):
     setup.placefulSetUp()
+    z3c.zalchemy.testing.setUp(test)
     test.globs['dbTrFilename'] = 'z3c.zalchemy.test.transaction.db'
     test.globs['dbFilename'] = 'z3c.zalchemy.test1.db'
     test.globs['dbFilename2'] = 'z3c.zalchemy.test2.db'
 
 def tearDown(test):
+    z3c.zalchemy.testing.tearDown(test)
     try:
         os.remove(test.globs['dbTrFilename'])
     except: