Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zope-container
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
zope-container
Commits
794c5748
Commit
794c5748
authored
Jan 29, 2009
by
Martijn Faassen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove zope.app.component dependency. Declare zope.app.dependable
dependency which should've been declared already.
parent
06ff38b3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
19 deletions
+24
-19
buildout.cfg
buildout.cfg
+1
-1
setup.py
setup.py
+1
-5
src/zope/container/testing.py
src/zope/container/testing.py
+11
-0
src/zope/container/tests/test_objectcopier.py
src/zope/container/tests/test_objectcopier.py
+5
-6
src/zope/container/tests/test_objectmover.py
src/zope/container/tests/test_objectmover.py
+6
-7
No files found.
buildout.cfg
View file @
794c5748
...
...
@@ -4,5 +4,5 @@ parts = test
[test]
recipe = zc.recipe.testrunner
eggs = zope.container
[test]
eggs = zope.container
setup.py
View file @
794c5748
...
...
@@ -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
View file @
794c5748
...
...
@@ -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
View file @
794c5748
...
...
@@ -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,11 +78,11 @@ def test_copy_events():
"""
class
ObjectCopierTest
(
PlacefulSetup
,
TestCase
):
class
ObjectCopierTest
(
testing
.
Container
PlacefulSetup
,
TestCase
):
def
setUp
(
self
):
PlacefulSetup
.
setUp
(
self
)
PlacefulSetup
.
buildFolders
(
self
)
testing
.
Container
PlacefulSetup
.
setUp
(
self
)
self
.
buildFolders
(
)
zope
.
component
.
provideAdapter
(
ObjectCopier
,
(
None
,),
IObjectCopier
)
def
test_copytosame
(
self
):
...
...
src/zope/container/tests/test_objectmover.py
View file @
794c5748
...
...
@@ -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
.
Container
PlacefulSetup
,
TestCase
):
def
setUp
(
self
):
PlacefulSetup
.
setUp
(
self
)
PlacefulSetup
.
buildFolders
(
self
)
testing
.
Container
PlacefulSetup
.
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment