[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZopePublication/tests - testDefaultTraverser.py:1.1.2.6 testZopePublication.py:1.1.2.17

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ZopePublication/tests
In directory cvs.zope.org:/tmp/cvs-serv22834/lib/python/Zope/App/ZopePublication/tests

Modified Files:
      Tag: Zope-3x-branch
	testDefaultTraverser.py testZopePublication.py 
Log Message:
- Test fixes after massive checkin.

Still a set of tests is broken and do not know why.



=== Zope3/lib/python/Zope/App/ZopePublication/tests/testDefaultTraverser.py 1.1.2.5 => 1.1.2.6 ===
-# (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+#
+# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
@@ -18,8 +19,7 @@
 from Zope.ComponentArchitecture.tests.Request import Request
 from Zope.Testing.CleanUp import CleanUp # Base class w registry cleanup
 from Zope.ComponentArchitecture import provideView
-from Zope.App.ZopePublication.Browser.BrowserTraversers import \
-     DefaultTraverser
+from Zope.App.ZopePublication.Traversers import DefaultTraverser
 from Interface import Interface
 from Zope.Exceptions import NotFoundError
 
@@ -94,3 +94,4 @@
 
 if __name__=='__main__':
     unittest.TextTestRunner().run(test_suite())
+


=== Zope3/lib/python/Zope/App/ZopePublication/tests/testZopePublication.py 1.1.2.16 => 1.1.2.17 ===
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
+# Copyright (c) 2001 Zope Corporation and Contributors.  All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
 # Version 1.1 (ZPL).  A copy of the ZPL should accompany this distribution.
@@ -9,11 +6,6 @@
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
 # FOR A PARTICULAR PURPOSE.
-##############################################################################
-"""
-
-$Id$
-"""
 
 import unittest
 
@@ -55,12 +47,12 @@
 
     __implements__ = IBrowserPublisher
 
-    def publishTraverse(self, request, name):
+    def browser_traverse(self, request, name):
         if name == 'bruce':
             return foo
         raise KeyError, name
 
-    def browserDefault(self, request):
+    def browser_default(self, request):
         return self, ['bruce']
 
 class DummyView(DummyPublished):
@@ -218,7 +210,7 @@
                 self.context = context
                 self.counter = 0
 
-            def publishTraverse(self, request, name):
+            def browser_traverse(self, request, name):
                 self.counter+=1
                 return self.context[name]
 
@@ -246,7 +238,7 @@
             def __init__(self, context):
                 self.context = context
 
-            def browserDefault(self, request):
+            def browser_default(self, request):
                 return (self.context['bruce'], 'dummy')
 
         provideView(I1, '_traverse', IBrowserPublisher, Adapter)
@@ -325,3 +317,4 @@
 
 if __name__=='__main__':
     unittest.TextTestRunner().run( test_suite() )
+