[Repoze-dev] Repoze CVS: test_helper.py

[Chris McDonough]

Update of /home/repoze/cvs/repoze.zope2/repoze/zope2/tests
In directory laguna.palladion.com:/tmp/cvs-serv17216/repoze/zope2/tests

Modified Files:
	test_helper.py 
Log Message:
Assume get_root will take a helper instead of an environ.


Index: test_helper.py
===================================================================
RCS file: /home/repoze/cvs/repoze.zope2/repoze/zope2/tests/test_helper.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test_helper.py	12 Sep 2007 23:38:20 -0000	1.1
+++ test_helper.py	13 Sep 2007 00:02:54 -0000	1.2
@@ -3,16 +3,17 @@
 class TestTopLevelFuncs(unittest.TestCase):
     def test_get_root(self):
         from repoze.zope2.obob_helper import get_root
-        env = {}
-        app = get_root(env, dummy_configure)
+        helper = DummyHelper(environ={}, config={})
+        app = get_root(helper, dummy_configure)
         self.failUnless(isinstance(app, DummyApplication))
 
     def test_get_connection(self):
         from repoze.zope2.obob_helper import get_connection
-        env = {}
-        conn = get_connection(env, dummy_configure)
-        self.assertEqual(conn.debuginfo, env)
-        self.failUnless(env['tm.cleanup'].has_key('closeconn'), env)
+        helper = DummyHelper(environ={}, config={})
+        conn = get_connection(helper, dummy_configure)
+        self.assertEqual(conn.debuginfo, helper.environ)
+        self.failUnless(helper.environ['tm.cleanup'].has_key('closeconn'),
+                        helper.environ)
 
     def test_makeRequest(self):
         from repoze.zope2 import makeRequest
@@ -72,7 +73,12 @@
         interaction = queryInteraction()
         helper.teardown()
         self.assertEqual(queryInteraction(), None)
-            
+
+class DummyHelper:
+    def __init__(self, environ, config):
+        self.environ = environ
+        self.config = config
+        
 class DummyPublishedObject:
     def __call__(self, request=None):
         self.request = request
@@ -100,7 +106,7 @@
     def open(self):
         return DummyConnection(self)
 
-def dummy_configure():
+def dummy_configure(config):
     return DummyDB()
 
 def _makeEnviron():

_______________________________________________
Repoze-dev mailing list
Repoze-dev at lists.repoze.org
http://lists.repoze.org/mailman/listinfo/repoze-dev