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

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


Log message for revision 127031:
  Test z.c._api.getAdapters 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:08:43 UTC (rev 127030)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test__api.py	2012-06-22 17:08:47 UTC (rev 127031)
@@ -847,21 +847,23 @@
         self.assertTrue(adapted.second is baz)
 
 
-class PackageAPITests(unittest.TestCase):
+class Test_getAdapters(unittest.TestCase):
 
     from zope.component.testing import setUp, tearDown
 
-    def test_getAdapters_nonesuch(self):
+    def _callFUT(self, *args, **kw):
+        from zope.component import getAdapters
+        return getAdapters(*args, **kw)
+
+    def test_nonesuch(self):
         from zope.interface import Interface
-        from zope.component import getAdapters
         class IFoo(Interface):
             pass
-        self.assertEqual(list(getAdapters((object(),), IFoo)), [])
+        self.assertEqual(list(self._callFUT((object(),), IFoo)), [])
 
-    def test_getAdapters_hit(self):
+    def test_hit(self):
         from zope.interface import Interface
         from zope.component import getGlobalSiteManager
-        from zope.component import getAdapters
         class IFoo(Interface):
             pass
         class BarAdapter(object):
@@ -873,7 +875,7 @@
         gsm = getGlobalSiteManager()
         gsm.registerAdapter(BarAdapter, (None,), IFoo)
         gsm.registerAdapter(BazAdapter, (None,), IFoo, name='bar')
-        tuples = list(getAdapters((object(),), IFoo))
+        tuples = list(self._callFUT((object(),), IFoo))
         self.assertEqual(len(tuples), 2)
         names = [(x, y.__class__.__name__) for x, y in tuples]
         self.assertTrue(('', 'BarAdapter') in names)
@@ -915,6 +917,6 @@
         unittest.makeSuite(Test_queryAdapter),
         unittest.makeSuite(Test_getMultiAdapter),
         unittest.makeSuite(Test_queryMultiAdapter),
-        unittest.makeSuite(PackageAPITests),
+        unittest.makeSuite(Test_getAdapters),
     ))
 



More information about the checkins mailing list