[Checkins] SVN: zope.container/trunk/src/zope/container/test removed direct dependency on zope.app.folder

[Wolfgang Schnerring]

Log message for revision 95424:
  removed direct dependency on zope.app.folder
  

Changed:
  U   zope.container/trunk/src/zope/container/testing.py
  U   zope.container/trunk/src/zope/container/tests/test_objectcopier.py
  U   zope.container/trunk/src/zope/container/tests/test_objectmover.py
  U   zope.container/trunk/src/zope/container/tests/test_ordered.py

-=-
Modified: zope.container/trunk/src/zope/container/testing.py
===================================================================
--- zope.container/trunk/src/zope/container/testing.py	2009-01-29 12:29:25 UTC (rev 95423)
+++ zope.container/trunk/src/zope/container/testing.py	2009-01-29 12:30:49 UTC (rev 95424)
@@ -19,16 +19,16 @@
 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.container.sample import SampleContainer
 
-from zope.app.folder import Folder, rootFolder
-
 # XXX we would like to swap the names of the *PlacelessSetup classes
 # in here as that would seem to follow the convention better, but
 # unfortunately that would break compatibility with zope.app.testing
@@ -73,10 +73,11 @@
 
 
     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()

Modified: zope.container/trunk/src/zope/container/tests/test_objectcopier.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_objectcopier.py	2009-01-29 12:29:25 UTC (rev 95423)
+++ zope.container/trunk/src/zope/container/tests/test_objectcopier.py	2009-01-29 12:30:49 UTC (rev 95424)
@@ -25,7 +25,6 @@
 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 @@
 
     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())

Modified: zope.container/trunk/src/zope/container/tests/test_objectmover.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_objectmover.py	2009-01-29 12:29:25 UTC (rev 95423)
+++ zope.container/trunk/src/zope/container/tests/test_objectmover.py	2009-01-29 12:30:49 UTC (rev 95424)
@@ -24,7 +24,6 @@
 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 @@
     """
     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 @@
 
     Prepare some objects::
 
-      >>> folder = Folder()
+      >>> folder = SampleContainer()
       >>> root[u'foo'] = File()
       >>> root[u'folder'] = folder
       >>> list(folder.keys())

Modified: zope.container/trunk/src/zope/container/tests/test_ordered.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_ordered.py	2009-01-29 12:29:25 UTC (rev 95423)
+++ zope.container/trunk/src/zope/container/tests/test_ordered.py	2009-01-29 12:30:49 UTC (rev 95424)
@@ -24,8 +24,8 @@
     """
     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 @@
     """
     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 @@
     """
     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.