[Checkins] SVN: zope.component/tseaver-test_cleanup/ Test z.c._api.getSiteManager in separate class.

Tres Seaver cvs-admin at zope.org
Fri Jun 22 17:08:05 UTC 2012


Log message for revision 127020:
  Test z.c._api.getSiteManager in separate class.

Changed:
  _U  zope.component/tseaver-test_cleanup/
  U   zope.component/tseaver-test_cleanup/src/zope/component/tests/test__api.py

-=-
Modified: zope.component/tseaver-test_cleanup/src/zope/component/tests/test__api.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/tests/test__api.py	2012-06-22 17:07:56 UTC (rev 127019)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test__api.py	2012-06-22 17:08:01 UTC (rev 127020)
@@ -16,35 +16,43 @@
 import unittest
 
 
-class PackageAPITests(unittest.TestCase):
+class Test_getSiteManager(unittest.TestCase):
 
     from zope.component.testing import setUp, tearDown
 
-    def test_getSiteManager_no_args(self):
-        from zope.component.globalregistry import base
+    def _callFUT(self, *args, **kw):
+        from zope.component._api import getSiteManager
+        return getSiteManager(*args, **kw)
+
+    def test_sm_is_IComponentLookup(self):
         from zope.component.interfaces import IComponentLookup
-        from zope.component import getSiteManager
-        sm = getSiteManager()
-        self.assertTrue(sm is base)
+        sm = self._callFUT()
         self.assertTrue(IComponentLookup.providedBy(sm))
-        self.assertTrue(getSiteManager() is sm)
 
-    def test_getSiteManager_w_None(self):
-        from zope.component import getSiteManager
-        self.assertTrue(getSiteManager(None) is getSiteManager())
+    def test_sm_is_singleton(self):
+        from zope.component.globalregistry import base
+        sm = self._callFUT()
+        self.assertTrue(sm is base)
+        self.assertTrue(self._callFUT() is sm)
 
+    def test_w_None(self):
+        self.assertTrue(self._callFUT(None) is self._callFUT())
+
     def test_getSiteManager_w_conforming_context(self):
-        from zope.component import getSiteManager
         from zope.component.tests.examples import ConformsToIComponentLookup
         sitemanager = object()
         context = ConformsToIComponentLookup(sitemanager)
-        self.assertTrue(getSiteManager(context) is sitemanager)
+        self.assertTrue(self._callFUT(context) is sitemanager)
 
     def test_getSiteManager_w_invalid_context(self):
-        from zope.component import getSiteManager
         from zope.component.interfaces import ComponentLookupError
-        self.assertRaises(ComponentLookupError, getSiteManager, object())
+        self.assertRaises(ComponentLookupError, self._callFUT, object())
 
+
+class PackageAPITests(unittest.TestCase):
+
+    from zope.component.testing import setUp, tearDown
+
     def test_getUtility_anonymous_nonesuch(self):
         from zope.interface import Interface
         from zope.component import getUtility
@@ -878,6 +886,7 @@
 
 def test_suite():
     return unittest.TestSuite((
+        unittest.makeSuite(Test_getSiteManager),
         unittest.makeSuite(PackageAPITests),
     ))
 



More information about the checkins mailing list