[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services/tests - test_rolecontents.py:1.6.6.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/browser/services/tests
In directory cvs.zope.org:/tmp/cvs-serv20092/src/zope/app/browser/services/tests

Modified Files:
      Tag: parentgeddon-branch
	test_rolecontents.py 
Log Message:
Checking in work in progress on parentgeddon-branch so Fred can help
me to get the tests passing.  Specific log entries will be provided
when we merge this into the head.


=== Zope3/src/zope/app/browser/services/tests/test_rolecontents.py 1.6 => 1.6.6.1 ===
--- Zope3/src/zope/app/browser/services/tests/test_rolecontents.py:1.6	Sun Aug 17 02:05:57 2003
+++ Zope3/src/zope/app/browser/services/tests/test_rolecontents.py	Mon Sep  8 14:21:30 2003
@@ -23,6 +23,8 @@
 from zope.app.services.role import RoleService
 from zope.app.browser.container.tests.test_contents \
      import BaseTestContentsBrowserView
+from zope.app.content.folder import RootFolder
+from zope.app.container.contained import contained
 
 class IDummy(Interface):
     pass
@@ -33,11 +35,9 @@
 class Test(BaseTestContentsBrowserView, unittest.TestCase):
 
     def _TestView__newContext(self):
-        from zope.app.content.folder import RootFolder
-        from zope.app.context import ContextWrapper
         root = RootFolder()
         container = RoleService()
-        return ContextWrapper(container, root, name='sample')
+        return contained(container, root, name='sample')
 
     def _TestView__newView(self, container):
         from zope.publisher.browser import TestRequest