[Checkins] SVN: zope.container/trunk/ Remove zope.app.component dependency. Declare zope.app.dependable
Martijn Faassen
faassen at infrae.com
Thu Jan 29 07:16:25 EST 2009
Log message for revision 95421:
Remove zope.app.component dependency. Declare zope.app.dependable
dependency which should've been declared already.
Changed:
U zope.container/trunk/buildout.cfg
U zope.container/trunk/setup.py
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
-=-
Modified: zope.container/trunk/buildout.cfg
===================================================================
--- zope.container/trunk/buildout.cfg 2009-01-29 12:15:45 UTC (rev 95420)
+++ zope.container/trunk/buildout.cfg 2009-01-29 12:16:25 UTC (rev 95421)
@@ -4,5 +4,5 @@
[test]
recipe = zc.recipe.testrunner
-eggs = zope.container [test]
+eggs = zope.container
Modified: zope.container/trunk/setup.py
===================================================================
--- zope.container/trunk/setup.py 2009-01-29 12:15:45 UTC (rev 95420)
+++ zope.container/trunk/setup.py 2009-01-29 12:16:25 UTC (rev 95421)
@@ -59,11 +59,6 @@
], 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 @@
'zope.traversing',
'zope.publisher',
'zope.app.broken',
+ 'zope.app.dependable',
'ZODB3',
],
include_package_data = True,
Modified: zope.container/trunk/src/zope/container/testing.py
===================================================================
--- zope.container/trunk/src/zope/container/testing.py 2009-01-29 12:15:45 UTC (rev 95420)
+++ zope.container/trunk/src/zope/container/testing.py 2009-01-29 12:16:25 UTC (rev 95421)
@@ -27,6 +27,8 @@
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 @@
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()
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:15:45 UTC (rev 95420)
+++ zope.container/trunk/src/zope/container/tests/test_objectcopier.py 2009-01-29 12:16:25 UTC (rev 95421)
@@ -24,9 +24,8 @@
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 @@
"""
-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')
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:15:45 UTC (rev 95420)
+++ zope.container/trunk/src/zope/container/tests/test_objectmover.py 2009-01-29 12:16:25 UTC (rev 95421)
@@ -24,7 +24,6 @@
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 @@
"""
-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 @@
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 @@
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 @@
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
More information about the Checkins
mailing list