[Checkins] SVN: CMF/trunk/CMFCore/tests/test_DynamicType.py forward
port some streamlining of the test implementation from
Philipp von Weitershausen
philikon at philikon.de
Sat Dec 9 10:19:12 EST 2006
Log message for revision 71511:
forward port some streamlining of the test implementation from
CMF 1.6 branch (r71508).
Changed:
U CMF/trunk/CMFCore/tests/test_DynamicType.py
-=-
Modified: CMF/trunk/CMFCore/tests/test_DynamicType.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_DynamicType.py 2006-12-09 15:07:09 UTC (rev 71510)
+++ CMF/trunk/CMFCore/tests/test_DynamicType.py 2006-12-09 15:19:11 UTC (rev 71511)
@@ -18,8 +18,10 @@
import unittest
import Testing
+from StringIO import StringIO
+
from Acquisition import Implicit
-from ZPublisher.BaseRequest import BaseRequest
+from ZPublisher.HTTPRequest import HTTPRequest
from ZPublisher.HTTPResponse import HTTPResponse
from Products.CMFCore.DynamicType import DynamicType
@@ -33,12 +35,13 @@
import zope.component
from zope.testing.cleanup import CleanUp
+from zope.interface import alsoProvides
from zope.component.interfaces import IDefaultViewName
from zope.publisher.interfaces.browser import IBrowserRequest, IBrowserView
from Products.Five.browser import BrowserView
def defineDefaultViewName(name, for_=None):
- zope.component.provideAdapter(name, (for_, BaseRequest),
+ zope.component.provideAdapter(name, (for_, IBrowserRequest),
IDefaultViewName, '')
@@ -82,10 +85,14 @@
environment = { 'URL': '',
'PARENTS': [self.site],
'REQUEST_METHOD': 'GET',
+ 'SERVER_PORT': '80',
+ 'REQUEST_METHOD': 'GET',
'steps': [],
- '_hacked_path': 0,
- 'response': response }
- r = BaseRequest(environment)
+ 'SERVER_NAME': 'localhost',
+ '_hacked_path': 0 }
+ r = HTTPRequest(StringIO(), environment, response)
+ r.other.update(environment)
+ alsoProvides(r, IBrowserRequest)
r.traverse('foo')
self.assertEqual( r.URL, '/foo/dummy_view' )
@@ -98,10 +105,14 @@
environment = { 'URL': '',
'PARENTS': [self.site],
'REQUEST_METHOD': 'GET',
+ 'SERVER_PORT': '80',
+ 'REQUEST_METHOD': 'GET',
'steps': [],
- '_hacked_path': 0,
- 'response': response }
- r = BaseRequest(environment)
+ 'SERVER_NAME': 'localhost',
+ '_hacked_path': 0 }
+ r = HTTPRequest(StringIO(), environment, response)
+ r.other.update(environment)
+ alsoProvides(r, IBrowserRequest)
# we define a Zope3-style default view name, but no
# corresponding view, no change in behaviour expected
@@ -115,20 +126,19 @@
environment = { 'URL': '',
'PARENTS': [self.site],
'REQUEST_METHOD': 'GET',
+ 'SERVER_PORT': '80',
+ 'REQUEST_METHOD': 'GET',
'steps': [],
- '_hacked_path': 0,
- 'response': response }
- r = BaseRequest(environment)
+ 'SERVER_NAME': 'localhost',
+ '_hacked_path': 0 }
+ r = HTTPRequest(StringIO(), environment, response)
+ r.other.update(environment)
+ alsoProvides(r, IBrowserRequest)
# we define a Zope3-style default view name for which a view
- # actually exists (double registration needed because we test
- # with BaseRequest, but Five checks for IBrowserRequest as
- # well)
+ # actually exists
defineDefaultViewName('index.html', DummyContent)
zope.component.provideAdapter(
- DummyView, (DummyContent, BaseRequest), IBrowserView,
- 'index.html')
- zope.component.provideAdapter(
DummyView, (DummyContent, IBrowserRequest), IBrowserView,
'index.html')
More information about the Checkins
mailing list