[Checkins] SVN: zope.component/tseaver-test_cleanup/ Split out (skimpy) test for zope.component.zcml.

Tres Seaver cvs-admin at zope.org
Thu Jun 21 21:03:36 UTC 2012


Log message for revision 126989:
  Split out (skimpy) test for zope.component.zcml.

Changed:
  _U  zope.component/tseaver-test_cleanup/
  U   zope.component/tseaver-test_cleanup/src/zope/component/tests/test_doctests.py
  A   zope.component/tseaver-test_cleanup/src/zope/component/tests/test_zcml.py

-=-
Modified: zope.component/tseaver-test_cleanup/src/zope/component/tests/test_doctests.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/tests/test_doctests.py	2012-06-21 21:03:29 UTC (rev 126988)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test_doctests.py	2012-06-21 21:03:33 UTC (rev 126989)
@@ -87,30 +87,6 @@
             return self.sitemanager
 
 
-def test_zcml_handler_site_manager():
-    """
-    The ZCML directives provided by zope.component use the ``getSiteManager``
-    method to get the registry where to register the components. This makes
-    possible to hook ``getSiteManager`` before loading a ZCML file:
-
-    >>> from zope.component.testing import setUp, tearDown
-    >>> setUp()
-    >>> from zope.interface.registry import Components
-    >>> registry = Components()
-    >>> def dummy(context=None):
-    ...     return registry
-    >>> from zope.component import getSiteManager
-    >>> ignore = getSiteManager.sethook(dummy)
-
-    >>> from zope.component.testfiles.components import comp, IApp
-    >>> from zope.component.zcml import handler
-    >>> handler('registerUtility', comp, IApp, u'')
-    >>> registry.getUtility(IApp) is comp
-    True
-    >>> ignore = getSiteManager.reset()
-    >>> tearDown()
-    """
-
 class StandaloneTests(unittest.TestCase):
     def testStandalone(self):
         # See: https://bugs.launchpad.net/zope3/+bug/98401
@@ -146,7 +122,6 @@
 def test_suite():
     import doctest
     return unittest.TestSuite((
-        doctest.DocTestSuite(setUp=setUp, tearDown=tearDown),
         doctest.DocTestSuite('zope.component.interface',
                              setUp=setUp, tearDown=tearDown),
         doctest.DocTestSuite('zope.component.nexttesting'),

Added: zope.component/tseaver-test_cleanup/src/zope/component/tests/test_zcml.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/tests/test_zcml.py	                        (rev 0)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test_zcml.py	2012-06-21 21:03:33 UTC (rev 126989)
@@ -0,0 +1,43 @@
+##############################################################################
+#
+# Copyright (c) 2012 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Tests for ZCML directives.
+"""
+import unittest
+
+
+class Test_handle(unittest.TestCase):
+
+    def test_uses_configured_site_manager(self):
+        from zope.component import getSiteManager
+        from zope.component.testfiles.components import comp, IApp
+        from zope.component.zcml import handler
+        from zope.interface.registry import Components
+
+        registry = Components()
+        def dummy(context=None):
+            return registry
+        getSiteManager.sethook(dummy)
+
+        try:
+            handler('registerUtility', comp, IApp, u'')
+            self.assertTrue(registry.getUtility(IApp) is comp)
+        finally:
+            getSiteManager.reset()
+
+
+def test_suite():
+    return unittest.TestSuite((
+        unittest.makeSuite(Test_handle),
+    ))
+



More information about the checkins mailing list