[Checkins] SVN: zope.component/tseaver-test_cleanup/ Move the interface call tests into the package test module.
Tres Seaver
cvs-admin at zope.org
Fri Jun 22 17:08:43 UTC 2012
Log message for revision 127029:
Move the interface call tests into the package test module.
Changed:
_U zope.component/tseaver-test_cleanup/
U zope.component/tseaver-test_cleanup/src/zope/component/tests/test___init__.py
U zope.component/tseaver-test_cleanup/src/zope/component/tests/test__api.py
-=-
Modified: zope.component/tseaver-test_cleanup/src/zope/component/tests/test___init__.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/tests/test___init__.py 2012-06-22 17:08:36 UTC (rev 127028)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test___init__.py 2012-06-22 17:08:39 UTC (rev 127029)
@@ -29,8 +29,64 @@
verifyObject(IComponentRegistrationConvenience, zc)
+class Test_Interface_call(unittest.TestCase):
+ from zope.component.testing import setUp, tearDown
+
+ def test_miss(self):
+ from zope.interface import Interface
+ class IFoo(Interface):
+ pass
+ self.assertRaises(TypeError, IFoo, object())
+
+ def test_miss_w_default(self):
+ from zope.interface import Interface
+ class IFoo(Interface):
+ pass
+ marker = object()
+ self.assertTrue(IFoo(object(), marker) is marker)
+
+ def test_hit(self):
+ from zope.interface import Interface
+ from zope.interface import implementer
+ from zope.component import getGlobalSiteManager
+ class IFoo(Interface):
+ pass
+ class IBar(Interface):
+ pass
+ @implementer(IBar)
+ class Bar(object):
+ pass
+ @implementer(IFoo)
+ class Baz(object):
+ def __init__(self, context):
+ self.context = context
+ getGlobalSiteManager().registerAdapter(Baz, (IBar,), IFoo, '')
+ bar = Bar()
+ adapted = IFoo(bar)
+ self.assertTrue(adapted.__class__ is Baz)
+ self.assertTrue(adapted.context is bar)
+
+ def test_hit_registered_for_None(self):
+ from zope.interface import Interface
+ from zope.interface import implementer
+ from zope.component import getGlobalSiteManager
+ class IFoo(Interface):
+ pass
+ @implementer(IFoo)
+ class Baz(object):
+ def __init__(self, context):
+ self.context = context
+ getGlobalSiteManager().registerAdapter(Baz, (None,), IFoo, '')
+ ctx = object()
+ adapted = IFoo(ctx)
+ self.assertTrue(adapted.__class__ is Baz)
+ self.assertTrue(adapted.context is ctx)
+
+
+
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(Test_package),
+ unittest.makeSuite(Test_Interface_call),
))
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:36 UTC (rev 127028)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test__api.py 2012-06-22 17:08:39 UTC (rev 127029)
@@ -616,61 +616,6 @@
self.assertTrue(adapted.context is bar)
-class Test_Interface_call(unittest.TestCase):
-
- from zope.component.testing import setUp, tearDown
-
- def test_miss(self):
- from zope.interface import Interface
- class IFoo(Interface):
- pass
- self.assertRaises(TypeError, IFoo, object())
-
- def test_miss_w_default(self):
- from zope.interface import Interface
- class IFoo(Interface):
- pass
- marker = object()
- self.assertTrue(IFoo(object(), marker) is marker)
-
- def test_hit(self):
- from zope.interface import Interface
- from zope.interface import implementer
- from zope.component import getGlobalSiteManager
- class IFoo(Interface):
- pass
- class IBar(Interface):
- pass
- @implementer(IBar)
- class Bar(object):
- pass
- @implementer(IFoo)
- class Baz(object):
- def __init__(self, context):
- self.context = context
- getGlobalSiteManager().registerAdapter(Baz, (IBar,), IFoo, '')
- bar = Bar()
- adapted = IFoo(bar)
- self.assertTrue(adapted.__class__ is Baz)
- self.assertTrue(adapted.context is bar)
-
- def test_hit_registered_for_None(self):
- from zope.interface import Interface
- from zope.interface import implementer
- from zope.component import getGlobalSiteManager
- class IFoo(Interface):
- pass
- @implementer(IFoo)
- class Baz(object):
- def __init__(self, context):
- self.context = context
- getGlobalSiteManager().registerAdapter(Baz, (None,), IFoo, '')
- ctx = object()
- adapted = IFoo(ctx)
- self.assertTrue(adapted.__class__ is Baz)
- self.assertTrue(adapted.context is ctx)
-
-
class PackageAPITests(unittest.TestCase):
from zope.component.testing import setUp, tearDown
@@ -960,7 +905,6 @@
unittest.makeSuite(Test_queryAdapterInContext),
unittest.makeSuite(Test_getAdapter),
unittest.makeSuite(Test_queryAdapter),
- unittest.makeSuite(Test_Interface_call),
unittest.makeSuite(PackageAPITests),
))
More information about the checkins
mailing list