Remove zope.app.component dependency. Declare zope.app.dependable

dependency which should've been declared already.

buildout.cfg

@@ -4,5 +4,5 @@ parts = test
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zope.container [test]
+eggs = zope.container
 

setup.py

@@ -59,11 +59,6 @@ setup(name='zope.container',
                               ], include_dirs=['include']),
                    ],
 
-      # we don't need zope.app.testing, but zope.app.component does and
-      # doesn't declare the dependency, and we need zope.app.component for
-      # testing
-      extras_require=dict(test=['zope.app.testing',
-                                'zope.app.component']),
       install_requires=['setuptools',
                         'zope.interface',
                         'zope.app.publisher',
@@ -82,6 +77,7 @@ setup(name='zope.container',
                         'zope.traversing',
                         'zope.publisher',
                         'zope.app.broken',
+                        'zope.app.dependable',
                         'ZODB3',
                         ],
       include_package_data = True,

src/zope/container/testing.py

@@ -27,6 +27,8 @@ 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
+
 # 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
@@ -69,3 +71,12 @@ class ContainerPlacefulSetup(ContainerPlacelessSetup):
     def tearDown(self, docttesttest=None):
         ContainerPlacelessSetup.tearDown(self)
 
+
+    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()

src/zope/container/tests/test_objectcopier.py

@@ -24,9 +24,8 @@ from zope.component.eventtesting import getEvents, clearEvents
 from zope.copypastemove import ObjectCopier
 from zope.copypastemove.interfaces import IObjectCopier
 
-from zope.app.component.testing import PlacefulSetup
 from zope.container import testing
-from zope.app.folder import Folder
+from zope.app.folder import Folder, rootFolder
 
 class File(object):
     pass
@@ -79,13 +78,13 @@ def test_copy_events():
     """
 
 
-class ObjectCopierTest(PlacefulSetup, TestCase):
+class ObjectCopierTest(testing.ContainerPlacefulSetup, TestCase):
 
     def setUp(self):
-        PlacefulSetup.setUp(self)
-        PlacefulSetup.buildFolders(self)
+        testing.ContainerPlacefulSetup.setUp(self)
+        self.buildFolders()
         zope.component.provideAdapter(ObjectCopier, (None,), IObjectCopier)
-
+        
     def test_copytosame(self):
         root = self.rootFolder
         container = traverse(root, 'folder1')

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.component.testing import PlacefulSetup
 from zope.app.folder import Folder
 from zope.container import testing
 
@@ -93,11 +92,11 @@ def test_move_events():
     """
 
 
-class ObjectMoverTest(PlacefulSetup, TestCase):
+class ObjectMoverTest(testing.ContainerPlacefulSetup, TestCase):
 
     def setUp(self):
-        PlacefulSetup.setUp(self)
-        PlacefulSetup.buildFolders(self)
+        testing.ContainerPlacefulSetup.setUp(self)
+        self.buildFolders()
         zope.component.provideAdapter(ObjectMover, (None,), )
  
     def test_movetosame(self):
@@ -109,7 +108,7 @@ class ObjectMoverTest(PlacefulSetup, TestCase):
         mover = IObjectMover(file)
         mover.moveTo(container, 'file1')
         self.failUnless('file1' in container)
-        self.assertEquals(len(container), 3)
+        self.assertEquals(len(container), 2)
 
     def test_movetosamewithnewname(self):
         root = self.rootFolder
@@ -190,7 +189,7 @@ class ObjectMoverTest(PlacefulSetup, TestCase):
         mover = IObjectMover(source)
         mover.moveTo(target)
         self.failUnless('folder1_1' in target)
-        self.assertEquals(len(target), 2)
+        self.assertEquals(len(target), 1)
 
     def test_movefoldertosame2(self):
         # Should be a noop, because "moving" to same location
@@ -200,7 +199,7 @@ class ObjectMoverTest(PlacefulSetup, TestCase):
         mover = IObjectMover(source)
         mover.moveTo(target)
         self.failUnless('folder1_1_1' in target)
-        self.assertEquals(len(target), 2)
+        self.assertEquals(len(target), 1)
 
     def test_movefolderfromroot(self):
         root = self.rootFolder