[Checkins] SVN: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/ added placefulSetUp

[Bernd Dorn]

Log message for revision 68079:
  added placefulSetUp

Changed:
  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/testing/__init__.py

-=-
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:49 UTC (rev 68078)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/intid/tests.py	2006-05-10 16:19:15 UTC (rev 68079)
@@ -1,35 +1,12 @@
 import unittest
 import doctest
 from zope.testing.doctestunit import DocFileSuite
-from zope.app.testing import setup
-import os, tempfile
-import shutil
-from z3c.zalchemy.datamanager import AlchemyEngineUtility
-import z3c.zalchemy.testing
-from zope import component
+from z3c.zalchemy.testing import placefulSetUp, placefulTearDown
 
-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')
-    
-    engineUtil = AlchemyEngineUtility(
-        'database','sqlite:///%s' % dbFile)
-    component.provideUtility(engineUtil)
-    test.globs['engineUtil'] = engineUtil
-    
-
-def tearDown(test):
-    z3c.zalchemy.testing.tearDown(test)
-    setup.placefulTearDown()
-    shutil.rmtree(test.tmpDir)
-
-
 def test_suite():
     return unittest.TestSuite((
         DocFileSuite('keyreference.txt',
-                     setUp=setUp, tearDown=tearDown,
+                     setUp=placefulSetUp, tearDown=placefulTearDown,
                      optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
                      ),
         ))

Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/testing/__init__.py
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/testing/__init__.py	2006-05-10 16:04:49 UTC (rev 68078)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/testing/__init__.py	2006-05-10 16:19:15 UTC (rev 68079)
@@ -11,12 +11,33 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
+
 import transaction
 import z3c.zalchemy
+from zope.app.testing import setup
+from z3c.zalchemy.datamanager import AlchemyEngineUtility
+from zope import component
+import os, tempfile, shutil
 
-def setUp(context):
+
+def setUp(test):
     pass
 
-def tearDown(context):
+def tearDown(test):
     if z3c.zalchemy.inSession():
         transaction.get().commit()
+
+def placefulSetUp(test):
+    setup.placefulSetUp()
+    test.tmpDir = tempfile.mkdtemp()
+    dbFile = os.path.join(test.tmpDir,'z3c.zalchemy.testing.placefull.db')
+    engineUtil = AlchemyEngineUtility(
+        'database','sqlite:///%s' % dbFile)
+    component.provideUtility(engineUtil)
+    test.globs['engineUtil'] = engineUtil
+
+def placefulTearDown(test):
+    setup.placefulTearDown()
+    tearDown(test)
+    shutil.rmtree(test.tmpDir)
+