[Zope3-checkins] CVS: Zope3/src/zope/publisher/tests - basetestipublicationrequest.py:1.3.12.1 test_browserrequest.py:1.8.12.1 test_http.py:1.20.10.1 test_xmlrpcrequest.py:1.5.44.1 views.py:1.3.28.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/publisher/tests
In directory cvs.zope.org:/tmp/cvs-serv15349/src/zope/publisher/tests

Modified Files:
      Tag: adaptergeddon-branch
	basetestipublicationrequest.py test_browserrequest.py 
	test_http.py test_xmlrpcrequest.py views.py 
Log Message:
Created a global presentation service that replaces the 
global view, resource, and skin services.

Now look up presentation components by adapting from a request type,
rather than adapting to a presentation type.





=== Zope3/src/zope/publisher/tests/basetestipublicationrequest.py 1.3 => 1.3.12.1 ===
--- Zope3/src/zope/publisher/tests/basetestipublicationrequest.py:1.3	Fri Aug  8 14:07:21 2003
+++ Zope3/src/zope/publisher/tests/basetestipublicationrequest.py	Sun Nov  9 11:08:35 2003
@@ -60,7 +60,3 @@
         request.setPresentationSkin(skin)
         self.assertEqual(request.getPresentationSkin(), skin)
 
-    def test_getPresentationType(self):
-        type = self._Test__expectedViewType()
-        request = self._Test__new()
-        self.assertEqual(request.getPresentationType(), type)


=== Zope3/src/zope/publisher/tests/test_browserrequest.py 1.8 => 1.8.12.1 ===
--- Zope3/src/zope/publisher/tests/test_browserrequest.py:1.8	Fri Aug  8 14:07:21 2003
+++ Zope3/src/zope/publisher/tests/test_browserrequest.py	Sun Nov  9 11:08:35 2003
@@ -24,8 +24,8 @@
 from zope.publisher.interfaces import NotFound
 
 from zope.publisher.base import DefaultPublication
-from zope.publisher.interfaces.browser \
-    import IBrowserPresentation, IBrowserRequest, IBrowserApplicationRequest
+from zope.publisher.interfaces.browser import IBrowserApplicationRequest
+from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.interface.verify import verifyObject
 
 from StringIO import StringIO
@@ -131,7 +131,6 @@
         # test the IView request
         r = self._createRequest()
 
-        self.failUnless(r.getPresentationType() is IBrowserPresentation)
         self.assertEqual(r.getPresentationSkin(), '')
         r.setPresentationSkin('morefoo')
         self.assertEqual(r.getPresentationSkin(), 'morefoo')


=== Zope3/src/zope/publisher/tests/test_http.py 1.20 => 1.20.10.1 ===
--- Zope3/src/zope/publisher/tests/test_http.py:1.20	Sun Aug 17 02:09:17 2003
+++ Zope3/src/zope/publisher/tests/test_http.py	Sun Nov  9 11:08:35 2003
@@ -21,7 +21,7 @@
 from zope.publisher.http import HTTPRequest
 from zope.publisher.publish import publish
 from zope.publisher.base import DefaultPublication
-from zope.publisher.interfaces.http import IHTTPPresentation, IHTTPRequest
+from zope.publisher.interfaces.http import IHTTPRequest
 
 from zope.i18n.interfaces import ILocale
 
@@ -240,7 +240,6 @@
         # test the IView request
         r = self._createRequest()
 
-        self.assertEquals(r.getPresentationType(), IHTTPPresentation)
         self.assertEqual(r.getPresentationSkin(), '')
         r.setPresentationSkin('morefoo')
         self.assertEqual(r.getPresentationSkin(), 'morefoo')


=== Zope3/src/zope/publisher/tests/test_xmlrpcrequest.py 1.5 => 1.5.44.1 ===
--- Zope3/src/zope/publisher/tests/test_xmlrpcrequest.py:1.5	Fri Apr 11 08:55:41 2003
+++ Zope3/src/zope/publisher/tests/test_xmlrpcrequest.py	Sun Nov  9 11:08:35 2003
@@ -24,7 +24,6 @@
 from zope.publisher.xmlrpc import XMLRPCRequest
 
 from zope.publisher.base import DefaultPublication
-from zope.publisher.interfaces.xmlrpc import IXMLRPCPresentation
 
 from cStringIO import StringIO
 
@@ -114,11 +113,6 @@
         request = XMLRPCRequest(instream, outstream, env)
         request.setPublication(publication)
         return request
-
-
-    def testIPresentationRequest(self):
-        r = self._createRequest()
-        self.failUnless(r.getPresentationType() is IXMLRPCPresentation)
 
 
     def testProcessInput(self):


=== Zope3/src/zope/publisher/tests/views.py 1.3 => 1.3.28.1 ===
--- Zope3/src/zope/publisher/tests/views.py:1.3	Tue Jun  3 10:32:07 2003
+++ Zope3/src/zope/publisher/tests/views.py	Sun Nov  9 11:08:35 2003
@@ -18,7 +18,6 @@
 
 from zope.interface import Interface, implements
 from zope.publisher.browser import BrowserView
-from zope.publisher.interfaces.browser import IBrowserPresentation
 
 class IC(Interface): pass
 
@@ -27,7 +26,6 @@
 class VZMI(V1): pass
 
 class R1:
-    implements(IBrowserPresentation)
     def __init__(self, request): self.request = request
 
 class RZMI(R1):