[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Traversing/tests - testEtc.py:1.1.2.2 testNamespaceTrversal.py:1.1.2.2 testPresentation.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	testEtc.py testNamespaceTrversal.py testPresentation.py 
Log Message:
Merging in Zope3InWonderland-branch, which implemented the following
proposals (see
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/OldProposals): 
- RenameAllowToRequire

- GroupClassRelatedDirectivesInClassDirective

- ViewInterfaceAndSimplification

- ConsistentUseOfSpacesAsDelimitersInZCMLAttributes

- TwoArgumentViewConstructors

- ImplementsInZCML

- SimpleViewCreationInZCML

- RemoveGetView

- ReplaceProtectWithAllow

- ViewMethodsAsViews

- MergeProtectionAndComponentDefinitions

There were also various security fixes resulting of better integration
of security with components.


=== Zope3/lib/python/Zope/App/Traversing/tests/testEtc.py 1.1.2.1 => 1.1.2.2 ===
         
         self.assertEqual(
-            etc('ApplicationController', (), 'Services;etc', None, None),
+            etc('ApplicationController', (), 'etc::Services', None, None),
             ApplicationController)
 
     def testServices(self):
@@ -36,7 +36,7 @@
         class C:
             def getServiceManager(self): return 42
         
-        self.assertEqual(etc('Services', (), 'Services;etc', C(), None), 42)
+        self.assertEqual(etc('Services', (), 'etc:Services', C(), None), 42)
 
         
 


=== Zope3/lib/python/Zope/App/Traversing/tests/testNamespaceTrversal.py 1.1.2.1 => 1.1.2.2 ===
         from Zope.App.Traversing.Traverser import Traverser
         traverser = Traverser(c)
-        v = traverser.traverse('a;attribute')
+        v = traverser.traverse('attribute::a')
         self.assertEqual(v, 1)
 
     def testItem(self):
         from Zope.App.Traversing.Traverser import Traverser
         traverser = Traverser(c)
-        v = traverser.traverse('a;item')
+        v = traverser.traverse('item::a')
         self.assertEqual(v, 'avalue')
         
         


=== Zope3/lib/python/Zope/App/Traversing/tests/testPresentation.py 1.1.2.1 => 1.1.2.2 ===
 
 class Content: __implements__ = IContent
-class Resource: __implements__ = IPresentationType
+
+class Resource:
+
+    def __init__(self, request): pass
+    __implements__ = IPresentationType
+
 class View:
     __implements__ = IPresentationType
     
-    def __init__(self, content):
+    def __init__(self, content, request):
         self.content = content
 
 class Request:
 
-    def getViewType(self): return IPresentationType
-    def getViewSkin(self): return ''
+    def getPresentationType(self): return IPresentationType
+    def getPresentationSkin(self): return ''
     
 
 class Test(PlacelessSetup, TestCase):
 
     def testView(self):
-        provideView(IContent, 'foo', IPresentationType, View)
+        provideView(IContent, 'foo', IPresentationType, [View])
 
         ob = Content()
-        v = view('foo', (), 'foo;view', ob, Request())
+        v = view('foo', (), 'view::foo', ob, Request())
         self.assertEqual(v.__class__, View)
 
     def testResource(self):
-        r = Resource()
-        provideResource('foo', IPresentationType, r)
+        provideResource('foo', IPresentationType, Resource)
 
         ob = Content()
-        rr = resource('foo', (), 'foo;resource', ob, Request())
-        self.assertEqual(rr, r)
+        r = resource('foo', (), 'resource::foo', ob, Request())
+        self.assertEqual(r.__class__, Resource)
         
 
 def test_suite():