Ticket #1203: dummy-request.diff

turbogears/tests/test_testutil.py

@@ +1 @@
+import unittest
+
 import cherrypy
+from turbogears import controllers, expose, redirect, testutil
 
-import turbogears
-from turbogears import controllers
-from turbogears import testutil
-
 class MyRoot(controllers.RootController):
     def set_name(self, name):
         cookies = cherrypy.response.simple_cookie
         cookies['name'] = name
         return "Hello " + name
-    set_name = turbogears.expose()(set_name)
+    set_name = expose()(set_name)
 
     def get_name(self):
         cookies = cherrypy.request.simple_cookie
@@ -17 +16 @@
             return cookies['name'].value
         else:
             return "cookie not found"
-    get_name = turbogears.expose()(get_name)
+    get_name = expose()(get_name)
 
     def get_unicode_name(self):
         """Return a nonsense string of non-ascii characters"""
         cherrypy.response.headers['Content-Type'] = 'text/plain; encoding=utf-8'
         return u'\u1234\u9876\u3456'.encode('utf-8')
-    get_unicode_name = turbogears.expose()(get_unicode_name)
+    get_unicode_name = expose()(get_unicode_name)
 
-def test_browser_session():
-    cherrypy.root = MyRoot()
-    bs = testutil.BrowsingSession()
-    bs.goto('/get_name')
-    assert bs.response == 'cookie not found'
-    bs.goto('/set_name?name=me')
-    bs.goto('/get_name')
-    assert bs.response == 'me'
+    def redirect(self):
+        raise redirect("foo")
+    redirect = expose()(redirect)
 
-def test_browser_session_for_two_users():
-    cherrypy.root = MyRoot()
-    bs1 = testutil.BrowsingSession()
-    bs2 = testutil.BrowsingSession()
-    bs1.goto('/set_name?name=bs1')
-    bs2.goto('/set_name?name=bs2')
-    bs1.goto('/get_name')
-    assert bs1.response == 'bs1'
-    bs2.goto('/get_name')
-    assert bs2.response == 'bs2'
+class TestControllers(unittest.TestCase):
+    def setUp(self):
+        cherrypy.root = None
+        cherrypy.tree.mount_points = {}
+        cherrypy.tree.mount(MyRoot(), "/")
+        self.root = cherrypy.root
 
-def test_unicode_response():
-    cherrypy.root = MyRoot()
-    bs = testutil.BrowsingSession()
-    bs.goto('/get_unicode_name')
-    assert bs.response == u'\u1234\u9876\u3456'.encode('utf-8')
-    assert bs.unicode_response == u'\u1234\u9876\u3456'
-    assert type(bs.unicode_response) == unicode
+    def tearDown(self):
+        cherrypy.root = None
+        cherrypy.tree.mount_points = {}
+
+    def test_browser_session(self):
+        bs = testutil.BrowsingSession()
+        bs.goto('/get_name')
+        assert bs.response == 'cookie not found'
+        bs.goto('/set_name?name=me')
+        bs.goto('/get_name')
+        assert bs.response == 'me'
+
+    def test_browser_session_for_two_users(self):
+        bs1 = testutil.BrowsingSession()
+        bs2 = testutil.BrowsingSession()
+        bs1.goto('/set_name?name=bs1')
+        bs2.goto('/set_name?name=bs2')
+        bs1.goto('/get_name')
+        assert bs1.response == 'bs1'
+        bs2.goto('/get_name')
+        assert bs2.response == 'bs2'
+
+    def test_unicode_response(self):
+        bs = testutil.BrowsingSession()
+        bs.goto('/get_unicode_name')
+        assert bs.response == u'\u1234\u9876\u3456'.encode('utf-8')
+        assert bs.unicode_response == u'\u1234\u9876\u3456'
+        assert type(bs.unicode_response) == unicode
+
+    def test_index(self):
+        "Test that call_with_request is usable if controller uses redirect"
+        try:
+            testutil.call(self.root.redirect)
+            self.fail("no redirect exception raised")
+        except cherrypy.HTTPRedirect, e:
+            assert e.status in [302, 303]
+            self.assertEquals(1, len(e.urls))
+            assert e.urls[0].endswith("foo")

turbogears/testutil.py

@@ -131 +131 @@
     to_be_loaded = None
 
 
-class DummyRequest:
+class DummyRequest(_cphttptools.Request):
     """A very simple dummy request."""
 
     remote_host = "127.0.0.1"
 
     def __init__(self, method='GET', path='/', headers=None):
+        super(DummyRequest, self).__init__("127.0.0.1", "4711", "127.0.0.1")
         self.headers = headers or {}
         self.method = method
         self.path = path
+        self.path_info = ''
+        self.query_string = ''
         self.base = ''
+        self.params = {}
+        self.object_trail = []
         self._session = DummySession()
 
     def purge__(self):
@@ -162 +167 @@
     orig_proc_output = controllers._process_output
     controllers._process_output = _return_directly
     cherrypy.serving.response = _cphttptools.Response()
+    cherrypy.serving.response.version = "1.1"
     cherrypy.serving.request = request
     if not hasattr(request, "identity"):
         attach_identity(request)