[Checkins] SVN: zope.component/tseaver-test_cleanup/ Match order of MUT.
Tres Seaver
cvs-admin at zope.org
Fri Jun 22 17:08:54 UTC 2012
Log message for revision 127032:
Match order of MUT.
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:47 UTC (rev 127031)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test__api.py 2012-06-22 17:08:51 UTC (rev 127032)
@@ -49,273 +49,6 @@
self.assertRaises(ComponentLookupError, self._callFUT, object())
-class Test_getUtility(unittest.TestCase):
-
- from zope.component.testing import setUp, tearDown
-
- def _callFUT(self, *args, **kw):
- from zope.component._api import getUtility
- return getUtility(*args, **kw)
-
- def test_anonymous_nonesuch(self):
- from zope.interface import Interface
- from zope.component.interfaces import ComponentLookupError
- class IFoo(Interface):
- pass
- self.assertRaises(ComponentLookupError, self._callFUT, IFoo)
-
- def test_named_nonesuch(self):
- from zope.interface import Interface
- from zope.component.interfaces import ComponentLookupError
- class IFoo(Interface):
- pass
- self.assertRaises(ComponentLookupError,
- self._callFUT, IFoo, name='bar')
-
- def test_anonymous_hit(self):
- from zope.interface import Interface
- from zope.component import getGlobalSiteManager
- class IFoo(Interface):
- pass
- obj = object()
- getGlobalSiteManager().registerUtility(obj, IFoo)
- self.assertTrue(self._callFUT(IFoo) is obj)
-
- def test_named_hit(self):
- from zope.interface import Interface
- from zope.component import getGlobalSiteManager
- class IFoo(Interface):
- pass
- obj = object()
- getGlobalSiteManager().registerUtility(obj, IFoo, name='bar')
- self.assertTrue(self._callFUT(IFoo, name='bar') is obj)
-
- def test_w_conforming_context(self):
- from zope.interface import Interface
- from zope.component import getGlobalSiteManager
- from zope.component.tests.examples import ConformsToIComponentLookup
- class SM(object):
- def __init__(self, obj):
- self._obj = obj
- def queryUtility(self, interface, name, default):
- return self._obj
- class IFoo(Interface):
- pass
- obj1 = object()
- obj2 = object()
- sm = SM(obj2)
- context = ConformsToIComponentLookup(sm)
- getGlobalSiteManager().registerUtility(obj1, IFoo)
- self.assertTrue(self._callFUT(IFoo, context=context) is obj2)
-
-
-class Test_queryUtility(unittest.TestCase):
-
- from zope.component.testing import setUp, tearDown
-
- def _callFUT(self, *args, **kw):
- from zope.component._api import queryUtility
- return queryUtility(*args, **kw)
-
- def test_anonymous_nonesuch(self):
- from zope.interface import Interface
- class IFoo(Interface):
- pass
- self.assertEqual(self._callFUT(IFoo), None)
-
- def test_anonymous_nonesuch_w_default(self):
- from zope.interface import Interface
- class IFoo(Interface):
- pass
- obj = object()
- self.assertTrue(self._callFUT(IFoo, default=obj) is obj)
-
- def test_named_nonesuch(self):
- from zope.interface import Interface
- class IFoo(Interface):
- pass
- self.assertEqual(self._callFUT(IFoo, name='bar'), None)
-
- def test_named_nonesuch_w_default(self):
- from zope.interface import Interface
- class IFoo(Interface):
- pass
- obj = object()
- self.assertTrue(self._callFUT(IFoo, name='bar', default=obj) is obj)
-
- def test_anonymous_hit(self):
- from zope.interface import Interface
- from zope.component import getGlobalSiteManager
- class IFoo(Interface):
- pass
- obj = object()
- getGlobalSiteManager().registerUtility(obj, IFoo)
- self.assertTrue(self._callFUT(IFoo) is obj)
-
- def test_named_hit(self):
- from zope.interface import Interface
- from zope.component import getGlobalSiteManager
- class IFoo(Interface):
- pass
- obj = object()
- getGlobalSiteManager().registerUtility(obj, IFoo, name='bar')
- self.assertTrue(self._callFUT(IFoo, name='bar') is obj)
-
- def test_w_conforming_context(self):
- from zope.interface import Interface
- from zope.component import getGlobalSiteManager
- from zope.component.tests.examples import ConformsToIComponentLookup
- class SM(object):
- def __init__(self, obj):
- self._obj = obj
- def queryUtility(self, interface, name, default):
- return self._obj
- class IFoo(Interface):
- pass
- obj1 = object()
- obj2 = object()
- sm = SM(obj2)
- context = ConformsToIComponentLookup(sm)
- getGlobalSiteManager().registerUtility(obj1, IFoo)
- self.assertTrue(self._callFUT(IFoo, context=context) is obj2)
-
-
-class Test_getUtilitiesFor(unittest.TestCase):
-
- from zope.component.testing import setUp, tearDown
-
- def _callFUT(self, *args, **kw):
- from zope.component._api import getUtilitiesFor
- return getUtilitiesFor(*args, **kw)
-
- def test_nonesuch(self):
- from zope.interface import Interface
- class IFoo(Interface):
- pass
- self.assertEqual(list(self._callFUT(IFoo)), [])
-
- def test_hit(self):
- from zope.interface import Interface
- from zope.component import getGlobalSiteManager
- class IFoo(Interface):
- pass
- obj = object()
- obj1 = object()
- getGlobalSiteManager().registerUtility(obj, IFoo)
- getGlobalSiteManager().registerUtility(obj1, IFoo, name='bar')
- tuples = list(self._callFUT(IFoo))
- self.assertEqual(len(tuples), 2)
- self.assertTrue(('', obj) in tuples)
- self.assertTrue(('bar', obj1) in tuples)
-
-
-class Test_getAllUtilitiesRegisteredFor(unittest.TestCase):
-
- from zope.component.testing import setUp, tearDown
-
- def _callFUT(self, *args, **kw):
- from zope.component import getAllUtilitiesRegisteredFor
- return getAllUtilitiesRegisteredFor(*args, **kw)
-
- def test_nonesuch(self):
- from zope.interface import Interface
- class IFoo(Interface):
- pass
- self.assertEqual(list(self._callFUT(IFoo)), [])
-
- def test_hit(self):
- from zope.interface import Interface
- from zope.component import getGlobalSiteManager
- class IFoo(Interface):
- pass
- class IBar(IFoo):
- pass
- obj = object()
- obj1 = object()
- obj2 = object()
- getGlobalSiteManager().registerUtility(obj, IFoo)
- getGlobalSiteManager().registerUtility(obj1, IFoo, name='bar')
- getGlobalSiteManager().registerUtility(obj2, IBar)
- uts = list(self._callFUT(IFoo))
- self.assertEqual(len(uts), 3)
- self.assertTrue(obj in uts)
- self.assertTrue(obj1 in uts)
- self.assertTrue(obj2 in uts)
-
-
-class Test_getNextUtility(unittest.TestCase):
-
- from zope.component.testing import setUp, tearDown
-
- def _callFUT(self, *args, **kw):
- from zope.component import getNextUtility
- return getNextUtility(*args, **kw)
-
- def test_global(self):
- from zope.component import getGlobalSiteManager
- from zope.component.interface import ComponentLookupError
- gsm = getGlobalSiteManager()
- gutil = _makeMyUtility('global', gsm)
- gsm.registerUtility(gutil, IMyUtility, 'myutil')
- self.assertRaises(ComponentLookupError,
- self._callFUT, gutil, IMyUtility, 'myutil')
-
- def test_nested(self):
- from zope.component import getGlobalSiteManager
- from zope.component.interfaces import IComponentLookup
- from zope.interface.registry import Components
- gsm = getGlobalSiteManager()
- gutil = _makeMyUtility('global', gsm)
- gsm.registerUtility(gutil, IMyUtility, 'myutil')
- sm1 = Components('sm1', bases=(gsm, ))
- sm1_1 = Components('sm1_1', bases=(sm1, ))
- util1 = _makeMyUtility('one', sm1)
- sm1.registerUtility(util1, IMyUtility, 'myutil')
- self.assertTrue(IComponentLookup(util1) is sm1)
- self.assertTrue(self._callFUT(util1, IMyUtility, 'myutil') is gutil)
- util1_1 = _makeMyUtility('one-one', sm1_1)
- sm1_1.registerUtility(util1_1, IMyUtility, 'myutil')
- self.assertTrue(IComponentLookup(util1_1) is sm1_1)
- self.assertTrue(self._callFUT(util1_1, IMyUtility, 'myutil') is util1)
-
-
-class Test_queryNextUtility(unittest.TestCase):
-
- from zope.component.testing import setUp, tearDown
-
- def _callFUT(self, *args, **kw):
- from zope.component import queryNextUtility
- return queryNextUtility(*args, **kw)
-
- def test_global(self):
- from zope.component import getGlobalSiteManager
- gsm = getGlobalSiteManager()
- gutil = _makeMyUtility('global', gsm)
- gsm.registerUtility(gutil, IMyUtility, 'myutil')
- self.assertEqual(self._callFUT(gutil, IMyUtility, 'myutil'), None)
-
- def test_nested(self):
- from zope.component import getGlobalSiteManager
- from zope.interface.registry import Components
- gsm = getGlobalSiteManager()
- gutil = _makeMyUtility('global', gsm)
- gsm.registerUtility(gutil, IMyUtility, 'myutil')
- sm1 = Components('sm1', bases=(gsm, ))
- sm1_1 = Components('sm1_1', bases=(sm1, ))
- util1 = _makeMyUtility('one', sm1)
- sm1.registerUtility(util1, IMyUtility, 'myutil')
- util1_1 = _makeMyUtility('one-one', sm1_1)
- sm1_1.registerUtility(util1_1, IMyUtility, 'myutil')
- myregistry = Components()
- custom_util = _makeMyUtility('my_custom_util', myregistry)
- myregistry.registerUtility(custom_util, IMyUtility, 'my_custom_util')
- sm1.__bases__ = (myregistry,) + sm1.__bases__
- # Both the ``myregistry`` and global utilities should be available:
- self.assertTrue(self._callFUT(sm1, IMyUtility, 'my_custom_util')
- is custom_util)
- self.assertTrue(self._callFUT(sm1, IMyUtility, 'myutil') is gutil)
-
-
class Test_getAdapterInContext(unittest.TestCase):
from zope.component.testing import setUp, tearDown
@@ -882,6 +615,273 @@
self.assertTrue(('bar', 'BazAdapter') in names)
+class Test_getUtility(unittest.TestCase):
+
+ from zope.component.testing import setUp, tearDown
+
+ def _callFUT(self, *args, **kw):
+ from zope.component._api import getUtility
+ return getUtility(*args, **kw)
+
+ def test_anonymous_nonesuch(self):
+ from zope.interface import Interface
+ from zope.component.interfaces import ComponentLookupError
+ class IFoo(Interface):
+ pass
+ self.assertRaises(ComponentLookupError, self._callFUT, IFoo)
+
+ def test_named_nonesuch(self):
+ from zope.interface import Interface
+ from zope.component.interfaces import ComponentLookupError
+ class IFoo(Interface):
+ pass
+ self.assertRaises(ComponentLookupError,
+ self._callFUT, IFoo, name='bar')
+
+ def test_anonymous_hit(self):
+ from zope.interface import Interface
+ from zope.component import getGlobalSiteManager
+ class IFoo(Interface):
+ pass
+ obj = object()
+ getGlobalSiteManager().registerUtility(obj, IFoo)
+ self.assertTrue(self._callFUT(IFoo) is obj)
+
+ def test_named_hit(self):
+ from zope.interface import Interface
+ from zope.component import getGlobalSiteManager
+ class IFoo(Interface):
+ pass
+ obj = object()
+ getGlobalSiteManager().registerUtility(obj, IFoo, name='bar')
+ self.assertTrue(self._callFUT(IFoo, name='bar') is obj)
+
+ def test_w_conforming_context(self):
+ from zope.interface import Interface
+ from zope.component import getGlobalSiteManager
+ from zope.component.tests.examples import ConformsToIComponentLookup
+ class SM(object):
+ def __init__(self, obj):
+ self._obj = obj
+ def queryUtility(self, interface, name, default):
+ return self._obj
+ class IFoo(Interface):
+ pass
+ obj1 = object()
+ obj2 = object()
+ sm = SM(obj2)
+ context = ConformsToIComponentLookup(sm)
+ getGlobalSiteManager().registerUtility(obj1, IFoo)
+ self.assertTrue(self._callFUT(IFoo, context=context) is obj2)
+
+
+class Test_queryUtility(unittest.TestCase):
+
+ from zope.component.testing import setUp, tearDown
+
+ def _callFUT(self, *args, **kw):
+ from zope.component._api import queryUtility
+ return queryUtility(*args, **kw)
+
+ def test_anonymous_nonesuch(self):
+ from zope.interface import Interface
+ class IFoo(Interface):
+ pass
+ self.assertEqual(self._callFUT(IFoo), None)
+
+ def test_anonymous_nonesuch_w_default(self):
+ from zope.interface import Interface
+ class IFoo(Interface):
+ pass
+ obj = object()
+ self.assertTrue(self._callFUT(IFoo, default=obj) is obj)
+
+ def test_named_nonesuch(self):
+ from zope.interface import Interface
+ class IFoo(Interface):
+ pass
+ self.assertEqual(self._callFUT(IFoo, name='bar'), None)
+
+ def test_named_nonesuch_w_default(self):
+ from zope.interface import Interface
+ class IFoo(Interface):
+ pass
+ obj = object()
+ self.assertTrue(self._callFUT(IFoo, name='bar', default=obj) is obj)
+
+ def test_anonymous_hit(self):
+ from zope.interface import Interface
+ from zope.component import getGlobalSiteManager
+ class IFoo(Interface):
+ pass
+ obj = object()
+ getGlobalSiteManager().registerUtility(obj, IFoo)
+ self.assertTrue(self._callFUT(IFoo) is obj)
+
+ def test_named_hit(self):
+ from zope.interface import Interface
+ from zope.component import getGlobalSiteManager
+ class IFoo(Interface):
+ pass
+ obj = object()
+ getGlobalSiteManager().registerUtility(obj, IFoo, name='bar')
+ self.assertTrue(self._callFUT(IFoo, name='bar') is obj)
+
+ def test_w_conforming_context(self):
+ from zope.interface import Interface
+ from zope.component import getGlobalSiteManager
+ from zope.component.tests.examples import ConformsToIComponentLookup
+ class SM(object):
+ def __init__(self, obj):
+ self._obj = obj
+ def queryUtility(self, interface, name, default):
+ return self._obj
+ class IFoo(Interface):
+ pass
+ obj1 = object()
+ obj2 = object()
+ sm = SM(obj2)
+ context = ConformsToIComponentLookup(sm)
+ getGlobalSiteManager().registerUtility(obj1, IFoo)
+ self.assertTrue(self._callFUT(IFoo, context=context) is obj2)
+
+
+class Test_getUtilitiesFor(unittest.TestCase):
+
+ from zope.component.testing import setUp, tearDown
+
+ def _callFUT(self, *args, **kw):
+ from zope.component._api import getUtilitiesFor
+ return getUtilitiesFor(*args, **kw)
+
+ def test_nonesuch(self):
+ from zope.interface import Interface
+ class IFoo(Interface):
+ pass
+ self.assertEqual(list(self._callFUT(IFoo)), [])
+
+ def test_hit(self):
+ from zope.interface import Interface
+ from zope.component import getGlobalSiteManager
+ class IFoo(Interface):
+ pass
+ obj = object()
+ obj1 = object()
+ getGlobalSiteManager().registerUtility(obj, IFoo)
+ getGlobalSiteManager().registerUtility(obj1, IFoo, name='bar')
+ tuples = list(self._callFUT(IFoo))
+ self.assertEqual(len(tuples), 2)
+ self.assertTrue(('', obj) in tuples)
+ self.assertTrue(('bar', obj1) in tuples)
+
+
+class Test_getAllUtilitiesRegisteredFor(unittest.TestCase):
+
+ from zope.component.testing import setUp, tearDown
+
+ def _callFUT(self, *args, **kw):
+ from zope.component import getAllUtilitiesRegisteredFor
+ return getAllUtilitiesRegisteredFor(*args, **kw)
+
+ def test_nonesuch(self):
+ from zope.interface import Interface
+ class IFoo(Interface):
+ pass
+ self.assertEqual(list(self._callFUT(IFoo)), [])
+
+ def test_hit(self):
+ from zope.interface import Interface
+ from zope.component import getGlobalSiteManager
+ class IFoo(Interface):
+ pass
+ class IBar(IFoo):
+ pass
+ obj = object()
+ obj1 = object()
+ obj2 = object()
+ getGlobalSiteManager().registerUtility(obj, IFoo)
+ getGlobalSiteManager().registerUtility(obj1, IFoo, name='bar')
+ getGlobalSiteManager().registerUtility(obj2, IBar)
+ uts = list(self._callFUT(IFoo))
+ self.assertEqual(len(uts), 3)
+ self.assertTrue(obj in uts)
+ self.assertTrue(obj1 in uts)
+ self.assertTrue(obj2 in uts)
+
+
+class Test_getNextUtility(unittest.TestCase):
+
+ from zope.component.testing import setUp, tearDown
+
+ def _callFUT(self, *args, **kw):
+ from zope.component import getNextUtility
+ return getNextUtility(*args, **kw)
+
+ def test_global(self):
+ from zope.component import getGlobalSiteManager
+ from zope.component.interface import ComponentLookupError
+ gsm = getGlobalSiteManager()
+ gutil = _makeMyUtility('global', gsm)
+ gsm.registerUtility(gutil, IMyUtility, 'myutil')
+ self.assertRaises(ComponentLookupError,
+ self._callFUT, gutil, IMyUtility, 'myutil')
+
+ def test_nested(self):
+ from zope.component import getGlobalSiteManager
+ from zope.component.interfaces import IComponentLookup
+ from zope.interface.registry import Components
+ gsm = getGlobalSiteManager()
+ gutil = _makeMyUtility('global', gsm)
+ gsm.registerUtility(gutil, IMyUtility, 'myutil')
+ sm1 = Components('sm1', bases=(gsm, ))
+ sm1_1 = Components('sm1_1', bases=(sm1, ))
+ util1 = _makeMyUtility('one', sm1)
+ sm1.registerUtility(util1, IMyUtility, 'myutil')
+ self.assertTrue(IComponentLookup(util1) is sm1)
+ self.assertTrue(self._callFUT(util1, IMyUtility, 'myutil') is gutil)
+ util1_1 = _makeMyUtility('one-one', sm1_1)
+ sm1_1.registerUtility(util1_1, IMyUtility, 'myutil')
+ self.assertTrue(IComponentLookup(util1_1) is sm1_1)
+ self.assertTrue(self._callFUT(util1_1, IMyUtility, 'myutil') is util1)
+
+
+class Test_queryNextUtility(unittest.TestCase):
+
+ from zope.component.testing import setUp, tearDown
+
+ def _callFUT(self, *args, **kw):
+ from zope.component import queryNextUtility
+ return queryNextUtility(*args, **kw)
+
+ def test_global(self):
+ from zope.component import getGlobalSiteManager
+ gsm = getGlobalSiteManager()
+ gutil = _makeMyUtility('global', gsm)
+ gsm.registerUtility(gutil, IMyUtility, 'myutil')
+ self.assertEqual(self._callFUT(gutil, IMyUtility, 'myutil'), None)
+
+ def test_nested(self):
+ from zope.component import getGlobalSiteManager
+ from zope.interface.registry import Components
+ gsm = getGlobalSiteManager()
+ gutil = _makeMyUtility('global', gsm)
+ gsm.registerUtility(gutil, IMyUtility, 'myutil')
+ sm1 = Components('sm1', bases=(gsm, ))
+ sm1_1 = Components('sm1_1', bases=(sm1, ))
+ util1 = _makeMyUtility('one', sm1)
+ sm1.registerUtility(util1, IMyUtility, 'myutil')
+ util1_1 = _makeMyUtility('one-one', sm1_1)
+ sm1_1.registerUtility(util1_1, IMyUtility, 'myutil')
+ myregistry = Components()
+ custom_util = _makeMyUtility('my_custom_util', myregistry)
+ myregistry.registerUtility(custom_util, IMyUtility, 'my_custom_util')
+ sm1.__bases__ = (myregistry,) + sm1.__bases__
+ # Both the ``myregistry`` and global utilities should be available:
+ self.assertTrue(self._callFUT(sm1, IMyUtility, 'my_custom_util')
+ is custom_util)
+ self.assertTrue(self._callFUT(sm1, IMyUtility, 'myutil') is gutil)
+
+
IMyUtility = None
def _makeMyUtility(name, sm):
global IMyUtility
@@ -905,12 +905,6 @@
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(Test_getSiteManager),
- unittest.makeSuite(Test_getUtility),
- unittest.makeSuite(Test_queryUtility),
- unittest.makeSuite(Test_getUtilitiesFor),
- unittest.makeSuite(Test_getAllUtilitiesRegisteredFor),
- unittest.makeSuite(Test_getNextUtility),
- unittest.makeSuite(Test_queryNextUtility),
unittest.makeSuite(Test_getAdapterInContext),
unittest.makeSuite(Test_queryAdapterInContext),
unittest.makeSuite(Test_getAdapter),
@@ -918,5 +912,11 @@
unittest.makeSuite(Test_getMultiAdapter),
unittest.makeSuite(Test_queryMultiAdapter),
unittest.makeSuite(Test_getAdapters),
+ unittest.makeSuite(Test_getUtility),
+ unittest.makeSuite(Test_queryUtility),
+ unittest.makeSuite(Test_getUtilitiesFor),
+ unittest.makeSuite(Test_getAllUtilitiesRegisteredFor),
+ unittest.makeSuite(Test_getNextUtility),
+ unittest.makeSuite(Test_queryNextUtility),
))
More information about the checkins
mailing list