[Checkins] SVN: zope.site/trunk/ Removed functional testing setup and dependency on zope.app.testing.
Hanno Schlichting
hannosch at hannosch.eu
Tue Dec 15 13:22:40 EST 2009
Log message for revision 106551:
Removed functional testing setup and dependency on zope.app.testing.
Changed:
U zope.site/trunk/CHANGES.txt
U zope.site/trunk/setup.py
D zope.site/trunk/src/zope/site/ftesting.zcml
U zope.site/trunk/src/zope/site/testing.py
U zope.site/trunk/src/zope/site/tests/test_folder.py
U zope.site/trunk/src/zope/site/tests/test_localsitemanager.py
U zope.site/trunk/src/zope/site/tests/test_sitemanagercontainer.py
-=-
Modified: zope.site/trunk/CHANGES.txt
===================================================================
--- zope.site/trunk/CHANGES.txt 2009-12-15 16:56:06 UTC (rev 106550)
+++ zope.site/trunk/CHANGES.txt 2009-12-15 18:22:39 UTC (rev 106551)
@@ -2,12 +2,11 @@
CHANGES
=======
-3.7.2 (unreleased)
+3.8.0 (unreleased)
------------------
-- Nothing changed yet.
+- Removed functional testing setup and dependency on zope.app.testing.
-
3.7.1 (2009-11-18)
------------------
Modified: zope.site/trunk/setup.py
===================================================================
--- zope.site/trunk/setup.py 2009-12-15 16:56:06 UTC (rev 106550)
+++ zope.site/trunk/setup.py 2009-12-15 18:22:39 UTC (rev 106551)
@@ -27,7 +27,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.site',
- version = '3.7.2dev',
+ version = '3.8.0dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
description='Local registries for zope component architecture',
@@ -56,8 +56,7 @@
package_dir = {'': 'src'},
namespace_packages=['zope'],
extras_require=dict(
- test=['zope.app.testing',
- 'zope.configuration',
+ test=['zope.configuration',
'zope.copypastemove']),
install_requires=[
'setuptools',
Deleted: zope.site/trunk/src/zope/site/ftesting.zcml
===================================================================
--- zope.site/trunk/src/zope/site/ftesting.zcml 2009-12-15 16:56:06 UTC (rev 106550)
+++ zope.site/trunk/src/zope/site/ftesting.zcml 2009-12-15 18:22:39 UTC (rev 106551)
@@ -1,12 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope">
-
- <include package="zope.component" file="meta.zcml"/>
- <include package="zope.security" file="meta.zcml"/>
-
- <include package="zope.component"/>
- <include package="zope.security"/>
-
- <include package="zope.container"/>
- <include package="zope.site"/>
-</configure>
\ No newline at end of file
Modified: zope.site/trunk/src/zope/site/testing.py
===================================================================
--- zope.site/trunk/src/zope/site/testing.py 2009-12-15 16:56:06 UTC (rev 106550)
+++ zope.site/trunk/src/zope/site/testing.py 2009-12-15 18:22:39 UTC (rev 106551)
@@ -13,18 +13,15 @@
##############################################################################
"""Reusable functionality for testing site-related code
"""
-import os.path
-import zope.app.testing.functional
import zope.component
import zope.component.hooks
import zope.component.interfaces
import zope.container.interfaces
+import zope.container.testing
import zope.site.site
-from zope.app.testing.placelesssetup import setUp as placelessSetUp
-from zope.app.testing.placelesssetup import tearDown as placelessTearDown
from zope.component.interfaces import IComponentLookup
from zope.interface import Interface
-from zope.site import LocalSiteManager, SiteManagerAdapter, SiteManagerContainer
+from zope.site import LocalSiteManager, SiteManagerAdapter
from zope.site.folder import rootFolder
@@ -48,7 +45,7 @@
return utility
def siteSetUp(site=False):
- placelessSetUp()
+ zope.container.testing.setUp()
zope.component.hooks.setHooks()
zope.component.provideAdapter(
@@ -60,16 +57,6 @@
return site
def siteTearDown():
- placelessTearDown()
+ zope.container.testing.tearDown()
zope.component.hooks.resetHooks()
zope.component.hooks.setSite()
-
-
-layer = zope.app.testing.functional.ZCMLLayer(
- os.path.join(os.path.dirname(__file__), 'ftesting.zcml'),
- __name__, 'layer')
-
-
-class FunctionalTestCase(zope.app.testing.functional.FunctionalTestCase):
-
- layer = layer
Modified: zope.site/trunk/src/zope/site/tests/test_folder.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_folder.py 2009-12-15 16:56:06 UTC (rev 106550)
+++ zope.site/trunk/src/zope/site/tests/test_folder.py 2009-12-15 18:22:39 UTC (rev 106551)
@@ -4,16 +4,23 @@
from zope.testing import doctest
from zope.site.folder import Folder
+from zope.site.testing import siteSetUp, siteTearDown
from zope.site.tests.test_site import BaseTestSiteManagerContainer
+def setUp(test=None):
+ siteSetUp()
+def tearDown(test=None):
+ siteTearDown()
+
+
class FolderTest(BaseTestSiteManagerContainer):
-
+
def makeTestObject(self):
return Folder()
+
def test_suite():
- from zope.app.testing.placelesssetup import setUp, tearDown
flags = doctest.ELLIPSIS|doctest.NORMALIZE_WHITESPACE
return TestSuite((
makeSuite(FolderTest),
Modified: zope.site/trunk/src/zope/site/tests/test_localsitemanager.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_localsitemanager.py 2009-12-15 16:56:06 UTC (rev 106550)
+++ zope.site/trunk/src/zope/site/tests/test_localsitemanager.py 2009-12-15 18:22:39 UTC (rev 106551)
@@ -21,16 +21,17 @@
from zope.copypastemove import ObjectCopier
from zope import site
from zope.site.folder import Folder
-from zope.app.testing.placelesssetup import PlacelessSetup
+import zope.site.testing
+
class I1(Interface):
pass
-class TestLocalSiteManager(PlacelessSetup, unittest.TestCase):
+class TestLocalSiteManager(unittest.TestCase):
+
def setUp(self):
- super(TestLocalSiteManager, self).setUp()
-
+ zope.site.testing.siteSetUp()
self.util = object()
self.root = Folder()
self.root['site'] = Folder()
@@ -38,6 +39,9 @@
subfolder.setSiteManager(site.LocalSiteManager(subfolder))
subfolder.getSiteManager().registerUtility(self.util, I1)
+ def tearDown(self):
+ zope.site.testing.siteTearDown()
+
def testCopy(self):
self.assert_(
self.root['site'].getSiteManager().getUtility(I1) is self.util)
Modified: zope.site/trunk/src/zope/site/tests/test_sitemanagercontainer.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_sitemanagercontainer.py 2009-12-15 16:56:06 UTC (rev 106550)
+++ zope.site/trunk/src/zope/site/tests/test_sitemanagercontainer.py 2009-12-15 18:22:39 UTC (rev 106551)
@@ -12,15 +12,19 @@
#
##############################################################################
"""
-
-$Id$
"""
import unittest
+
import zope.component
-import zope.container.interfaces
-import zope.site.folder
-import zope.site.site
+from zope.component import getSiteManager
+import zope.container.testing
+from zope.event import notify
+from zope.lifecycleevent import ObjectRemovedEvent
+from zope.lifecycleevent.interfaces import IObjectRemovedEvent
+
+from zope.site.folder import rootFolder
+from zope.site.site import SiteManagerContainer
import zope.site.testing
@@ -34,24 +38,35 @@
removed_called = True
-class SiteManagerContainerTest(zope.site.testing.FunctionalTestCase):
+def dispatch_event(obj, event):
+ sm = obj._sm
+ if sm is not None:
+ for k,v in sm.items():
+ notify(ObjectRemovedEvent(v, sm, k))
+
+class SiteManagerContainerTest(unittest.TestCase):
+
def setUp(self):
- super(SiteManagerContainerTest, self).setUp()
+ self.root = rootFolder()
+ zope.site.testing.siteSetUp(self.root)
- self.root = zope.site.folder.rootFolder()
-
global removed_called
removed_called = False
- zope.component.getSiteManager().registerHandler(
- removed_event,
- (Dummy, zope.container.interfaces.IObjectRemovedEvent))
+ sm = getSiteManager()
+ sm.registerHandler(removed_event, (Dummy, IObjectRemovedEvent))
+ sm.registerHandler(
+ dispatch_event, (SiteManagerContainer, IObjectRemovedEvent))
+
+ def tearDown(self):
+ zope.site.testing.siteTearDown()
+
def removed_event(self, event):
self.removed_called = True
def test_delete_smc_should_propagate_removed_event(self):
- container = zope.site.site.SiteManagerContainer()
+ container = SiteManagerContainer()
self.root['container'] = container
zope.site.testing.createSiteManager(container)
@@ -61,7 +76,7 @@
self.assert_(removed_called)
def test_delete_when_smc_has_no_sitemanager(self):
- container = zope.site.site.SiteManagerContainer()
+ container = SiteManagerContainer()
self.root['container'] = container
try:
More information about the checkins
mailing list