[Checkins] SVN: zope.container/trunk/ Break testing dependency on zope.app.testing.

[Hanno Schlichting]

Log message for revision 106583:
  Break testing dependency on zope.app.testing.
  

Changed:
  U   zope.container/trunk/CHANGES.txt
  U   zope.container/trunk/setup.py
  U   zope.container/trunk/src/zope/container/configure.zcml
  U   zope.container/trunk/src/zope/container/tests/test_dependencies.py

-=-
Modified: zope.container/trunk/CHANGES.txt
===================================================================
--- zope.container/trunk/CHANGES.txt	2009-12-15 21:24:07 UTC (rev 106582)
+++ zope.container/trunk/CHANGES.txt	2009-12-15 21:39:39 UTC (rev 106583)
@@ -5,6 +5,8 @@
 3.10.0 (Unreleased)
 -------------------
 
+- Break testing dependency on zope.app.testing.
+
 - Break testing dependency on zope.app.dependable by moving the code and tests
   into that package.
 

Modified: zope.container/trunk/setup.py
===================================================================
--- zope.container/trunk/setup.py	2009-12-15 21:24:07 UTC (rev 106582)
+++ zope.container/trunk/setup.py	2009-12-15 21:39:39 UTC (rev 106583)
@@ -63,8 +63,9 @@
                               ], include_dirs=['include']),
                    ],
       extras_require=dict(
-          test=['zope.copypastemove',
-                'zope.app.testing',
+          test=['zope.configuration',
+                'zope.copypastemove',
+                'zope.security',
                 ]),
       install_requires=['setuptools',
                         'zope.interface',

Modified: zope.container/trunk/src/zope/container/configure.zcml
===================================================================
--- zope.container/trunk/src/zope/container/configure.zcml	2009-12-15 21:24:07 UTC (rev 106582)
+++ zope.container/trunk/src/zope/container/configure.zcml	2009-12-15 21:39:39 UTC (rev 106583)
@@ -84,7 +84,7 @@
 
   <adapter
       for="zope.container.interfaces.ISimpleReadContainer
-	   zope.publisher.interfaces.browser.IBrowserRequest"
+           zope.publisher.interfaces.browser.IBrowserRequest"
       provides="zope.publisher.interfaces.browser.IBrowserPublisher"
       factory="zope.container.traversal.ItemTraverser"
       permission="zope.Public"

Modified: zope.container/trunk/src/zope/container/tests/test_dependencies.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_dependencies.py	2009-12-15 21:24:07 UTC (rev 106582)
+++ zope.container/trunk/src/zope/container/tests/test_dependencies.py	2009-12-15 21:39:39 UTC (rev 106583)
@@ -1,28 +1,32 @@
-import os
 import unittest
 
+from zope.configuration.xmlconfig import XMLConfig
 from zope.interface import implements
-import zope.component
-from zope.app.testing import functional
 from zope.publisher.browser import TestRequest
-
 from zope.publisher.interfaces.browser import IBrowserPublisher
-from zope.container.traversal import ItemTraverser
 
-ContainerLayer = functional.ZCMLLayer(
-    os.path.join(os.path.dirname(__file__), 'ftest_zcml_dependencies.zcml'),
-    __name__, 'ContainerLayer', allow_teardown=True)
-
-
 from zope.container.interfaces import IItemContainer
 from zope.container.interfaces import ISimpleReadContainer
+from zope.container.traversal import ItemTraverser
+from zope.container.testing import ContainerPlacelessSetup
 
-class ZCMLDependencies(functional.BrowserTestCase):
 
+class ZCMLDependencies(ContainerPlacelessSetup, unittest.TestCase):
+
     def test_zcml_can_load_with_only_zope_component_meta(self):
         # this is just an example.  It is supposed to show that the
         # configure.zcml file has loaded successfully.
 
+        import zope.component
+        XMLConfig('meta.zcml', zope.component)()
+
+        import zope.security
+        XMLConfig('meta.zcml', zope.security)()
+        XMLConfig('permissions.zcml', zope.security)()
+
+        import zope.container
+        XMLConfig('configure.zcml', zope.container)()
+
         request = TestRequest()
 
         class SampleItemContainer(object):
@@ -45,7 +49,6 @@
 
 def test_suite():
     suite = unittest.TestSuite()
-    ZCMLDependencies.layer = ContainerLayer
     suite.addTest(unittest.makeSuite(ZCMLDependencies))
     return suite