removed direct dependency on zope.app.folder

src/zope/container/testing.py

@@ -19,15 +19,15 @@ from zope import component
 from zope.component.testing import PlacelessSetup as CAPlacelessSetup
 from zope.component.eventtesting import PlacelessSetup as EventPlacelessSetup
 
-from zope.traversing.interfaces import ITraversable
+from zope.traversing.interfaces import ITraversable, IContainmentRoot
 import zope.traversing.testing
+import zope.interface
 
 from zope.container.interfaces import IWriteContainer, INameChooser
 from zope.container.contained import NameChooser
 from zope.container.interfaces import ISimpleReadContainer
 from zope.container.traversal import ContainerTraversable
-
-from zope.app.folder import Folder, rootFolder
+from zope.container.sample import SampleContainer
 
 # XXX we would like to swap the names of the *PlacelessSetup classes
 # in here as that would seem to follow the convention better, but
@@ -73,10 +73,11 @@ class ContainerPlacefulSetup(ContainerPlacelessSetup):
 
 
     def buildFolders(self):
-        root = self.rootFolder = rootFolder()
-        root[u'folder1'] = Folder()
-        root[u'folder1'][u'folder1_1'] = Folder()
-        root[u'folder1'][u'folder1_1'][u'folder1_1_1'] = Folder()
-        root[u'folder2'] = Folder()
-        root[u'folder2'][u'folder2_1'] = Folder()
-        root[u'folder2'][u'folder2_1'][u'folder2_1_1'] = Folder()
+        root = self.rootFolder = SampleContainer()
+        zope.interface.directlyProvides(root, IContainmentRoot)
+        root[u'folder1'] = SampleContainer()
+        root[u'folder1'][u'folder1_1'] = SampleContainer()
+        root[u'folder1'][u'folder1_1'][u'folder1_1_1'] = SampleContainer()
+        root[u'folder2'] = SampleContainer()
+        root[u'folder2'][u'folder2_1'] = SampleContainer()
+        root[u'folder2'][u'folder2_1'][u'folder2_1_1'] = SampleContainer()

src/zope/container/tests/test_objectcopier.py

@@ -25,7 +25,6 @@ from zope.copypastemove import ObjectCopier
 from zope.copypastemove.interfaces import IObjectCopier
 
 from zope.container import testing
-from zope.app.folder import Folder, rootFolder
 
 class File(object):
     pass
@@ -39,12 +38,12 @@ def test_copy_events():
 
     We set things up in a root folder::
 
-      >>> from zope.app.folder import rootFolder
-      >>> root = rootFolder()
+      >>> from zope.container.sample import SampleContainer
+      >>> root = SampleContainer()
       
     Prepare some objects::
 
-      >>> folder = Folder()
+      >>> folder = SampleContainer()
       >>> root[u'foo'] = File()
       >>> root[u'folder'] = folder
       >>> list(folder.keys())

src/zope/container/tests/test_objectmover.py

@@ -24,7 +24,6 @@ from zope.component.eventtesting import getEvents, clearEvents
 from zope.copypastemove import ObjectMover
 from zope.copypastemove.interfaces import IObjectMover
 
-from zope.app.folder import Folder
 from zope.container import testing
 
 class File(object):
@@ -34,8 +33,8 @@ def test_move_events():
     """
     We need a root folder::
 
-      >>> from zope.app.folder import rootFolder
-      >>> root = rootFolder()
+      >>> from zope.container.sample import SampleContainer
+      >>> root = SampleContainer()
       
     Prepare the setup::
 
@@ -44,7 +43,7 @@ def test_move_events():
 
     Prepare some objects::
 
-      >>> folder = Folder()
+      >>> folder = SampleContainer()
       >>> root[u'foo'] = File()
       >>> root[u'folder'] = folder
       >>> list(folder.keys())

src/zope/container/tests/test_ordered.py

@@ -24,8 +24,8 @@ def test_order_events():
     """
     Prepare the setup::
 
-        >>> from zope.app.folder import rootFolder
-        >>> root = rootFolder()
+      >>> from zope.container.sample import SampleContainer
+      >>> root = SampleContainer()
 
     Prepare some objects::
 
@@ -62,8 +62,8 @@ def test_all_items_available_at_object_added_event():
     """
     Prepare the setup::
     
-        >>> from zope.app.folder import rootFolder
-        >>> root = rootFolder()
+      >>> from zope.container.sample import SampleContainer
+      >>> root = SampleContainer()
         
     Now register an event subscriber to object added events.
 
@@ -89,8 +89,8 @@ def test_exception_causes_order_fix():
     """
     Prepare the setup::
 
-        >>> from zope.app.folder import rootFolder
-        >>> root = rootFolder()
+      >>> from zope.container.sample import SampleContainer
+      >>> root = SampleContainer()
 
     Now register an event subscriber to object added events that
     throws an error.