[Checkins] SVN: zope.app.workflow/trunk/ Make dependency on zope.app.folder clear and prepare tests for using zope.site.
Christian Theune
ct at gocept.com
Fri Jan 30 18:06:37 EST 2009
Log message for revision 95609:
Make dependency on zope.app.folder clear and prepare tests for using zope.site.
Changed:
U zope.app.workflow/trunk/CHANGES.txt
U zope.app.workflow/trunk/setup.py
U zope.app.workflow/trunk/src/zope/app/workflow/ftesting.zcml
U zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_contentworkflowsmanager.py
-=-
Modified: zope.app.workflow/trunk/CHANGES.txt
===================================================================
--- zope.app.workflow/trunk/CHANGES.txt 2009-01-30 22:50:41 UTC (rev 95608)
+++ zope.app.workflow/trunk/CHANGES.txt 2009-01-30 23:06:37 UTC (rev 95609)
@@ -7,6 +7,8 @@
- Use zope.container instead of zope.app.container.
+- Explicitly mark test dependency on zope.app.folder.
+
3.4.2 (2009-01-27)
------------------
Modified: zope.app.workflow/trunk/setup.py
===================================================================
--- zope.app.workflow/trunk/setup.py 2009-01-30 22:50:41 UTC (rev 95608)
+++ zope.app.workflow/trunk/setup.py 2009-01-30 23:06:37 UTC (rev 95609)
@@ -50,6 +50,7 @@
extras_require=dict(test=['zope.app.testing',
'zope.app.zcmlfiles',
'zope.app.file',
+ 'zope.app.folder',
'zope.app.securitypolicy']),
install_requires = ['setuptools',
'ZODB3',
Modified: zope.app.workflow/trunk/src/zope/app/workflow/ftesting.zcml
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/ftesting.zcml 2009-01-30 22:50:41 UTC (rev 95608)
+++ zope.app.workflow/trunk/src/zope/app/workflow/ftesting.zcml 2009-01-30 23:06:37 UTC (rev 95609)
@@ -11,6 +11,8 @@
<include package="zope.app.securitypolicy" file="meta.zcml" />
<include package="zope.app.zcmlfiles" />
<include package="zope.app.file"/>
+ <include package="zope.app.folder"/>
+ <include package="zope.site"/>
<include package="zope.app.authentication" />
<include package="zope.app.securitypolicy" />
<include package="zope.app.workflow"/>
Modified: zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_contentworkflowsmanager.py
===================================================================
--- zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_contentworkflowsmanager.py 2009-01-30 22:50:41 UTC (rev 95608)
+++ zope.app.workflow/trunk/src/zope/app/workflow/stateful/browser/tests/test_contentworkflowsmanager.py 2009-01-30 23:06:37 UTC (rev 95609)
@@ -15,6 +15,7 @@
$Id$
"""
+
import unittest
import re
@@ -31,6 +32,7 @@
IContentWorkflowsManager
from zope.app.workflow.testing import AppWorkflowLayer
+
class Test(BrowserTestCase):
def setUp(self):
@@ -66,7 +68,7 @@
self.assertEqual(response.getStatus(), 200)
body = ' '.join(response.getBody().split())
self.assert_(body.find(
- '<option value="zope.app.folder.interfaces.IFolder">'
+ '<option value="zope.site.interfaces.IFolder">'
) >= 0)
self.assert_(body.find(
'<option value="zope.app.file.interfaces.IFile">'
@@ -76,7 +78,7 @@
self.basepath + '/mgr/index.html',
basic='mgr:mgrpw',
form={
- 'field.iface':['zope.app.folder.interfaces.IFolder',
+ 'field.iface':['zope.site.interfaces.IFolder',
'zope.app.file.interfaces.IFile'],
'field.name':['dummy-definition'],
'ADD':'Add'
@@ -89,7 +91,7 @@
self.assert_(nameToInterface(
None,
- 'zope.app.folder.interfaces.IFolder'
+ 'zope.site.interfaces.IFolder'
) in ifaces)
self.assert_(nameToInterface(
None,
@@ -101,7 +103,7 @@
self.basepath + '/mgr/index.html',
basic='mgr:mgrpw',
form={
- 'mappings': ['dummy-definition:zope.app.folder.interfaces.IFolder',
+ 'mappings': ['dummy-definition:zope.site.interfaces.IFolder',
'dummy-definition:zope.app.file.interfaces.IFile'],
'REMOVE':''
})
@@ -109,9 +111,7 @@
ifaces = mgr.getInterfacesForProcessName('dummy-definition')
self.assertEqual(len(ifaces), 0)
+
def test_suite():
Test.layer = AppWorkflowLayer
return unittest.makeSuite(Test)
-
-if __name__ == '__main__':
- unittest.main()
More information about the Checkins
mailing list