summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2014-12-27 19:41:22 -0500
committerTres Seaver <tseaver@palladion.com>2014-12-27 19:41:22 -0500
commitc3105a1758a465b30aed76608bd83ad51e755019 (patch)
tree19b0e6d93dfc1271c0fa7aa714d98d6d11a4d4e4
parent40dfd861997b712a848375851cda734b9d7b5b2b (diff)
downloadzope-interface-c3105a1758a465b30aed76608bd83ad51e755019.tar.gz
Remove deprecated unittest assertions.
Diffstat
-rw-r--r--src/zope/interface/common/tests/basemapping.py2
-rw-r--r--src/zope/interface/tests/test_adapter.py129
-rw-r--r--src/zope/interface/tests/test_advice.py48
-rw-r--r--src/zope/interface/tests/test_declarations.py202
-rw-r--r--src/zope/interface/tests/test_interface.py303
-rw-r--r--src/zope/interface/tests/test_interfaces.py21
-rw-r--r--src/zope/interface/tests/test_odd_declarations.py60
-rw-r--r--src/zope/interface/tests/test_registry.py646
8 files changed, 669 insertions, 742 deletions
diff --git a/src/zope/interface/common/tests/basemapping.py b/src/zope/interface/common/tests/basemapping.py
index 66f0ee4..b756dca 100644
--- a/src/zope/interface/common/tests/basemapping.py
+++ b/src/zope/interface/common/tests/basemapping.py
@@ -19,7 +19,7 @@ def testIReadMapping(self, inst, state, absent):
for key in state:
self.assertEqual(inst[key], state[key])
self.assertEqual(inst.get(key, None), state[key])
- self.failUnless(key in inst)
+ self.assertTrue(key in inst)
for key in absent:
self.assertEqual(inst.get(key, None), None)
diff --git a/src/zope/interface/tests/test_adapter.py b/src/zope/interface/tests/test_adapter.py
index ee2e606..9d776e4 100644
--- a/src/zope/interface/tests/test_adapter.py
+++ b/src/zope/interface/tests/test_adapter.py
@@ -15,17 +15,6 @@
"""
import unittest
-class _SilencePy3Deprecations(unittest.TestCase):
- # silence deprecation warnings under py3
-
- def failUnless(self, expr):
- # St00pid speling.
- return self.assertTrue(expr)
-
- def failIf(self, expr):
- # St00pid speling.
- return self.assertFalse(expr)
-
def _makeInterfaces():
from zope.interface import Interface
@@ -45,7 +34,7 @@ def _makeInterfaces():
return IB0, IB1, IB2, IB3, IB4, IF0, IF1, IR0, IR1
-class BaseAdapterRegistryTests(_SilencePy3Deprecations):
+class BaseAdapterRegistryTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.adapter import BaseAdapterRegistry
@@ -72,7 +61,7 @@ class BaseAdapterRegistryTests(_SilencePy3Deprecations):
CUT = self._getTargetClass()
registry = CUT()
for name in CUT._delegated:
- self.failUnless(
+ self.assertTrue(
getattr(registry, name) is getattr(registry._v_lookup, name))
def test__generation_on_first_creation(self):
@@ -159,7 +148,7 @@ class BaseAdapterRegistryTests(_SilencePy3Deprecations):
nomatch = object()
registry.register([IB1], None, '', orig)
registry.unregister([IB1], None, '', nomatch) #doesn't raise
- self.failUnless(registry.registered([IB1], None, '') is orig)
+ self.assertTrue(registry.registered([IB1], None, '') is orig)
def test_unregister_hit_clears_empty_subcomponents(self):
IB0, IB1, IB2, IB3, IB4, IF0, IF1, IR0, IR1 = _makeInterfaces()
@@ -168,11 +157,11 @@ class BaseAdapterRegistryTests(_SilencePy3Deprecations):
another = object()
registry.register([IB1, IB2], None, '', one)
registry.register([IB1, IB3], None, '', another)
- self.failUnless(IB2 in registry._adapters[2][IB1])
- self.failUnless(IB3 in registry._adapters[2][IB1])
+ self.assertTrue(IB2 in registry._adapters[2][IB1])
+ self.assertTrue(IB3 in registry._adapters[2][IB1])
registry.unregister([IB1, IB3], None, '', another)
- self.failUnless(IB2 in registry._adapters[2][IB1])
- self.failIf(IB3 in registry._adapters[2][IB1])
+ self.assertTrue(IB2 in registry._adapters[2][IB1])
+ self.assertFalse(IB3 in registry._adapters[2][IB1])
def test_unsubscribe_empty(self):
registry = self._makeOne()
@@ -241,7 +230,7 @@ class BaseAdapterRegistryTests(_SilencePy3Deprecations):
self.assertEqual(len(registry._subscribers), 2)
-class LookupBaseFallbackTests(_SilencePy3Deprecations):
+class LookupBaseFallbackTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.adapter import LookupBaseFallback
@@ -271,7 +260,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
return None
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup(('A',), 'B', 'C')
- self.failUnless(found is None)
+ self.assertTrue(found is None)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
def test_lookup_miss_w_default(self):
@@ -282,7 +271,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
return None
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup(('A',), 'B', 'C', _default)
- self.failUnless(found is _default)
+ self.assertTrue(found is _default)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
def test_lookup_not_cached(self):
@@ -294,7 +283,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
return _results.pop(0)
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup(('A',), 'B', 'C')
- self.failUnless(found is a)
+ self.assertTrue(found is a)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
self.assertEqual(_results, [b, c])
@@ -308,7 +297,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup(('A',), 'B', 'C')
found = lb.lookup(('A',), 'B', 'C')
- self.failUnless(found is a)
+ self.assertTrue(found is a)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
self.assertEqual(_results, [b, c])
@@ -321,7 +310,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
return _results.pop(0)
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup(('A', 'D'), 'B', 'C')
- self.failUnless(found is a)
+ self.assertTrue(found is a)
self.assertEqual(_called_with, [(('A', 'D'), 'B', 'C')])
self.assertEqual(_results, [b, c])
@@ -335,7 +324,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup(('A', 'D'), 'B', 'C')
found = lb.lookup(('A', 'D'), 'B', 'C')
- self.failUnless(found is a)
+ self.assertTrue(found is a)
self.assertEqual(_called_with, [(('A', 'D'), 'B', 'C')])
self.assertEqual(_results, [b, c])
@@ -350,7 +339,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
found = lb.lookup(('A',), 'B', 'C')
lb.changed(lb)
found = lb.lookup(('A',), 'B', 'C')
- self.failUnless(found is b)
+ self.assertTrue(found is b)
self.assertEqual(_called_with,
[(('A',), 'B', 'C'), (('A',), 'B', 'C')])
self.assertEqual(_results, [c])
@@ -362,7 +351,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
return None
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup1('A', 'B', 'C')
- self.failUnless(found is None)
+ self.assertTrue(found is None)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
def test_lookup1_miss_w_default(self):
@@ -373,7 +362,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
return None
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup1('A', 'B', 'C', _default)
- self.failUnless(found is _default)
+ self.assertTrue(found is _default)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
def test_lookup1_miss_w_default_negative_cache(self):
@@ -384,9 +373,9 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
return None
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup1('A', 'B', 'C', _default)
- self.failUnless(found is _default)
+ self.assertTrue(found is _default)
found = lb.lookup1('A', 'B', 'C', _default)
- self.failUnless(found is _default)
+ self.assertTrue(found is _default)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
def test_lookup1_not_cached(self):
@@ -398,7 +387,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
return _results.pop(0)
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup1('A', 'B', 'C')
- self.failUnless(found is a)
+ self.assertTrue(found is a)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
self.assertEqual(_results, [b, c])
@@ -412,7 +401,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
lb = self._makeOne(uc_lookup=_lookup)
found = lb.lookup1('A', 'B', 'C')
found = lb.lookup1('A', 'B', 'C')
- self.failUnless(found is a)
+ self.assertTrue(found is a)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
self.assertEqual(_results, [b, c])
@@ -427,7 +416,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
found = lb.lookup1('A', 'B', 'C')
lb.changed(lb)
found = lb.lookup1('A', 'B', 'C')
- self.failUnless(found is b)
+ self.assertTrue(found is b)
self.assertEqual(_called_with,
[(('A',), 'B', 'C'), (('A',), 'B', 'C')])
self.assertEqual(_results, [c])
@@ -436,13 +425,13 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
req, prv = object(), object()
lb = self._makeOne()
found = lb.adapter_hook(prv, req, '')
- self.failUnless(found is None)
+ self.assertTrue(found is None)
def test_adapter_hook_miss_w_default(self):
req, prv, _default = object(), object(), object()
lb = self._makeOne()
found = lb.adapter_hook(prv, req, '', _default)
- self.failUnless(found is _default)
+ self.assertTrue(found is _default)
def test_adapter_hook_hit_factory_returns_None(self):
_f_called_with = []
@@ -454,7 +443,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
req, prv, _default = object(), object(), object()
lb = self._makeOne(uc_lookup=_lookup)
adapted = lb.adapter_hook(prv, req, 'C', _default)
- self.failUnless(adapted is _default)
+ self.assertTrue(adapted is _default)
self.assertEqual(_f_called_with, [req])
def test_adapter_hook_hit_factory_returns_adapter(self):
@@ -468,7 +457,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
req, prv, _default = object(), object(), object()
lb = self._makeOne(uc_lookup=_lookup)
adapted = lb.adapter_hook(prv, req, 'C', _default)
- self.failUnless(adapted is _adapter)
+ self.assertTrue(adapted is _adapter)
self.assertEqual(_f_called_with, [req])
def test_queryAdapter(self):
@@ -482,7 +471,7 @@ class LookupBaseFallbackTests(_SilencePy3Deprecations):
req, prv, _default = object(), object(), object()
lb = self._makeOne(uc_lookup=_lookup)
adapted = lb.queryAdapter(req, prv, 'C', _default)
- self.failUnless(adapted is _adapter)
+ self.assertTrue(adapted is _adapter)
self.assertEqual(_f_called_with, [req])
def test_lookupAll_uncached(self):
@@ -539,7 +528,7 @@ class LookupBaseTests(LookupBaseFallbackTests):
return LookupBase
-class VerifyingBaseFallbackTests(_SilencePy3Deprecations):
+class VerifyingBaseFallbackTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.adapter import VerifyingBaseFallback
@@ -586,12 +575,12 @@ class VerifyingBaseFallbackTests(_SilencePy3Deprecations):
lb = self._makeOne(reg, uc_lookup=_lookup)
found = lb.lookup(('A',), 'B', 'C')
found = lb.lookup(('A',), 'B', 'C')
- self.failUnless(found is a)
+ self.assertTrue(found is a)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
self.assertEqual(_results, [b, c])
reg.ro[1]._generation += 1
found = lb.lookup(('A',), 'B', 'C')
- self.failUnless(found is b)
+ self.assertTrue(found is b)
self.assertEqual(_called_with,
[(('A',), 'B', 'C'), (('A',), 'B', 'C')])
self.assertEqual(_results, [c])
@@ -607,12 +596,12 @@ class VerifyingBaseFallbackTests(_SilencePy3Deprecations):
lb = self._makeOne(reg, uc_lookup=_lookup)
found = lb.lookup1('A', 'B', 'C')
found = lb.lookup1('A', 'B', 'C')
- self.failUnless(found is a)
+ self.assertTrue(found is a)
self.assertEqual(_called_with, [(('A',), 'B', 'C')])
self.assertEqual(_results, [b, c])
reg.ro[1]._generation += 1
found = lb.lookup1('A', 'B', 'C')
- self.failUnless(found is b)
+ self.assertTrue(found is b)
self.assertEqual(_called_with,
[(('A',), 'B', 'C'), (('A',), 'B', 'C')])
self.assertEqual(_results, [c])
@@ -632,12 +621,12 @@ class VerifyingBaseFallbackTests(_SilencePy3Deprecations):
reg = self._makeRegistry(3)
lb = self._makeOne(reg, uc_lookup=_lookup)
adapted = lb.adapter_hook(prv, req, 'C', _default)
- self.failUnless(adapted is a)
+ self.assertTrue(adapted is a)
adapted = lb.adapter_hook(prv, req, 'C', _default)
- self.failUnless(adapted is a)
+ self.assertTrue(adapted is a)
reg.ro[1]._generation += 1
adapted = lb.adapter_hook(prv, req, 'C', _default)
- self.failUnless(adapted is b)
+ self.assertTrue(adapted is b)
def test_queryAdapter(self):
a, b, c = [object(), object(), object()]
@@ -654,12 +643,12 @@ class VerifyingBaseFallbackTests(_SilencePy3Deprecations):
reg = self._makeRegistry(3)
lb = self._makeOne(reg, uc_lookup=_lookup)
adapted = lb.queryAdapter(req, prv, 'C', _default)
- self.failUnless(adapted is a)
+ self.assertTrue(adapted is a)
adapted = lb.queryAdapter(req, prv, 'C', _default)
- self.failUnless(adapted is a)
+ self.assertTrue(adapted is a)
reg.ro[1]._generation += 1
adapted = lb.adapter_hook(prv, req, 'C', _default)
- self.failUnless(adapted is b)
+ self.assertTrue(adapted is b)
def test_lookupAll(self):
_results_1 = [object(), object(), object()]
@@ -701,7 +690,7 @@ class VerifyingBaseTests(VerifyingBaseFallbackTests):
return VerifyingBase
-class AdapterLookupBaseTests(_SilencePy3Deprecations):
+class AdapterLookupBaseTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.adapter import AdapterLookupBase
@@ -839,7 +828,7 @@ class AdapterLookupBaseTests(_SilencePy3Deprecations):
result = alb._uncached_lookup((IFoo,), IBar)
self.assertEqual(result, None)
self.assertEqual(len(alb._required), 1)
- self.failUnless(IFoo.weakref() in alb._required)
+ self.assertTrue(IFoo.weakref() in alb._required)
def test__uncached_lookup_order_miss(self):
from zope.interface.interface import InterfaceClass
@@ -918,7 +907,7 @@ class AdapterLookupBaseTests(_SilencePy3Deprecations):
alb = self._makeOne(registry)
subr._v_lookup = alb
result = alb._uncached_lookup((IFoo,), IBar)
- self.failUnless(result is _expected)
+ self.assertTrue(result is _expected)
def test__uncached_lookup_repeated_hit(self):
from zope.interface.interface import InterfaceClass
@@ -936,8 +925,8 @@ class AdapterLookupBaseTests(_SilencePy3Deprecations):
subr._v_lookup = alb
result = alb._uncached_lookup((IFoo,), IBar)
result2 = alb._uncached_lookup((IFoo,), IBar)
- self.failUnless(result is _expected)
- self.failUnless(result2 is _expected)
+ self.assertTrue(result is _expected)
+ self.assertTrue(result2 is _expected)
def test_queryMultiAdaptor_lookup_miss(self):
from zope.interface.declarations import implementer
@@ -960,7 +949,7 @@ class AdapterLookupBaseTests(_SilencePy3Deprecations):
subr._v_lookup = alb
_default = object()
result = alb.queryMultiAdapter((foo,), IBar, default=_default)
- self.failUnless(result is _default)
+ self.assertTrue(result is _default)
def test_queryMultiAdaptor_factory_miss(self):
from zope.interface.declarations import implementer
@@ -988,7 +977,7 @@ class AdapterLookupBaseTests(_SilencePy3Deprecations):
subr._v_lookup = alb
_default = object()
result = alb.queryMultiAdapter((foo,), IBar, default=_default)
- self.failUnless(result is _default)
+ self.assertTrue(result is _default)
self.assertEqual(_called_with, [foo])
def test_queryMultiAdaptor_factory_hit(self):
@@ -1017,7 +1006,7 @@ class AdapterLookupBaseTests(_SilencePy3Deprecations):
subr._v_lookup = alb
_default = object()
result = alb.queryMultiAdapter((foo,), IBar, default=_default)
- self.failUnless(result is _expected)
+ self.assertTrue(result is _expected)
self.assertEqual(_called_with, [foo])
def test__uncached_lookupAll_empty_ro(self):
@@ -1029,7 +1018,7 @@ class AdapterLookupBaseTests(_SilencePy3Deprecations):
result = alb._uncached_lookupAll((IFoo,), IBar)
self.assertEqual(result, ())
self.assertEqual(len(alb._required), 1)
- self.failUnless(IFoo.weakref() in alb._required)
+ self.assertTrue(IFoo.weakref() in alb._required)
def test__uncached_lookupAll_order_miss(self):
from zope.interface.interface import InterfaceClass
@@ -1120,7 +1109,7 @@ class AdapterLookupBaseTests(_SilencePy3Deprecations):
result = alb._uncached_subscriptions((IFoo,), IBar)
self.assertEqual(result, [])
self.assertEqual(len(alb._required), 1)
- self.failUnless(IFoo.weakref() in alb._required)
+ self.assertTrue(IFoo.weakref() in alb._required)
def test__uncached_subscriptions_order_miss(self):
from zope.interface.interface import InterfaceClass
@@ -1271,7 +1260,7 @@ class AdapterLookupBaseTests(_SilencePy3Deprecations):
})
-class AdapterRegistryTests(_SilencePy3Deprecations):
+class AdapterRegistryTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.adapter import AdapterRegistry
@@ -1289,7 +1278,7 @@ class AdapterRegistryTests(_SilencePy3Deprecations):
sub = self._makeOne([base])
self.assertEqual(len(sub._v_subregistries), 0)
self.assertEqual(len(base._v_subregistries), 1)
- self.failUnless(sub in base._v_subregistries)
+ self.assertTrue(sub in base._v_subregistries)
# test _addSubregistry / _removeSubregistry via only caller, _setBases
@@ -1300,7 +1289,7 @@ class AdapterRegistryTests(_SilencePy3Deprecations):
sub.__bases__ = [after]
self.assertEqual(len(before._v_subregistries), 0)
self.assertEqual(len(after._v_subregistries), 1)
- self.failUnless(sub in after._v_subregistries)
+ self.assertTrue(sub in after._v_subregistries)
def test__setBases_wo_stray_entry(self):
before = self._makeOne()
@@ -1311,7 +1300,7 @@ class AdapterRegistryTests(_SilencePy3Deprecations):
sub.__bases__ = [after]
self.assertEqual(len(before._v_subregistries), 0)
self.assertEqual(len(after._v_subregistries), 1)
- self.failUnless(sub in after._v_subregistries)
+ self.assertTrue(sub in after._v_subregistries)
def test__setBases_w_existing_entry_continuing(self):
before = self._makeOne()
@@ -1320,8 +1309,8 @@ class AdapterRegistryTests(_SilencePy3Deprecations):
sub.__bases__ = [before, after]
self.assertEqual(len(before._v_subregistries), 1)
self.assertEqual(len(after._v_subregistries), 1)
- self.failUnless(sub in before._v_subregistries)
- self.failUnless(sub in after._v_subregistries)
+ self.assertTrue(sub in before._v_subregistries)
+ self.assertTrue(sub in after._v_subregistries)
def test_changed_w_subregistries(self):
base = self._makeOne()
@@ -1334,21 +1323,21 @@ class AdapterRegistryTests(_SilencePy3Deprecations):
base._addSubregistry(derived2)
orig = object()
base.changed(orig)
- self.failUnless(derived1._changed is orig)
- self.failUnless(derived2._changed is orig)
+ self.assertTrue(derived1._changed is orig)
+ self.assertTrue(derived2._changed is orig)
-class Test_utils(_SilencePy3Deprecations):
+class Test_utils(unittest.TestCase):
def test__convert_None_to_Interface_w_None(self):
from zope.interface.adapter import _convert_None_to_Interface
from zope.interface.interface import Interface
- self.failUnless(_convert_None_to_Interface(None) is Interface)
+ self.assertTrue(_convert_None_to_Interface(None) is Interface)
def test__convert_None_to_Interface_w_other(self):
from zope.interface.adapter import _convert_None_to_Interface
other = object()
- self.failUnless(_convert_None_to_Interface(other) is other)
+ self.assertTrue(_convert_None_to_Interface(other) is other)
def test__normalize_name_str(self):
import sys
diff --git a/src/zope/interface/tests/test_advice.py b/src/zope/interface/tests/test_advice.py
index e9875a7..3d82de9 100644
--- a/src/zope/interface/tests/test_advice.py
+++ b/src/zope/interface/tests/test_advice.py
@@ -32,19 +32,7 @@ from zope.interface._compat import _skip_under_py2
from zope.interface._compat import _skip_under_py3k
-class _SilencePy3Deprecations(unittest.TestCase):
- # silence deprecation warnings under py3
-
- def failUnless(self, expr):
- # St00pid speling.
- return self.assertTrue(expr)
-
- def failIf(self, expr):
- # St00pid speling.
- return self.assertFalse(expr)
-
-
-class FrameInfoTest(_SilencePy3Deprecations):
+class FrameInfoTest(unittest.TestCase):
def test_w_module(self):
from zope.interface.tests import advisory_testing
@@ -52,7 +40,7 @@ class FrameInfoTest(_SilencePy3Deprecations):
f_locals, f_globals) = advisory_testing.moduleLevelFrameInfo
self.assertEqual(kind, "module")
for d in module.__dict__, f_locals, f_globals:
- self.failUnless(d is advisory_testing.my_globals)
+ self.assertTrue(d is advisory_testing.my_globals)
@_skip_under_py3k
def test_w_ClassicClass(self):
@@ -65,10 +53,10 @@ class FrameInfoTest(_SilencePy3Deprecations):
f_globals) = advisory_testing.ClassicClass.classLevelFrameInfo
self.assertEqual(kind, "class")
- self.failUnless(
+ self.assertTrue(
f_locals is advisory_testing.ClassicClass.__dict__) # ???
for d in module.__dict__, f_globals:
- self.failUnless(d is advisory_testing.my_globals)
+ self.assertTrue(d is advisory_testing.my_globals)
def test_w_NewStyleClass(self):
from zope.interface.tests import advisory_testing
@@ -79,15 +67,15 @@ class FrameInfoTest(_SilencePy3Deprecations):
self.assertEqual(kind, "class")
for d in module.__dict__, f_globals:
- self.failUnless(d is advisory_testing.my_globals)
+ self.assertTrue(d is advisory_testing.my_globals)
def test_inside_function_call(self):
from zope.interface.advice import getFrameInfo
kind, module, f_locals, f_globals = getFrameInfo(sys._getframe())
self.assertEqual(kind, "function call")
- self.failUnless(f_locals is locals()) # ???
+ self.assertTrue(f_locals is locals()) # ???
for d in module.__dict__, f_globals:
- self.failUnless(d is globals())
+ self.assertTrue(d is globals())
def test_inside_exec(self):
from zope.interface.advice import getFrameInfo
@@ -95,9 +83,9 @@ class FrameInfoTest(_SilencePy3Deprecations):
_locals = {}
exec(_FUNKY_EXEC, _globals, _locals)
self.assertEqual(_locals['kind'], "exec")
- self.failUnless(_locals['f_locals'] is _locals)
- self.failUnless(_locals['module'] is None)
- self.failUnless(_locals['f_globals'] is _globals)
+ self.assertTrue(_locals['f_locals'] is _locals)
+ self.assertTrue(_locals['module'] is None)
+ self.assertTrue(_locals['f_globals'] is _globals)
_FUNKY_EXEC = """\
@@ -105,7 +93,7 @@ import sys
kind, module, f_locals, f_globals = getFrameInfo(sys._getframe())
"""
-class AdviceTests(_SilencePy3Deprecations):
+class AdviceTests(unittest.TestCase):
@_skip_under_py3k
def test_order(self):
@@ -118,7 +106,7 @@ class AdviceTests(_SilencePy3Deprecations):
# Strip the list nesting
for i in 1, 2, 3:
- self.failUnless(isinstance(Foo, list))
+ self.assertTrue(isinstance(Foo, list))
Foo, = Foo
self.assertEqual(log, [(1, Foo), (2, [Foo]), (3, [[Foo]])])
@@ -147,7 +135,7 @@ class AdviceTests(_SilencePy3Deprecations):
ping([],1)
Concrete, = Concrete
- self.failUnless(Concrete.__class__ is Metaclass)
+ self.assertTrue(Concrete.__class__ is Metaclass)
@_skip_under_py3k
@@ -182,9 +170,9 @@ class AdviceTests(_SilencePy3Deprecations):
__metaclass__ = Metaclass3
ping([], 1)
- self.failUnless(isinstance(Derived, list))
+ self.assertTrue(isinstance(Derived, list))
Derived, = Derived
- self.failUnless(isinstance(Derived, Metaclass3))
+ self.assertTrue(isinstance(Derived, Metaclass3))
@_skip_under_py3k
def test_meta_no_bases(self):
@@ -199,7 +187,7 @@ class AdviceTests(_SilencePy3Deprecations):
self.assertEqual(type(klass), ClassType)
-class Test_isClassAdvisor(_SilencePy3Deprecations):
+class Test_isClassAdvisor(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.advice import isClassAdvisor
@@ -220,7 +208,7 @@ class Test_isClassAdvisor(_SilencePy3Deprecations):
self.assertEqual(self._callFUT(bar), True)
-class Test_determineMetaclass(_SilencePy3Deprecations):
+class Test_determineMetaclass(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.advice import determineMetaclass
@@ -334,7 +322,7 @@ class Test_determineMetaclass(_SilencePy3Deprecations):
self.assertRaises(TypeError, self._callFUT, (A, B))
-class Test_minimalBases(_SilencePy3Deprecations):
+class Test_minimalBases(unittest.TestCase):
def _callFUT(self, klasses):
from zope.interface.advice import minimalBases
diff --git a/src/zope/interface/tests/test_declarations.py b/src/zope/interface/tests/test_declarations.py
index 3d11007..1b9533c 100644
--- a/src/zope/interface/tests/test_declarations.py
+++ b/src/zope/interface/tests/test_declarations.py
@@ -18,18 +18,6 @@ import unittest
from zope.interface._compat import _skip_under_py3k, _u
-class _SilencePy3Deprecations(unittest.TestCase):
- # silence deprecation warnings under py3
-
- def failUnless(self, expr):
- # St00pid speling.
- return self.assertTrue(expr)
-
- def failIf(self, expr):
- # St00pid speling.
- return self.assertFalse(expr)
-
-
class _Py3ClassAdvice(object):
def _run_generated_code(self, code, globs, locs,
@@ -84,7 +72,7 @@ class NamedTests(unittest.TestCase):
self.assertEqual(foo.__component_name__, _u('foo'))
-class DeclarationTests(_SilencePy3Deprecations):
+class DeclarationTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.declarations import Declaration
@@ -112,31 +100,31 @@ class DeclarationTests(_SilencePy3Deprecations):
def test_changed_wo_existing__v_attrs(self):
decl = self._makeOne()
decl.changed(decl) # doesn't raise
- self.failIf('_v_attrs' in decl.__dict__)
+ self.assertFalse('_v_attrs' in decl.__dict__)
def test_changed_w_existing__v_attrs(self):
decl = self._makeOne()
decl._v_attrs = object()
decl.changed(decl)
- self.failIf('_v_attrs' in decl.__dict__)
+ self.assertFalse('_v_attrs' in decl.__dict__)
def test___contains__w_self(self):
from zope.interface.interface import InterfaceClass
IFoo = InterfaceClass('IFoo')
decl = self._makeOne()
- self.failIf(decl in decl)
+ self.assertFalse(decl in decl)
def test___contains__w_unrelated_iface(self):
from zope.interface.interface import InterfaceClass
IFoo = InterfaceClass('IFoo')
decl = self._makeOne()
- self.failIf(IFoo in decl)
+ self.assertFalse(IFoo in decl)
def test___contains__w_base_interface(self):
from zope.interface.interface import InterfaceClass
IFoo = InterfaceClass('IFoo')
decl = self._makeOne(IFoo)
- self.failUnless(IFoo in decl)
+ self.assertTrue(IFoo in decl)
def test___iter___empty(self):
decl = self._makeOne()
@@ -212,7 +200,7 @@ class DeclarationTests(_SilencePy3Deprecations):
IBar = InterfaceClass('IBar')
before = self._makeOne(IFoo)
after = before - IBar
- self.failUnless(isinstance(after, self._getTargetClass()))
+ self.assertTrue(isinstance(after, self._getTargetClass()))
self.assertEqual(list(after), [IFoo])
def test___sub___related_interface(self):
@@ -236,7 +224,7 @@ class DeclarationTests(_SilencePy3Deprecations):
IBar = InterfaceClass('IBar')
before = self._makeOne(IFoo)
after = before + IBar
- self.failUnless(isinstance(after, self._getTargetClass()))
+ self.assertTrue(isinstance(after, self._getTargetClass()))
self.assertEqual(list(after), [IFoo, IBar])
def test___add___related_interface(self):
@@ -250,7 +238,7 @@ class DeclarationTests(_SilencePy3Deprecations):
self.assertEqual(list(after), [IFoo, IBar, IBaz])
-class ImplementsTests(_SilencePy3Deprecations):
+class ImplementsTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.declarations import Implements
@@ -277,7 +265,7 @@ class ImplementsTests(_SilencePy3Deprecations):
self.assertEqual(impl.__reduce__(), (implementedBy, (None,)))
-class Test_implementedByFallback(_SilencePy3Deprecations):
+class Test_implementedByFallback(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import implementedByFallback
@@ -309,7 +297,7 @@ class Test_implementedByFallback(_SilencePy3Deprecations):
with _MonkeyDict(declarations,
'BuiltinImplementationSpecifications') as specs:
specs[foo] = reg
- self.failUnless(self._callFUT(foo) is reg)
+ self.assertTrue(self._callFUT(foo) is reg)
def test_dictless_w_existing_Implements(self):
from zope.interface.declarations import Implements
@@ -318,7 +306,7 @@ class Test_implementedByFallback(_SilencePy3Deprecations):
__slots__ = ('__implemented__',)
foo = Foo()
foo.__implemented__ = impl
- self.failUnless(self._callFUT(foo) is impl)
+ self.assertTrue(self._callFUT(foo) is impl)
def test_dictless_w_existing_not_Implements(self):
from zope.interface.interface import InterfaceClass
@@ -334,7 +322,7 @@ class Test_implementedByFallback(_SilencePy3Deprecations):
impl = Implements()
class Foo(object):
__implemented__ = impl
- self.failUnless(self._callFUT(Foo) is impl)
+ self.assertTrue(self._callFUT(Foo) is impl)
def test_builtins_added_to_cache(self):
from zope.interface import declarations
@@ -347,7 +335,7 @@ class Test_implementedByFallback(_SilencePy3Deprecations):
self.assertEqual(list(self._callFUT(dict)), [])
for typ in (tuple, list, dict):
spec = specs[typ]
- self.failUnless(isinstance(spec, Implements))
+ self.assertTrue(isinstance(spec, Implements))
self.assertEqual(repr(spec),
'<implementedBy %s.%s>'
% (_BUILTINS, typ.__name__))
@@ -360,9 +348,9 @@ class Test_implementedByFallback(_SilencePy3Deprecations):
specs[tuple] = t_spec
specs[list] = l_spec
specs[dict] = d_spec
- self.failUnless(self._callFUT(tuple) is t_spec)
- self.failUnless(self._callFUT(list) is l_spec)
- self.failUnless(self._callFUT(dict) is d_spec)
+ self.assertTrue(self._callFUT(tuple) is t_spec)
+ self.assertTrue(self._callFUT(list) is l_spec)
+ self.assertTrue(self._callFUT(dict) is d_spec)
def test_oldstyle_class_no_assertions(self):
# TODO: Figure out P3 story
@@ -393,10 +381,10 @@ class Test_implementedByFallback(_SilencePy3Deprecations):
spec = self._callFUT(foo)
self.assertEqual(spec.__name__,
'zope.interface.tests.test_declarations.foo')
- self.failUnless(spec.inherit is foo)
- self.failUnless(foo.__implemented__ is spec)
- self.failUnless(foo.__providedBy__ is objectSpecificationDescriptor)
- self.failIf('__provides__' in foo.__dict__)
+ self.assertTrue(spec.inherit is foo)
+ self.assertTrue(foo.__implemented__ is spec)
+ self.assertTrue(foo.__providedBy__ is objectSpecificationDescriptor)
+ self.assertFalse('__provides__' in foo.__dict__)
def test_w_None_no_bases_w_class(self):
from zope.interface.declarations import ClassProvides
@@ -405,10 +393,10 @@ class Test_implementedByFallback(_SilencePy3Deprecations):
spec = self._callFUT(Foo)
self.assertEqual(spec.__name__,
'zope.interface.tests.test_declarations.Foo')
- self.failUnless(spec.inherit is Foo)
- self.failUnless(Foo.__implemented__ is spec)
- self.failUnless(isinstance(Foo.__providedBy__, ClassProvides))
- self.failUnless(isinstance(Foo.__provides__, ClassProvides))
+ self.assertTrue(spec.inherit is Foo)
+ self.assertTrue(Foo.__implemented__ is spec)
+ self.assertTrue(isinstance(Foo.__providedBy__, ClassProvides))
+ self.assertTrue(isinstance(Foo.__provides__, ClassProvides))
self.assertEqual(Foo.__provides__, Foo.__providedBy__)
def test_w_existing_Implements(self):
@@ -416,7 +404,7 @@ class Test_implementedByFallback(_SilencePy3Deprecations):
impl = Implements()
class Foo(object):
__implemented__ = impl
- self.failUnless(self._callFUT(Foo) is impl)
+ self.assertTrue(self._callFUT(Foo) is impl)
class Test_implementedBy(Test_implementedByFallback):
@@ -427,7 +415,7 @@ class Test_implementedBy(Test_implementedByFallback):
return implementedBy(*args, **kw)
-class Test_classImplementsOnly(_SilencePy3Deprecations):
+class Test_classImplementsOnly(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import classImplementsOnly
@@ -443,10 +431,10 @@ class Test_classImplementsOnly(_SilencePy3Deprecations):
spec = Foo.__implemented__
self.assertEqual(spec.__name__,
'zope.interface.tests.test_declarations.Foo')
- self.failUnless(spec.inherit is None)
- self.failUnless(Foo.__implemented__ is spec)
- self.failUnless(isinstance(Foo.__providedBy__, ClassProvides))
- self.failUnless(isinstance(Foo.__provides__, ClassProvides))
+ self.assertTrue(spec.inherit is None)
+ self.assertTrue(Foo.__implemented__ is spec)
+ self.assertTrue(isinstance(Foo.__providedBy__, ClassProvides))
+ self.assertTrue(isinstance(Foo.__provides__, ClassProvides))
self.assertEqual(Foo.__provides__, Foo.__providedBy__)
def test_w_existing_Implements(self):
@@ -461,12 +449,12 @@ class Test_classImplementsOnly(_SilencePy3Deprecations):
impl.inherit = Foo
self._callFUT(Foo, IBar)
# Same spec, now different values
- self.failUnless(Foo.__implemented__ is impl)
+ self.assertTrue(Foo.__implemented__ is impl)
self.assertEqual(impl.inherit, None)
self.assertEqual(impl.declared, (IBar,))
-class Test_classImplements(_SilencePy3Deprecations):
+class Test_classImplements(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import classImplements
@@ -482,10 +470,10 @@ class Test_classImplements(_SilencePy3Deprecations):
spec = Foo.__implemented__
self.assertEqual(spec.__name__,
'zope.interface.tests.test_declarations.Foo')
- self.failUnless(spec.inherit is Foo)
- self.failUnless(Foo.__implemented__ is spec)
- self.failUnless(isinstance(Foo.__providedBy__, ClassProvides))
- self.failUnless(isinstance(Foo.__provides__, ClassProvides))
+ self.assertTrue(spec.inherit is Foo)
+ self.assertTrue(Foo.__implemented__ is spec)
+ self.assertTrue(isinstance(Foo.__providedBy__, ClassProvides))
+ self.assertTrue(isinstance(Foo.__provides__, ClassProvides))
self.assertEqual(Foo.__provides__, Foo.__providedBy__)
def test_w_existing_Implements(self):
@@ -500,7 +488,7 @@ class Test_classImplements(_SilencePy3Deprecations):
impl.inherit = Foo
self._callFUT(Foo, IBar)
# Same spec, now different values
- self.failUnless(Foo.__implemented__ is impl)
+ self.assertTrue(Foo.__implemented__ is impl)
self.assertEqual(impl.inherit, Foo)
self.assertEqual(impl.declared, (IFoo, IBar,))
@@ -522,13 +510,13 @@ class Test_classImplements(_SilencePy3Deprecations):
impl.inherit = Foo
self._callFUT(Foo, IBar)
# Same spec, now different values
- self.failUnless(Foo.__implemented__ is impl)
+ self.assertTrue(Foo.__implemented__ is impl)
self.assertEqual(impl.inherit, Foo)
self.assertEqual(impl.declared, (IFoo, IBar,))
self.assertEqual(impl.__bases__, (IFoo, IBar, b_impl))
-class Test__implements_advice(_SilencePy3Deprecations):
+class Test__implements_advice(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import _implements_advice
@@ -542,12 +530,12 @@ class Test__implements_advice(_SilencePy3Deprecations):
class Foo(object):
__implements_advice_data__ = ((IFoo,), classImplements)
self._callFUT(Foo)
- self.failIf('__implements_advice_data__' in Foo.__dict__)
- self.failUnless(isinstance(Foo.__implemented__, Implements))
+ self.assertFalse('__implements_advice_data__' in Foo.__dict__)
+ self.assertTrue(isinstance(Foo.__implemented__, Implements))
self.assertEqual(list(Foo.__implemented__), [IFoo])
-class Test_implementer(_SilencePy3Deprecations):
+class Test_implementer(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.declarations import implementer
@@ -565,14 +553,14 @@ class Test_implementer(_SilencePy3Deprecations):
pass
decorator = self._makeOne(IFoo)
returned = decorator(Foo)
- self.failUnless(returned is Foo)
+ self.assertTrue(returned is Foo)
spec = Foo.__implemented__
self.assertEqual(spec.__name__,
'zope.interface.tests.test_declarations.Foo')
- self.failUnless(spec.inherit is Foo)
- self.failUnless(Foo.__implemented__ is spec)
- self.failUnless(isinstance(Foo.__providedBy__, ClassProvides))
- self.failUnless(isinstance(Foo.__provides__, ClassProvides))
+ self.assertTrue(spec.inherit is Foo)
+ self.assertTrue(Foo.__implemented__ is spec)
+ self.assertTrue(isinstance(Foo.__providedBy__, ClassProvides))
+ self.assertTrue(isinstance(Foo.__provides__, ClassProvides))
self.assertEqual(Foo.__provides__, Foo.__providedBy__)
def test_newstyle_class(self):
@@ -583,14 +571,14 @@ class Test_implementer(_SilencePy3Deprecations):
pass
decorator = self._makeOne(IFoo)
returned = decorator(Foo)
- self.failUnless(returned is Foo)
+ self.assertTrue(returned is Foo)
spec = Foo.__implemented__
self.assertEqual(spec.__name__,
'zope.interface.tests.test_declarations.Foo')
- self.failUnless(spec.inherit is Foo)
- self.failUnless(Foo.__implemented__ is spec)
- self.failUnless(isinstance(Foo.__providedBy__, ClassProvides))
- self.failUnless(isinstance(Foo.__provides__, ClassProvides))
+ self.assertTrue(spec.inherit is Foo)
+ self.assertTrue(Foo.__implemented__ is spec)
+ self.assertTrue(isinstance(Foo.__providedBy__, ClassProvides))
+ self.assertTrue(isinstance(Foo.__provides__, ClassProvides))
self.assertEqual(Foo.__provides__, Foo.__providedBy__)
def test_nonclass_cannot_assign_attr(self):
@@ -607,14 +595,14 @@ class Test_implementer(_SilencePy3Deprecations):
foo = Foo()
decorator = self._makeOne(IFoo)
returned = decorator(foo)
- self.failUnless(returned is foo)
+ self.assertTrue(returned is foo)
spec = foo.__implemented__
self.assertEqual(spec.__name__, '?')
- self.failUnless(spec.inherit is None)
- self.failUnless(foo.__implemented__ is spec)
+ self.assertTrue(spec.inherit is None)
+ self.assertTrue(foo.__implemented__ is spec)
-class Test_implementer_only(_SilencePy3Deprecations):
+class Test_implementer_only(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.declarations import implementer_only
@@ -649,11 +637,11 @@ class Test_implementer_only(_SilencePy3Deprecations):
__implemented__ = old_spec
decorator = self._makeOne(IFoo)
returned = decorator(Foo)
- self.failUnless(returned is Foo)
+ self.assertTrue(returned is Foo)
spec = Foo.__implemented__
self.assertEqual(spec.__name__, '?')
- self.failUnless(spec.inherit is None)
- self.failUnless(Foo.__implemented__ is spec)
+ self.assertTrue(spec.inherit is None)
+ self.assertTrue(Foo.__implemented__ is spec)
def test_newstyle_class(self):
from zope.interface.declarations import Implements
@@ -665,16 +653,16 @@ class Test_implementer_only(_SilencePy3Deprecations):
__implemented__ = old_spec
decorator = self._makeOne(IFoo)
returned = decorator(Foo)
- self.failUnless(returned is Foo)
+ self.assertTrue(returned is Foo)
spec = Foo.__implemented__
self.assertEqual(spec.__name__, '?')
- self.failUnless(spec.inherit is None)
- self.failUnless(Foo.__implemented__ is spec)
+ self.assertTrue(spec.inherit is None)
+ self.assertTrue(Foo.__implemented__ is spec)
# Test '_implements' by way of 'implements{,Only}', its only callers.
-class Test_implementsOnly(_SilencePy3Deprecations, _Py3ClassAdvice):
+class Test_implementsOnly(unittest.TestCase, _Py3ClassAdvice):
def _getFUT(self):
from zope.interface.declarations import implementsOnly
@@ -733,7 +721,7 @@ class Test_implementsOnly(_SilencePy3Deprecations, _Py3ClassAdvice):
self.assertEqual(list(spec), [IBar])
-class Test_implements(_SilencePy3Deprecations, _Py3ClassAdvice):
+class Test_implements(unittest.TestCase, _Py3ClassAdvice):
def _getFUT(self):
from zope.interface.declarations import implements
@@ -797,7 +785,7 @@ class Test_implements(_SilencePy3Deprecations, _Py3ClassAdvice):
self.assertEqual(list(spec), [IFoo])
-class ProvidesClassTests(_SilencePy3Deprecations):
+class ProvidesClassTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.declarations import ProvidesClass
@@ -822,7 +810,7 @@ class ProvidesClassTests(_SilencePy3Deprecations):
pass
spec = self._makeOne(Foo, IFoo)
klass, args = spec.__reduce__()
- self.failUnless(klass is Provides)
+ self.assertTrue(klass is Provides)
self.assertEqual(args, (Foo, IFoo))
def test___get___class(self):
@@ -832,7 +820,7 @@ class ProvidesClassTests(_SilencePy3Deprecations):
pass
spec = self._makeOne(Foo, IFoo)
Foo.__provides__ = spec
- self.failUnless(Foo.__provides__ is spec)
+ self.assertTrue(Foo.__provides__ is spec)
def test___get___instance(self):
from zope.interface.interface import InterfaceClass
@@ -847,7 +835,7 @@ class ProvidesClassTests(_SilencePy3Deprecations):
self.assertRaises(AttributeError, _test)
-class Test_Provides(_SilencePy3Deprecations):
+class Test_Provides(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import Provides
@@ -863,7 +851,7 @@ class Test_Provides(_SilencePy3Deprecations):
with _Monkey(declarations, InstanceDeclarations=cache):
spec = self._callFUT(Foo, IFoo)
self.assertEqual(list(spec), [IFoo])
- self.failUnless(cache[(Foo, IFoo)] is spec)
+ self.assertTrue(cache[(Foo, IFoo)] is spec)
def test_w_cached_spec(self):
from zope.interface import declarations
@@ -875,10 +863,10 @@ class Test_Provides(_SilencePy3Deprecations):
cache = {(Foo, IFoo): prior}
with _Monkey(declarations, InstanceDeclarations=cache):
spec = self._callFUT(Foo, IFoo)
- self.failUnless(spec is prior)
+ self.assertTrue(spec is prior)
-class Test_directlyProvides(_SilencePy3Deprecations):
+class Test_directlyProvides(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import directlyProvides
@@ -892,7 +880,7 @@ class Test_directlyProvides(_SilencePy3Deprecations):
pass
obj = Foo()
self._callFUT(obj, IFoo)
- self.failUnless(isinstance(obj.__provides__, ProvidesClass))
+ self.assertTrue(isinstance(obj.__provides__, ProvidesClass))
self.assertEqual(list(obj.__provides__), [IFoo])
def test_w_class(self):
@@ -902,7 +890,7 @@ class Test_directlyProvides(_SilencePy3Deprecations):
class Foo(object):
pass
self._callFUT(Foo, IFoo)
- self.failUnless(isinstance(Foo.__provides__, ClassProvides))
+ self.assertTrue(isinstance(Foo.__provides__, ClassProvides))
self.assertEqual(list(Foo.__provides__), [IFoo])
@_skip_under_py3k
@@ -939,11 +927,11 @@ class Test_directlyProvides(_SilencePy3Deprecations):
the_dict[name] = value
obj = Foo()
self._callFUT(obj, IFoo)
- self.failUnless(isinstance(the_dict['__provides__'], ProvidesClass))
+ self.assertTrue(isinstance(the_dict['__provides__'], ProvidesClass))
self.assertEqual(list(the_dict['__provides__']), [IFoo])
-class Test_alsoProvides(_SilencePy3Deprecations):
+class Test_alsoProvides(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import alsoProvides
@@ -957,7 +945,7 @@ class Test_alsoProvides(_SilencePy3Deprecations):
pass
obj = Foo()
self._callFUT(obj, IFoo)
- self.failUnless(isinstance(obj.__provides__, ProvidesClass))
+ self.assertTrue(isinstance(obj.__provides__, ProvidesClass))
self.assertEqual(list(obj.__provides__), [IFoo])
def test_w_existing_provides(self):
@@ -971,11 +959,11 @@ class Test_alsoProvides(_SilencePy3Deprecations):
obj = Foo()
directlyProvides(obj, IFoo)
self._callFUT(obj, IBar)
- self.failUnless(isinstance(obj.__provides__, ProvidesClass))
+ self.assertTrue(isinstance(obj.__provides__, ProvidesClass))
self.assertEqual(list(obj.__provides__), [IFoo, IBar])
-class Test_noLongerProvides(_SilencePy3Deprecations):
+class Test_noLongerProvides(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import noLongerProvides
@@ -1024,7 +1012,7 @@ class Test_noLongerProvides(_SilencePy3Deprecations):
self.assertRaises(ValueError, self._callFUT, obj, IFoo)
-class ClassProvidesBaseFallbackTests(_SilencePy3Deprecations):
+class ClassProvidesBaseFallbackTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.declarations import ClassProvidesBaseFallback
@@ -1045,7 +1033,7 @@ class ClassProvidesBaseFallbackTests(_SilencePy3Deprecations):
class Foo(object):
pass
cpbp = Foo.__provides__ = self._makeOne(Foo, IFoo)
- self.failUnless(Foo.__provides__ is cpbp)
+ self.assertTrue(Foo.__provides__ is cpbp)
def test_w_same_class_via_instance(self):
from zope.interface.interface import InterfaceClass
@@ -1054,7 +1042,7 @@ class ClassProvidesBaseFallbackTests(_SilencePy3Deprecations):
pass
foo = Foo()
cpbp = Foo.__provides__ = self._makeOne(Foo, IFoo)
- self.failUnless(foo.__provides__ is IFoo)
+ self.assertTrue(foo.__provides__ is IFoo)
def test_w_different_class(self):
from zope.interface.interface import InterfaceClass
@@ -1077,7 +1065,7 @@ class ClassProvidesBaseTests(ClassProvidesBaseFallbackTests):
return ClassProvidesBase
-class ClassProvidesTests(_SilencePy3Deprecations):
+class ClassProvidesTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.declarations import ClassProvides
@@ -1095,7 +1083,7 @@ class ClassProvidesTests(_SilencePy3Deprecations):
class Foo(object):
pass
cp = Foo.__provides__ = self._makeOne(Foo, type(Foo), IBar)
- self.failUnless(Foo.__provides__ is cp)
+ self.assertTrue(Foo.__provides__ is cp)
self.assertEqual(list(Foo().__provides__), [IFoo])
def test___reduce__(self):
@@ -1111,7 +1099,7 @@ class ClassProvidesTests(_SilencePy3Deprecations):
(self._getTargetClass(), (Foo, type(Foo), IBar)))
-class Test_directlyProvidedBy(_SilencePy3Deprecations):
+class Test_directlyProvidedBy(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import directlyProvidedBy
@@ -1157,7 +1145,7 @@ class Test_directlyProvidedBy(_SilencePy3Deprecations):
self.assertEqual(list(self._callFUT(foo)), [IBar])
-class Test_classProvides(_SilencePy3Deprecations, _Py3ClassAdvice):
+class Test_classProvides(unittest.TestCase, _Py3ClassAdvice):
def _getFUT(self):
from zope.interface.declarations import classProvides
@@ -1225,7 +1213,7 @@ class Test_classProvides(_SilencePy3Deprecations, _Py3ClassAdvice):
# Test _classProvides_advice through classProvides, its only caller.
-class Test_provider(_SilencePy3Deprecations):
+class Test_provider(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.declarations import provider
@@ -1241,11 +1229,11 @@ class Test_provider(_SilencePy3Deprecations):
@self._makeOne(IFoo)
class Foo(object):
pass
- self.failUnless(isinstance(Foo.__provides__, ClassProvides))
+ self.assertTrue(isinstance(Foo.__provides__, ClassProvides))
self.assertEqual(list(Foo.__provides__), [IFoo])
-class Test_moduleProvides(_SilencePy3Deprecations):
+class Test_moduleProvides(unittest.TestCase):
def _getFUT(self):
from zope.interface.declarations import moduleProvides
@@ -1316,7 +1304,7 @@ class Test_moduleProvides(_SilencePy3Deprecations):
assert False, 'TypeError not raised'
-class Test_getObjectSpecificationFallback(_SilencePy3Deprecations):
+class Test_getObjectSpecificationFallback(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import getObjectSpecificationFallback
@@ -1347,7 +1335,7 @@ class Test_getObjectSpecificationFallback(_SilencePy3Deprecations):
pass
directlyProvides(foo, IFoo)
spec = self._callFUT(foo)
- self.failUnless(spec is foo.__provides__)
+ self.assertTrue(spec is foo.__provides__)
def test_existing_provides_is_not_spec(self):
def foo():
@@ -1394,7 +1382,7 @@ class Test_getObjectSpecification(Test_getObjectSpecificationFallback):
return getObjectSpecification(*args, **kw)
-class Test_providedByFallback(_SilencePy3Deprecations):
+class Test_providedByFallback(unittest.TestCase):
def _callFUT(self, *args, **kw):
from zope.interface.declarations import providedByFallback
@@ -1445,7 +1433,7 @@ class Test_providedByFallback(_SilencePy3Deprecations):
foo.__providedBy__ = object()
expected = foo.__provides__ = object()
spec = self._callFUT(foo)
- self.failUnless(spec is expected)
+ self.assertTrue(spec is expected)
def test_w_providedBy_invalid_spec_w_provides_diff_provides_on_class(self):
class Foo(object):
@@ -1455,7 +1443,7 @@ class Test_providedByFallback(_SilencePy3Deprecations):
expected = foo.__provides__ = object()
Foo.__provides__ = object()
spec = self._callFUT(foo)
- self.failUnless(spec is expected)
+ self.assertTrue(spec is expected)
def test_w_providedBy_invalid_spec_w_provides_same_provides_on_class(self):
from zope.interface.declarations import implementer
@@ -1479,7 +1467,7 @@ class Test_providedBy(Test_providedByFallback):
return providedBy(*args, **kw)
-class ObjectSpecificationDescriptorFallbackTests(_SilencePy3Deprecations):
+class ObjectSpecificationDescriptorFallbackTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.declarations \
diff --git a/src/zope/interface/tests/test_interface.py b/src/zope/interface/tests/test_interface.py
index 5b243d1..9e1e3dc 100644
--- a/src/zope/interface/tests/test_interface.py
+++ b/src/zope/interface/tests/test_interface.py
@@ -17,17 +17,6 @@ import unittest
_marker = object()
-class _SilencePy3Deprecations(unittest.TestCase):
- # silence deprecation warnings under py3
-
- def failUnless(self, expr):
- # St00pid speling.
- return self.assertTrue(expr)
-
- def failIf(self, expr):
- # St00pid speling.
- return self.assertFalse(expr)
-
class Test_invariant(unittest.TestCase):
@@ -146,7 +135,7 @@ class ElementTests(unittest.TestCase):
self.assertEqual(element.queryTaggedValue('foo'), 'bar')
-class SpecificationBasePyTests(_SilencePy3Deprecations):
+class SpecificationBasePyTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.interface import SpecificationBasePy
@@ -162,7 +151,7 @@ class SpecificationBasePyTests(_SilencePy3Deprecations):
def _providedBy(obj):
return _empty
with _Monkey(interface, providedBy=_providedBy):
- self.failIf(sb.providedBy(object()))
+ self.assertFalse(sb.providedBy(object()))
def test_providedBy_hit(self):
from zope.interface import interface
@@ -172,7 +161,7 @@ class SpecificationBasePyTests(_SilencePy3Deprecations):
def _providedBy(obj):
return _Decl()
with _Monkey(interface, providedBy=_providedBy):
- self.failUnless(sb.providedBy(object()))
+ self.assertTrue(sb.providedBy(object()))
def test_implementedBy_miss(self):
from zope.interface import interface
@@ -181,7 +170,7 @@ class SpecificationBasePyTests(_SilencePy3Deprecations):
def _implementedBy(obj):
return _empty
with _Monkey(interface, implementedBy=_implementedBy):
- self.failIf(sb.implementedBy(object()))
+ self.assertFalse(sb.implementedBy(object()))
def test_implementedBy_hit(self):
from zope.interface import interface
@@ -191,32 +180,32 @@ class SpecificationBasePyTests(_SilencePy3Deprecations):
def _implementedBy(obj):
return _Decl()
with _Monkey(interface, implementedBy=_implementedBy):
- self.failUnless(sb.implementedBy(object()))
+ self.assertTrue(sb.implementedBy(object()))
def test_isOrExtends_miss(self):
sb = self._makeOne()
sb._implied = {} # not defined by SpecificationBasePy
- self.failIf(sb.isOrExtends(object()))
+ self.assertFalse(sb.isOrExtends(object()))
def test_isOrExtends_hit(self):
sb = self._makeOne()
testing = object()
sb._implied = {testing: {}} # not defined by SpecificationBasePy
- self.failUnless(sb(testing))
+ self.assertTrue(sb(testing))
def test___call___miss(self):
sb = self._makeOne()
sb._implied = {} # not defined by SpecificationBasePy
- self.failIf(sb.isOrExtends(object()))
+ self.assertFalse(sb.isOrExtends(object()))
def test___call___hit(self):
sb = self._makeOne()
testing = object()
sb._implied = {testing: {}} # not defined by SpecificationBasePy
- self.failUnless(sb(testing))
+ self.assertTrue(sb(testing))
-class InterfaceBasePyTests(_SilencePy3Deprecations):
+class InterfaceBasePyTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.interface import InterfaceBasePy
@@ -236,7 +225,7 @@ class InterfaceBasePyTests(_SilencePy3Deprecations):
class _Adapted(object):
def __conform__(self, iface):
return conformed
- self.failUnless(ib(_Adapted()) is conformed)
+ self.assertTrue(ib(_Adapted()) is conformed)
def test___call___w___conform___miss_ob_provides(self):
ib = self._makeOne(True)
@@ -244,13 +233,13 @@ class InterfaceBasePyTests(_SilencePy3Deprecations):
def __conform__(self, iface):
return None
adapted = _Adapted()
- self.failUnless(ib(adapted) is adapted)
+ self.assertTrue(ib(adapted) is adapted)
def test___call___wo___conform___ob_no_provides_w_alternate(self):
ib = self._makeOne(False)
adapted = object()
alternate = object()
- self.failUnless(ib(adapted, alternate) is alternate)
+ self.assertTrue(ib(adapted, alternate) is alternate)
def test___call___w___conform___ob_no_provides_wo_alternate(self):
ib = self._makeOne(False)
@@ -260,7 +249,7 @@ class InterfaceBasePyTests(_SilencePy3Deprecations):
def test___adapt___ob_provides(self):
ib = self._makeOne(True)
adapted = object()
- self.failUnless(ib.__adapt__(adapted) is adapted)
+ self.assertTrue(ib.__adapt__(adapted) is adapted)
def test___adapt___ob_no_provides_uses_hooks(self):
from zope.interface import interface
@@ -273,11 +262,11 @@ class InterfaceBasePyTests(_SilencePy3Deprecations):
def _hook_hit(iface, obj):
return obj
with _Monkey(interface, adapter_hooks=[_hook_miss, _hook_hit]):
- self.failUnless(ib.__adapt__(adapted) is adapted)
+ self.assertTrue(ib.__adapt__(adapted) is adapted)
self.assertEqual(_missed, [(ib, adapted)])
-class SpecificationTests(_SilencePy3Deprecations):
+class SpecificationTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.interface import Specification
@@ -293,8 +282,8 @@ class SpecificationTests(_SilencePy3Deprecations):
spec = self._makeOne()
self.assertEqual(spec.__bases__, ())
self.assertEqual(len(spec._implied), 2)
- self.failUnless(spec in spec._implied)
- self.failUnless(Interface in spec._implied)
+ self.assertTrue(spec in spec._implied)
+ self.assertTrue(Interface in spec._implied)
self.assertEqual(len(spec.dependents), 0)
def test_subscribe_first_time(self):
@@ -324,7 +313,7 @@ class SpecificationTests(_SilencePy3Deprecations):
spec.unsubscribe(dep)
self.assertEqual(spec.dependents[dep], 1)
spec.unsubscribe(dep)
- self.failIf(dep in spec.dependents)
+ self.assertFalse(dep in spec.dependents)
def test___setBases_subscribes_bases_and_notifies_dependents(self):
from zope.interface.interface import Interface
@@ -350,8 +339,8 @@ class SpecificationTests(_SilencePy3Deprecations):
spec._v_attrs = 'Foo'
spec._implied[I] = ()
spec.changed(spec)
- self.failUnless(getattr(spec, '_v_attrs', self) is self)
- self.failIf(I in spec._implied)
+ self.assertTrue(getattr(spec, '_v_attrs', self) is self)
+ self.assertFalse(I in spec._implied)
def test_interfaces_skips_already_seen(self):
from zope.interface.interface import Interface
@@ -392,7 +381,7 @@ class SpecificationTests(_SilencePy3Deprecations):
self.assertTrue(spec.get('foo') is IFoo.get('foo'))
self.assertTrue(spec.get('bar') is IBar.get('bar'))
-class InterfaceClassTests(_SilencePy3Deprecations):
+class InterfaceClassTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.interface import InterfaceClass
@@ -471,19 +460,19 @@ class InterfaceClassTests(_SilencePy3Deprecations):
def test_isEqualOrExtendedBy_identity(self):
iface = self._makeOne()
- self.failUnless(iface.isEqualOrExtendedBy(iface))
+ self.assertTrue(iface.isEqualOrExtendedBy(iface))
def test_isEqualOrExtendedBy_subiface(self):
iface = self._makeOne()
sub = self._makeOne('ISub', bases=(iface,))
- self.failUnless(iface.isEqualOrExtendedBy(sub))
- self.failIf(sub.isEqualOrExtendedBy(iface))
+ self.assertTrue(iface.isEqualOrExtendedBy(sub))
+ self.assertFalse(sub.isEqualOrExtendedBy(iface))
def test_isEqualOrExtendedBy_unrelated(self):
one = self._makeOne('One')
another = self._makeOne('Another')
- self.failIf(one.isEqualOrExtendedBy(another))
- self.failIf(another.isEqualOrExtendedBy(one))
+ self.assertFalse(one.isEqualOrExtendedBy(another))
+ self.assertFalse(another.isEqualOrExtendedBy(one))
def test_names_w_all_False_ignores_bases(self):
from zope.interface.interface import Attribute
@@ -663,7 +652,7 @@ class InterfaceClassTests(_SilencePy3Deprecations):
def test___contains___miss(self):
one = self._makeOne()
- self.failIf('nonesuch' in one)
+ self.assertFalse('nonesuch' in one)
def test___contains___hit(self):
from zope.interface.interface import Attribute
@@ -674,8 +663,8 @@ class InterfaceClassTests(_SilencePy3Deprecations):
'bar': fromFunction(_bar),
}
one = self._makeOne(attrs=ATTRS)
- self.failUnless('foo' in one)
- self.failUnless('bar' in one)
+ self.assertTrue('foo' in one)
+ self.assertTrue('bar' in one)
def test_direct_miss(self):
one = self._makeOne()
@@ -751,7 +740,7 @@ class InterfaceClassTests(_SilencePy3Deprecations):
self.assertRaises(Invalid, iface.validateInvariants, obj, _errors)
self.assertEqual(_fail_called_with, [((obj,), {})])
self.assertEqual(len(_errors), 1)
- self.failUnless(isinstance(_errors[0], Invalid))
+ self.assertTrue(isinstance(_errors[0], Invalid))
def test_validateInvariants_fail_in_base_wo_errors_passed(self):
from zope.interface.exceptions import Invalid
@@ -792,7 +781,7 @@ class InterfaceClassTests(_SilencePy3Deprecations):
self.assertEqual(_passable_called_with, [((obj,), {})])
self.assertEqual(_fail_called_with, [((obj,), {})])
self.assertEqual(len(_errors), 1)
- self.failUnless(isinstance(_errors[0], Invalid))
+ self.assertTrue(isinstance(_errors[0], Invalid))
def test___reduce__(self):
iface = self._makeOne('PickleMe')
@@ -818,56 +807,56 @@ class InterfaceClassTests(_SilencePy3Deprecations):
warnings.simplefilter('always') # see LP #825249
self.assertEqual(hash(derived), 1)
self.assertEqual(len(warned), 1)
- self.failUnless(warned[0].category is UserWarning)
+ self.assertTrue(warned[0].category is UserWarning)
self.assertEqual(str(warned[0].message),
'Hashing uninitialized InterfaceClass instance')
def test_comparison_with_None(self):
iface = self._makeOne()
- self.failUnless(iface < None)
- self.failUnless(iface <= None)
- self.failIf(iface == None)
- self.failUnless(iface != None)
- self.failIf(iface >= None)
- self.failIf(iface > None)
-
- self.failIf(None < iface)
- self.failIf(None <= iface)
- self.failIf(None == iface)
- self.failUnless(None != iface)
- self.failUnless(None >= iface)
- self.failUnless(None > iface)
+ self.assertTrue(iface < None)
+ self.assertTrue(iface <= None)
+ self.assertFalse(iface == None)
+ self.assertTrue(iface != None)
+ self.assertFalse(iface >= None)
+ self.assertFalse(iface > None)
+
+ self.assertFalse(None < iface)
+ self.assertFalse(None <= iface)
+ self.assertFalse(None == iface)
+ self.assertTrue(None != iface)
+ self.assertTrue(None >= iface)
+ self.assertTrue(None > iface)
def test_comparison_with_same_instance(self):
iface = self._makeOne()
- self.failIf(iface < iface)
- self.failUnless(iface <= iface)
- self.failUnless(iface == iface)
- self.failIf(iface != iface)
- self.failUnless(iface >= iface)
- self.failIf(iface > iface)
+ self.assertFalse(iface < iface)
+ self.assertTrue(iface <= iface)
+ self.assertTrue(iface == iface)
+ self.assertFalse(iface != iface)
+ self.assertTrue(iface >= iface)
+ self.assertFalse(iface > iface)
def test_comparison_with_same_named_instance_in_other_module(self):
one = self._makeOne('IName', __module__='zope.interface.tests.one')
other = self._makeOne('IName', __module__='zope.interface.tests.other')
- self.failUnless(one < other)
- self.failIf(other < one)
- self.failUnless(one <= other)
- self.failIf(other <= one)
- self.failIf(one == other)
- self.failIf(other == one)
- self.failUnless(one != other)
- self.failUnless(other != one)
- self.failIf(one >= other)
- self.failUnless(other >= one)
- self.failIf(one > other)
- self.failUnless(other > one)
+ self.assertTrue(one < other)
+ self.assertFalse(other < one)
+ self.assertTrue(one <= other)
+ self.assertFalse(other <= one)
+ self.assertFalse(one == other)
+ self.assertFalse(other == one)
+ self.assertTrue(one != other)
+ self.assertTrue(other != one)
+ self.assertFalse(one >= other)
+ self.assertTrue(other >= one)
+ self.assertFalse(one > other)
+ self.assertTrue(other > one)
-class InterfaceTests(_SilencePy3Deprecations):
+class InterfaceTests(unittest.TestCase):
def test_attributes_link_to_interface(self):
from zope.interface import Interface
@@ -876,7 +865,7 @@ class InterfaceTests(_SilencePy3Deprecations):
class I1(Interface):
attr = Attribute("My attr")
- self.failUnless(I1['attr'].interface is I1)
+ self.assertTrue(I1['attr'].interface is I1)
def test_methods_link_to_interface(self):
from zope.interface import Interface
@@ -886,7 +875,7 @@ class InterfaceTests(_SilencePy3Deprecations):
def method(foo, bar, bingo):
pass
- self.failUnless(I1['method'].interface is I1)
+ self.assertTrue(I1['method'].interface is I1)
def test_classImplements_simple(self):
from zope.interface import Interface
@@ -911,12 +900,12 @@ class InterfaceTests(_SilencePy3Deprecations):
current = Current()
- self.failUnless(ICurrent.implementedBy(Current))
- self.failIf(IOther.implementedBy(Current))
- self.failUnless(ICurrent in implementedBy(Current))
- self.failIf(IOther in implementedBy(Current))
- self.failUnless(ICurrent in providedBy(current))
- self.failIf(IOther in providedBy(current))
+ self.assertTrue(ICurrent.implementedBy(Current))
+ self.assertFalse(IOther.implementedBy(Current))
+ self.assertTrue(ICurrent in implementedBy(Current))
+ self.assertFalse(IOther in implementedBy(Current))
+ self.assertTrue(ICurrent in providedBy(current))
+ self.assertFalse(IOther in providedBy(current))
def test_classImplements_base_not_derived(self):
from zope.interface import Interface
@@ -933,12 +922,12 @@ class InterfaceTests(_SilencePy3Deprecations):
pass
current = Current()
- self.failUnless(IBase.implementedBy(Current))
- self.failIf(IDerived.implementedBy(Current))
- self.failUnless(IBase in implementedBy(Current))
- self.failIf(IDerived in implementedBy(Current))
- self.failUnless(IBase in providedBy(current))
- self.failIf(IDerived in providedBy(current))
+ self.assertTrue(IBase.implementedBy(Current))
+ self.assertFalse(IDerived.implementedBy(Current))
+ self.assertTrue(IBase in implementedBy(Current))
+ self.assertFalse(IDerived in implementedBy(Current))
+ self.assertTrue(IBase in providedBy(current))
+ self.assertFalse(IDerived in providedBy(current))
def test_classImplements_base_and_derived(self):
from zope.interface import Interface
@@ -959,14 +948,14 @@ class InterfaceTests(_SilencePy3Deprecations):
current = Current()
- self.failUnless(IBase.implementedBy(Current))
- self.failUnless(IDerived.implementedBy(Current))
- self.failIf(IBase in implementedBy(Current))
- self.failUnless(IBase in implementedBy(Current).flattened())
- self.failUnless(IDerived in implementedBy(Current))
- self.failIf(IBase in providedBy(current))
- self.failUnless(IBase in providedBy(current).flattened())
- self.failUnless(IDerived in providedBy(current))
+ self.assertTrue(IBase.implementedBy(Current))
+ self.assertTrue(IDerived.implementedBy(Current))
+ self.assertFalse(IBase in implementedBy(Current))
+ self.assertTrue(IBase in implementedBy(Current).flattened())
+ self.assertTrue(IDerived in implementedBy(Current))
+ self.assertFalse(IBase in providedBy(current))
+ self.assertTrue(IBase in providedBy(current).flattened())
+ self.assertTrue(IDerived in providedBy(current))
def test_classImplements_multiple(self):
from zope.interface import Interface
@@ -994,12 +983,12 @@ class InterfaceTests(_SilencePy3Deprecations):
ambi = Ambi()
- self.failUnless(ILeft.implementedBy(Ambi))
- self.failUnless(IRight.implementedBy(Ambi))
- self.failUnless(ILeft in implementedBy(Ambi))
- self.failUnless(IRight in implementedBy(Ambi))
- self.failUnless(ILeft in providedBy(ambi))
- self.failUnless(IRight in providedBy(ambi))
+ self.assertTrue(ILeft.implementedBy(Ambi))
+ self.assertTrue(IRight.implementedBy(Ambi))
+ self.assertTrue(ILeft in implementedBy(Ambi))
+ self.assertTrue(IRight in implementedBy(Ambi))
+ self.assertTrue(ILeft in providedBy(ambi))
+ self.assertTrue(IRight in providedBy(ambi))
def test_classImplements_multiple_w_explict_implements(self):
from zope.interface import Interface
@@ -1034,15 +1023,15 @@ class InterfaceTests(_SilencePy3Deprecations):
mixed = Mixed()
- self.failUnless(ILeft.implementedBy(Mixed))
- self.failIf(IRight.implementedBy(Mixed))
- self.failUnless(IOther.implementedBy(Mixed))
- self.failUnless(ILeft in implementedBy(Mixed))
- self.failIf(IRight in implementedBy(Mixed))
- self.failUnless(IOther in implementedBy(Mixed))
- self.failUnless(ILeft in providedBy(mixed))
- self.failIf(IRight in providedBy(mixed))
- self.failUnless(IOther in providedBy(mixed))
+ self.assertTrue(ILeft.implementedBy(Mixed))
+ self.assertFalse(IRight.implementedBy(Mixed))
+ self.assertTrue(IOther.implementedBy(Mixed))
+ self.assertTrue(ILeft in implementedBy(Mixed))
+ self.assertFalse(IRight in implementedBy(Mixed))
+ self.assertTrue(IOther in implementedBy(Mixed))
+ self.assertTrue(ILeft in providedBy(mixed))
+ self.assertFalse(IRight in providedBy(mixed))
+ self.assertTrue(IOther in providedBy(mixed))
def testInterfaceExtendsInterface(self):
from zope.interface import Interface
@@ -1053,13 +1042,13 @@ class InterfaceTests(_SilencePy3Deprecations):
BobInterface = new('BobInterface')
BazInterface = new('BazInterface', [BobInterface, BarInterface])
- self.failUnless(BazInterface.extends(BobInterface))
- self.failUnless(BazInterface.extends(BarInterface))
- self.failUnless(BazInterface.extends(FunInterface))
- self.failIf(BobInterface.extends(FunInterface))
- self.failIf(BobInterface.extends(BarInterface))
- self.failUnless(BarInterface.extends(FunInterface))
- self.failIf(BarInterface.extends(BazInterface))
+ self.assertTrue(BazInterface.extends(BobInterface))
+ self.assertTrue(BazInterface.extends(BarInterface))
+ self.assertTrue(BazInterface.extends(FunInterface))
+ self.assertFalse(BobInterface.extends(FunInterface))
+ self.assertFalse(BobInterface.extends(BarInterface))
+ self.assertTrue(BarInterface.extends(FunInterface))
+ self.assertFalse(BarInterface.extends(BazInterface))
def test_verifyClass(self):
from zope.interface import Attribute
@@ -1080,7 +1069,7 @@ class InterfaceTests(_SilencePy3Deprecations):
def method(self):
pass
- self.failUnless(verifyClass(ICheckMe, CheckMe))
+ self.assertTrue(verifyClass(ICheckMe, CheckMe))
def test_verifyObject(self):
from zope.interface import Attribute
@@ -1103,7 +1092,7 @@ class InterfaceTests(_SilencePy3Deprecations):
check_me = CheckMe()
- self.failUnless(verifyObject(ICheckMe, check_me))
+ self.assertTrue(verifyObject(ICheckMe, check_me))
def test_interface_object_provides_Interface(self):
from zope.interface import Interface
@@ -1111,7 +1100,7 @@ class InterfaceTests(_SilencePy3Deprecations):
class AnInterface(Interface):
pass
- self.failUnless(Interface.providedBy(AnInterface))
+ self.assertTrue(Interface.providedBy(AnInterface))
def test_names_simple(self):
from zope.interface import Attribute
@@ -1167,11 +1156,11 @@ class InterfaceTests(_SilencePy3Deprecations):
self.assertEqual(len(name_values), 2)
self.assertEqual(name_values[0][0], 'attr')
- self.failUnless(isinstance(name_values[0][1], Attribute))
+ self.assertTrue(isinstance(name_values[0][1], Attribute))
self.assertEqual(name_values[0][1].__name__, 'attr')
self.assertEqual(name_values[0][1].__doc__, 'My attr')
self.assertEqual(name_values[1][0], 'method')
- self.failUnless(isinstance(name_values[1][1], Method))
+ self.assertTrue(isinstance(name_values[1][1], Method))
self.assertEqual(name_values[1][1].__name__, 'method')
self.assertEqual(name_values[1][1].__doc__, 'My method')
@@ -1200,15 +1189,15 @@ class InterfaceTests(_SilencePy3Deprecations):
self.assertEqual(len(name_values), 3)
self.assertEqual(name_values[0][0], 'attr2')
- self.failUnless(isinstance(name_values[0][1], Attribute))
+ self.assertTrue(isinstance(name_values[0][1], Attribute))
self.assertEqual(name_values[0][1].__name__, 'attr2')
self.assertEqual(name_values[0][1].__doc__, 'My attr2')
self.assertEqual(name_values[1][0], 'method')
- self.failUnless(isinstance(name_values[1][1], Method))
+ self.assertTrue(isinstance(name_values[1][1], Method))
self.assertEqual(name_values[1][1].__name__, 'method')
self.assertEqual(name_values[1][1].__doc__, 'My method, overridden')
self.assertEqual(name_values[2][0], 'method2')
- self.failUnless(isinstance(name_values[2][1], Method))
+ self.assertTrue(isinstance(name_values[2][1], Method))
self.assertEqual(name_values[2][1].__name__, 'method2')
self.assertEqual(name_values[2][1].__doc__, 'My method2')
@@ -1216,19 +1205,19 @@ class InterfaceTests(_SilencePy3Deprecations):
self.assertEqual(len(name_values), 4)
self.assertEqual(name_values[0][0], 'attr')
- self.failUnless(isinstance(name_values[0][1], Attribute))
+ self.assertTrue(isinstance(name_values[0][1], Attribute))
self.assertEqual(name_values[0][1].__name__, 'attr')
self.assertEqual(name_values[0][1].__doc__, 'My attr')
self.assertEqual(name_values[1][0], 'attr2')
- self.failUnless(isinstance(name_values[1][1], Attribute))
+ self.assertTrue(isinstance(name_values[1][1], Attribute))
self.assertEqual(name_values[1][1].__name__, 'attr2')
self.assertEqual(name_values[1][1].__doc__, 'My attr2')
self.assertEqual(name_values[2][0], 'method')
- self.failUnless(isinstance(name_values[2][1], Method))
+ self.assertTrue(isinstance(name_values[2][1], Method))
self.assertEqual(name_values[2][1].__name__, 'method')
self.assertEqual(name_values[2][1].__doc__, 'My method, overridden')
self.assertEqual(name_values[3][0], 'method2')
- self.failUnless(isinstance(name_values[3][1], Method))
+ self.assertTrue(isinstance(name_values[3][1], Method))
self.assertEqual(name_values[3][1].__name__, 'method2')
self.assertEqual(name_values[3][1].__doc__, 'My method2')
@@ -1253,12 +1242,12 @@ class InterfaceTests(_SilencePy3Deprecations):
"My method"
a_desc = ISimple.getDescriptionFor('attr')
- self.failUnless(isinstance(a_desc, Attribute))
+ self.assertTrue(isinstance(a_desc, Attribute))
self.assertEqual(a_desc.__name__, 'attr')
self.assertEqual(a_desc.__doc__, 'My attr')
m_desc = ISimple.getDescriptionFor('method')
- self.failUnless(isinstance(m_desc, Method))
+ self.assertTrue(isinstance(m_desc, Method))
self.assertEqual(m_desc.__name__, 'method')
self.assertEqual(m_desc.__doc__, 'My method')
@@ -1284,22 +1273,22 @@ class InterfaceTests(_SilencePy3Deprecations):
"My method2"
a_desc = IDerived.getDescriptionFor('attr')
- self.failUnless(isinstance(a_desc, Attribute))
+ self.assertTrue(isinstance(a_desc, Attribute))
self.assertEqual(a_desc.__name__, 'attr')
self.assertEqual(a_desc.__doc__, 'My attr')
m_desc = IDerived.getDescriptionFor('method')
- self.failUnless(isinstance(m_desc, Method))
+ self.assertTrue(isinstance(m_desc, Method))
self.assertEqual(m_desc.__name__, 'method')
self.assertEqual(m_desc.__doc__, 'My method, overridden')
a2_desc = IDerived.getDescriptionFor('attr2')
- self.failUnless(isinstance(a2_desc, Attribute))
+ self.assertTrue(isinstance(a2_desc, Attribute))
self.assertEqual(a2_desc.__name__, 'attr2')
self.assertEqual(a2_desc.__doc__, 'My attr2')
m2_desc = IDerived.getDescriptionFor('method2')
- self.failUnless(isinstance(m2_desc, Method))
+ self.assertTrue(isinstance(m2_desc, Method))
self.assertEqual(m2_desc.__name__, 'method2')
self.assertEqual(m2_desc.__doc__, 'My method2')
@@ -1324,12 +1313,12 @@ class InterfaceTests(_SilencePy3Deprecations):
"My method"
a_desc = ISimple['attr']
- self.failUnless(isinstance(a_desc, Attribute))
+ self.assertTrue(isinstance(a_desc, Attribute))
self.assertEqual(a_desc.__name__, 'attr')
self.assertEqual(a_desc.__doc__, 'My attr')
m_desc = ISimple['method']
- self.failUnless(isinstance(m_desc, Method))
+ self.assertTrue(isinstance(m_desc, Method))
self.assertEqual(m_desc.__name__, 'method')
self.assertEqual(m_desc.__doc__, 'My method')
@@ -1355,22 +1344,22 @@ class InterfaceTests(_SilencePy3Deprecations):
"My method2"
a_desc = IDerived['attr']
- self.failUnless(isinstance(a_desc, Attribute))
+ self.assertTrue(isinstance(a_desc, Attribute))
self.assertEqual(a_desc.__name__, 'attr')
self.assertEqual(a_desc.__doc__, 'My attr')
m_desc = IDerived['method']
- self.failUnless(isinstance(m_desc, Method))
+ self.assertTrue(isinstance(m_desc, Method))
self.assertEqual(m_desc.__name__, 'method')
self.assertEqual(m_desc.__doc__, 'My method, overridden')
a2_desc = IDerived['attr2']
- self.failUnless(isinstance(a2_desc, Attribute))
+ self.assertTrue(isinstance(a2_desc, Attribute))
self.assertEqual(a2_desc.__name__, 'attr2')
self.assertEqual(a2_desc.__doc__, 'My attr2')
m2_desc = IDerived['method2']
- self.failUnless(isinstance(m2_desc, Method))
+ self.assertTrue(isinstance(m2_desc, Method))
self.assertEqual(m2_desc.__name__, 'method2')
self.assertEqual(m2_desc.__doc__, 'My method2')
@@ -1380,7 +1369,7 @@ class InterfaceTests(_SilencePy3Deprecations):
class IEmpty(Interface):
pass
- self.failIf('nonesuch' in IEmpty)
+ self.assertFalse('nonesuch' in IEmpty)
def test___contains__simple(self):
from zope.interface import Attribute
@@ -1393,8 +1382,8 @@ class InterfaceTests(_SilencePy3Deprecations):
def method():
"My method"
- self.failUnless('attr' in ISimple)
- self.failUnless('method' in ISimple)
+ self.assertTrue('attr' in ISimple)
+ self.assertTrue('method' in ISimple)
def test___contains__derived(self):
from zope.interface import Attribute
@@ -1416,10 +1405,10 @@ class InterfaceTests(_SilencePy3Deprecations):
def method2():
"My method2"
- self.failUnless('attr' in IDerived)
- self.failUnless('method' in IDerived)
- self.failUnless('attr2' in IDerived)
- self.failUnless('method2' in IDerived)
+ self.assertTrue('attr' in IDerived)
+ self.assertTrue('method' in IDerived)
+ self.assertTrue('attr2' in IDerived)
+ self.assertTrue('method2' in IDerived)
def test___iter__empty(self):
from zope.interface import Interface
@@ -1719,7 +1708,7 @@ class InterfaceTests(_SilencePy3Deprecations):
pass
self.assertEqual(ITagged.getTaggedValue('qux'), 'Spam')
- self.failUnless('qux' in ITagged.getTaggedValueTags())
+ self.assertTrue('qux' in ITagged.getTaggedValueTags())
def test_description_cache_management(self):
# See https://bugs.launchpad.net/zope.interface/+bug/185974
@@ -1737,10 +1726,10 @@ class InterfaceTests(_SilencePy3Deprecations):
class I3(I2):
pass
- self.failUnless(I3.get('a') is I1.get('a'))
+ self.assertTrue(I3.get('a') is I1.get('a'))
I2.__bases__ = (Interface,)
- self.failUnless(I3.get('a') is None)
+ self.assertTrue(I3.get('a') is None)
def test___call___defers_to___conform___(self):
from zope.interface import Interface
@@ -1768,7 +1757,7 @@ class InterfaceTests(_SilencePy3Deprecations):
pass
c = C()
- self.failUnless(I(c) is c)
+ self.assertTrue(I(c) is c)
def test___call___miss_wo_alternate(self):
from zope.interface import Interface
@@ -1792,7 +1781,7 @@ class InterfaceTests(_SilencePy3Deprecations):
pass
c = C()
- self.failUnless(I(c, self) is self)
+ self.assertTrue(I(c, self) is self)
def test___call___w_adapter_hook(self):
from zope.interface import Interface
@@ -1816,7 +1805,7 @@ class InterfaceTests(_SilencePy3Deprecations):
old_adapter_hooks = adapter_hooks[:]
adapter_hooks[:] = [_miss, _hit]
try:
- self.failUnless(I(c) is self)
+ self.assertTrue(I(c) is self)
finally:
adapter_hooks[:] = old_adapter_hooks
diff --git a/src/zope/interface/tests/test_interfaces.py b/src/zope/interface/tests/test_interfaces.py
index 7bc5807..9c1b88e 100644
--- a/src/zope/interface/tests/test_interfaces.py
+++ b/src/zope/interface/tests/test_interfaces.py
@@ -1,16 +1,5 @@
import unittest
-class _SilencePy3Deprecations(unittest.TestCase):
- # silence deprecation warnings under py3
-
- def failUnless(self, expr):
- # St00pid speling.
- return self.assertTrue(expr)
-
- def failIf(self, expr):
- # St00pid speling.
- return self.assertFalse(expr)
-
class _ConformsToIObjectEvent(object):
@@ -43,7 +32,7 @@ class _ConformsToIRegistrationEvent(_ConformsToIObjectEvent):
verifyObject(IRegistrationEvent, self._makeOne())
-class ObjectEventTests(_SilencePy3Deprecations, _ConformsToIObjectEvent):
+class ObjectEventTests(unittest.TestCase, _ConformsToIObjectEvent):
def _getTargetClass(self):
from zope.interface.interfaces import ObjectEvent
@@ -52,10 +41,10 @@ class ObjectEventTests(_SilencePy3Deprecations, _ConformsToIObjectEvent):
def test_ctor(self):
target = object()
event = self._makeOne(target)
- self.failUnless(event.object is target)
+ self.assertTrue(event.object is target)
-class RegistrationEventTests(_SilencePy3Deprecations,
+class RegistrationEventTests(unittest.TestCase,
_ConformsToIRegistrationEvent):
def _getTargetClass(self):
@@ -70,7 +59,7 @@ class RegistrationEventTests(_SilencePy3Deprecations,
['RegistrationEvent event:', repr(target)])
-class RegisteredTests(_SilencePy3Deprecations,
+class RegisteredTests(unittest.TestCase,
_ConformsToIRegistrationEvent):
def _getTargetClass(self):
@@ -88,7 +77,7 @@ class RegisteredTests(_SilencePy3Deprecations,
verifyObject(IRegistered, self._makeOne())
-class UnregisteredTests(_SilencePy3Deprecations,
+class UnregisteredTests(unittest.TestCase,
_ConformsToIRegistrationEvent):
def _getTargetClass(self):
diff --git a/src/zope/interface/tests/test_odd_declarations.py b/src/zope/interface/tests/test_odd_declarations.py
index 7314c7c..1e62a4f 100644
--- a/src/zope/interface/tests/test_odd_declarations.py
+++ b/src/zope/interface/tests/test_odd_declarations.py
@@ -58,12 +58,6 @@ classImplements(C, I31)
class Test(unittest.TestCase):
- def failUnless(self, expr): # silence deprecation warnings under py3
- return self.assertTrue(expr)
-
- def failIf(self, expr): # silence deprecation warnings under py3
- return self.assertFalse(expr)
-
def test_ObjectSpecification(self):
c = C()
directlyProvides(c, I4)
@@ -73,11 +67,11 @@ class Test(unittest.TestCase):
self.assertEqual([i.getName() for i in providedBy(c).flattened()],
['I4', 'I31', 'I3', 'I1', 'I2', 'Interface']
)
- self.failUnless(I1 in providedBy(c))
- self.failIf(I3 in providedBy(c))
- self.failUnless(providedBy(c).extends(I3))
- self.failUnless(providedBy(c).extends(I31))
- self.failIf(providedBy(c).extends(I5))
+ self.assertTrue(I1 in providedBy(c))
+ self.assertFalse(I3 in providedBy(c))
+ self.assertTrue(providedBy(c).extends(I3))
+ self.assertTrue(providedBy(c).extends(I31))
+ self.assertFalse(providedBy(c).extends(I5))
class COnly(A, B):
pass
@@ -95,12 +89,12 @@ class Test(unittest.TestCase):
['I4', 'I5', 'I31'])
self.assertEqual([i.getName() for i in providedBy(c).flattened()],
['I4', 'I5', 'I31', 'I3', 'Interface'])
- self.failIf(I1 in providedBy(c))
- self.failIf(I3 in providedBy(c))
- self.failUnless(providedBy(c).extends(I3))
- self.failIf(providedBy(c).extends(I1))
- self.failUnless(providedBy(c).extends(I31))
- self.failUnless(providedBy(c).extends(I5))
+ self.assertFalse(I1 in providedBy(c))
+ self.assertFalse(I3 in providedBy(c))
+ self.assertTrue(providedBy(c).extends(I3))
+ self.assertFalse(providedBy(c).extends(I1))
+ self.assertTrue(providedBy(c).extends(I31))
+ self.assertTrue(providedBy(c).extends(I5))
class COnly(A, B): __implemented__ = I31
class D(COnly):
@@ -114,12 +108,12 @@ class Test(unittest.TestCase):
['I4', 'I5', 'I31'])
self.assertEqual([i.getName() for i in providedBy(c).flattened()],
['I4', 'I5', 'I31', 'I3', 'Interface'])
- self.failIf(I1 in providedBy(c))
- self.failIf(I3 in providedBy(c))
- self.failUnless(providedBy(c).extends(I3))
- self.failIf(providedBy(c).extends(I1))
- self.failUnless(providedBy(c).extends(I31))
- self.failUnless(providedBy(c).extends(I5))
+ self.assertFalse(I1 in providedBy(c))
+ self.assertFalse(I3 in providedBy(c))
+ self.assertTrue(providedBy(c).extends(I3))
+ self.assertFalse(providedBy(c).extends(I1))
+ self.assertTrue(providedBy(c).extends(I31))
+ self.assertTrue(providedBy(c).extends(I5))
def test_classImplements(self):
@@ -176,19 +170,19 @@ class Test(unittest.TestCase):
ob = C()
directlyProvides(ob, I1, I2)
- self.failUnless(I1 in providedBy(ob))
- self.failUnless(I2 in providedBy(ob))
- self.failUnless(IA1 in providedBy(ob))
- self.failUnless(IA2 in providedBy(ob))
- self.failUnless(IB in providedBy(ob))
- self.failUnless(IC in providedBy(ob))
+ self.assertTrue(I1 in providedBy(ob))
+ self.assertTrue(I2 in providedBy(ob))
+ self.assertTrue(IA1 in providedBy(ob))
+ self.assertTrue(IA2 in providedBy(ob))
+ self.assertTrue(IB in providedBy(ob))
+ self.assertTrue(IC in providedBy(ob))
directlyProvides(ob, directlyProvidedBy(ob)-I2)
- self.failUnless(I1 in providedBy(ob))
- self.failIf(I2 in providedBy(ob))
- self.failIf(I2 in providedBy(ob))
+ self.assertTrue(I1 in providedBy(ob))
+ self.assertFalse(I2 in providedBy(ob))
+ self.assertFalse(I2 in providedBy(ob))
directlyProvides(ob, directlyProvidedBy(ob), I2)
- self.failUnless(I2 in providedBy(ob))
+ self.assertTrue(I2 in providedBy(ob))
@_skip_under_py3k
def test_directlyProvides_fails_for_odd_class(self):
diff --git a/src/zope/interface/tests/test_registry.py b/src/zope/interface/tests/test_registry.py
index 2e51b45..2180a3f 100644
--- a/src/zope/interface/tests/test_registry.py
+++ b/src/zope/interface/tests/test_registry.py
@@ -14,18 +14,8 @@
"""Component Registry Tests"""
import unittest
-class _SilencePy3Deprecations(unittest.TestCase):
- # silence deprecation warnings under py3
- def failUnless(self, expr):
- # St00pid speling.
- return self.assertTrue(expr)
-
- def failIf(self, expr):
- # St00pid speling.
- return self.assertFalse(expr)
-
-class ComponentsTests(_SilencePy3Deprecations):
+class ComponentsTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.registry import Components
@@ -47,8 +37,8 @@ class ComponentsTests(_SilencePy3Deprecations):
comp = self._makeOne('testing')
self.assertEqual(comp.__name__, 'testing')
self.assertEqual(comp.__bases__, ())
- self.failUnless(isinstance(comp.adapters, AdapterRegistry))
- self.failUnless(isinstance(comp.utilities, AdapterRegistry))
+ self.assertTrue(isinstance(comp.adapters, AdapterRegistry))
+ self.assertTrue(isinstance(comp.utilities, AdapterRegistry))
self.assertEqual(comp.adapters.__bases__, ())
self.assertEqual(comp.utilities.__bases__, ())
self.assertEqual(comp._utility_registrations, {})
@@ -124,7 +114,7 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
comp.registerUtility(_to_reg, ifoo, _name, _info)
- self.failUnless(comp.utilities._adapters[0][ifoo][_name] is _to_reg)
+ self.assertTrue(comp.utilities._adapters[0][ifoo][_name] is _to_reg)
self.assertEqual(comp._utility_registrations[ifoo, _name],
(_to_reg, _info, None))
self.assertEqual(comp.utilities._subscribers[0][ifoo][''], (_to_reg,))
@@ -132,14 +122,14 @@ class ComponentsTests(_SilencePy3Deprecations):
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, UtilityRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.component is _to_reg)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is None)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, UtilityRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.component is _to_reg)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is None)
def test_registerUtility_w_factory(self):
from zope.interface.declarations import InterfaceClass
@@ -162,14 +152,14 @@ class ComponentsTests(_SilencePy3Deprecations):
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, UtilityRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.component is _to_reg)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _factory)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, UtilityRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.component is _to_reg)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _factory)
def test_registerUtility_no_provided_available(self):
from zope.interface.declarations import InterfaceClass
@@ -209,14 +199,14 @@ class ComponentsTests(_SilencePy3Deprecations):
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, UtilityRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.component is _to_reg)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is None)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, UtilityRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.component is _to_reg)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is None)
def test_registerUtility_duplicates_existing_reg(self):
from zope.interface.declarations import InterfaceClass
@@ -300,25 +290,25 @@ class ComponentsTests(_SilencePy3Deprecations):
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, UtilityRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.component is _before)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is None)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, UtilityRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.component is _before)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is None)
args, kw = _events[1]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, UtilityRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.component is _after)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is None)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, UtilityRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.component is _after)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is None)
def test_registerUtility_w_existing_subscr(self):
from zope.interface.declarations import InterfaceClass
@@ -377,8 +367,8 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterUtility(_to_reg, ifoo, _name)
- self.failIf(unreg)
- self.failIf(_events)
+ self.assertFalse(unreg)
+ self.assertFalse(_events)
def test_unregisterUtility_w_component(self):
from zope.interface.declarations import InterfaceClass
@@ -395,21 +385,21 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterUtility(_to_reg, ifoo, _name)
- self.failUnless(unreg)
- self.failIf(comp.utilities._adapters) # all erased
- self.failIf((ifoo, _name) in comp._utility_registrations)
- self.failIf(comp.utilities._subscribers)
+ self.assertTrue(unreg)
+ self.assertFalse(comp.utilities._adapters) # all erased
+ self.assertFalse((ifoo, _name) in comp._utility_registrations)
+ self.assertFalse(comp.utilities._subscribers)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, UtilityRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.component is _to_reg)
- self.failUnless(event.object.factory is None)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, UtilityRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.component is _to_reg)
+ self.assertTrue(event.object.factory is None)
def test_unregisterUtility_w_factory(self):
from zope.interface.declarations import InterfaceClass
@@ -429,18 +419,18 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterUtility(None, ifoo, _name, factory=_factory)
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, UtilityRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.component is _to_reg)
- self.failUnless(event.object.factory is _factory)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, UtilityRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.component is _to_reg)
+ self.assertTrue(event.object.factory is _factory)
def test_unregisterUtility_wo_explicit_provided(self):
from zope.interface.declarations import directlyProvides
@@ -462,19 +452,19 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterUtility(_to_reg, None, _name)
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, UtilityRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.component is _to_reg)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is None)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, UtilityRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.component is _to_reg)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is None)
def test_unregisterUtility_wo_component_or_factory(self):
from zope.interface.declarations import directlyProvides
@@ -497,19 +487,19 @@ class ComponentsTests(_SilencePy3Deprecations):
with _monkey:
# Just pass the interface / name
unreg = comp.unregisterUtility(provided=ifoo, name=_name)
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, UtilityRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.component is _to_reg)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is None)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, UtilityRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.component is _to_reg)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is None)
def test_unregisterUtility_w_existing_subscr(self):
from zope.interface.declarations import InterfaceClass
@@ -569,20 +559,20 @@ class ComponentsTests(_SilencePy3Deprecations):
comp.registerUtility(_to_reg, ifoo, _name2, _info)
reg = sorted(comp.registeredUtilities(), key=lambda r: r.name)
self.assertEqual(len(reg), 2)
- self.failUnless(isinstance(reg[0], UtilityRegistration))
- self.failUnless(reg[0].registry is comp)
- self.failUnless(reg[0].provided is ifoo)
- self.failUnless(reg[0].name is _name1)
- self.failUnless(reg[0].component is _to_reg)
- self.failUnless(reg[0].info is _info)
- self.failUnless(reg[0].factory is None)
- self.failUnless(isinstance(reg[1], UtilityRegistration))
- self.failUnless(reg[1].registry is comp)
- self.failUnless(reg[1].provided is ifoo)
- self.failUnless(reg[1].name is _name2)
- self.failUnless(reg[1].component is _to_reg)
- self.failUnless(reg[1].info is _info)
- self.failUnless(reg[1].factory is None)
+ self.assertTrue(isinstance(reg[0], UtilityRegistration))
+ self.assertTrue(reg[0].registry is comp)
+ self.assertTrue(reg[0].provided is ifoo)
+ self.assertTrue(reg[0].name is _name1)
+ self.assertTrue(reg[0].component is _to_reg)
+ self.assertTrue(reg[0].info is _info)
+ self.assertTrue(reg[0].factory is None)
+ self.assertTrue(isinstance(reg[1], UtilityRegistration))
+ self.assertTrue(reg[1].registry is comp)
+ self.assertTrue(reg[1].provided is ifoo)
+ self.assertTrue(reg[1].name is _name2)
+ self.assertTrue(reg[1].component is _to_reg)
+ self.assertTrue(reg[1].info is _info)
+ self.assertTrue(reg[1].factory is None)
def test_queryUtility_miss_no_default(self):
from zope.interface.declarations import InterfaceClass
@@ -590,7 +580,7 @@ class ComponentsTests(_SilencePy3Deprecations):
pass
ifoo = IFoo('IFoo')
comp = self._makeOne()
- self.failUnless(comp.queryUtility(ifoo) is None)
+ self.assertTrue(comp.queryUtility(ifoo) is None)
def test_queryUtility_miss_w_default(self):
from zope.interface.declarations import InterfaceClass
@@ -599,7 +589,7 @@ class ComponentsTests(_SilencePy3Deprecations):
ifoo = IFoo('IFoo')
comp = self._makeOne()
_default = object()
- self.failUnless(comp.queryUtility(ifoo, default=_default) is _default)
+ self.assertTrue(comp.queryUtility(ifoo, default=_default) is _default)
def test_queryUtility_hit(self):
from zope.interface.declarations import InterfaceClass
@@ -609,7 +599,7 @@ class ComponentsTests(_SilencePy3Deprecations):
_to_reg = object()
comp = self._makeOne()
comp.registerUtility(_to_reg, ifoo)
- self.failUnless(comp.queryUtility(ifoo) is _to_reg)
+ self.assertTrue(comp.queryUtility(ifoo) is _to_reg)
def test_getUtility_miss(self):
from zope.interface.declarations import InterfaceClass
@@ -628,7 +618,7 @@ class ComponentsTests(_SilencePy3Deprecations):
_to_reg = object()
comp = self._makeOne()
comp.registerUtility(_to_reg, ifoo)
- self.failUnless(comp.getUtility(ifoo) is _to_reg)
+ self.assertTrue(comp.getUtility(ifoo) is _to_reg)
def test_getUtilitiesFor_miss(self):
from zope.interface.declarations import InterfaceClass
@@ -715,7 +705,7 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
comp.registerAdapter(_factory, (ibar,), ifoo, _name, _info)
- self.failUnless(comp.adapters._adapters[1][ibar][ifoo][_name]
+ self.assertTrue(comp.adapters._adapters[1][ibar][ifoo][_name]
is _factory)
self.assertEqual(comp._adapter_registrations[(ibar,), ifoo, _name],
(_factory, _info))
@@ -723,14 +713,14 @@ class ComponentsTests(_SilencePy3Deprecations):
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, AdapterRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, AdapterRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _factory)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _factory)
def test_registerAdapter_no_provided_available(self):
from zope.interface.declarations import InterfaceClass
@@ -770,7 +760,7 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
comp.registerAdapter(_Factory, (ibar,), name=_name, info=_info)
- self.failUnless(comp.adapters._adapters[1][ibar][ifoo][_name]
+ self.assertTrue(comp.adapters._adapters[1][ibar][ifoo][_name]
is _Factory)
self.assertEqual(comp._adapter_registrations[(ibar,), ifoo, _name],
(_Factory, _info))
@@ -778,14 +768,14 @@ class ComponentsTests(_SilencePy3Deprecations):
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, AdapterRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, AdapterRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _Factory)
def test_registerAdapter_no_required_available(self):
from zope.interface.declarations import InterfaceClass
@@ -838,7 +828,7 @@ class ComponentsTests(_SilencePy3Deprecations):
with _monkey:
comp.registerAdapter(_Factory, [None], provided=ifoo,
name=_name, info=_info)
- self.failUnless(comp.adapters._adapters[1][Interface][ifoo][_name]
+ self.assertTrue(comp.adapters._adapters[1][Interface][ifoo][_name]
is _Factory)
self.assertEqual(comp._adapter_registrations[(Interface,), ifoo, _name],
(_Factory, _info))
@@ -846,14 +836,14 @@ class ComponentsTests(_SilencePy3Deprecations):
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, AdapterRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, AdapterRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (Interface,))
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _Factory)
def test_registerAdapter_w_required_containing_class(self):
from zope.interface.declarations import InterfaceClass
@@ -880,7 +870,7 @@ class ComponentsTests(_SilencePy3Deprecations):
with _monkey:
comp.registerAdapter(_Factory, [_Context], provided=ifoo,
name=_name, info=_info)
- self.failUnless(comp.adapters._adapters[1][_ctx_impl][ifoo][_name]
+ self.assertTrue(comp.adapters._adapters[1][_ctx_impl][ifoo][_name]
is _Factory)
self.assertEqual(comp._adapter_registrations[(_ctx_impl,), ifoo, _name],
(_Factory, _info))
@@ -888,14 +878,14 @@ class ComponentsTests(_SilencePy3Deprecations):
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, AdapterRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, AdapterRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (_ctx_impl,))
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _Factory)
def test_registerAdapter_w_required_containing_junk(self):
from zope.interface.declarations import InterfaceClass
@@ -933,7 +923,7 @@ class ComponentsTests(_SilencePy3Deprecations):
with _monkey:
comp.registerAdapter(_Factory, provided=ifoo, name=_name,
info=_info)
- self.failUnless(comp.adapters._adapters[1][ibar][ifoo][_name]
+ self.assertTrue(comp.adapters._adapters[1][ibar][ifoo][_name]
is _Factory)
self.assertEqual(comp._adapter_registrations[(ibar,), ifoo, _name],
(_Factory, _info))
@@ -941,14 +931,14 @@ class ComponentsTests(_SilencePy3Deprecations):
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, AdapterRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, AdapterRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
- self.failUnless(event.object.name is _name)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.name is _name)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _Factory)
def test_registerAdapter_wo_event(self):
from zope.interface.declarations import InterfaceClass
@@ -996,7 +986,7 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterAdapter(_Factory, (ibar,), ifoo)
- self.failIf(unreg)
+ self.assertFalse(unreg)
def test_unregisterAdapter_hit_w_explicit_provided_and_required(self):
from zope.interface.declarations import InterfaceClass
@@ -1014,21 +1004,21 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterAdapter(_Factory, (ibar,), ifoo)
- self.failUnless(unreg)
- self.failIf(comp.adapters._adapters)
- self.failIf(comp._adapter_registrations)
+ self.assertTrue(unreg)
+ self.assertFalse(comp.adapters._adapters)
+ self.assertFalse(comp._adapter_registrations)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, AdapterRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, AdapterRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, '')
self.assertEqual(event.object.info, '')
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.factory is _Factory)
def test_unregisterAdapter_wo_explicit_provided(self):
from zope.interface.declarations import InterfaceClass
@@ -1048,19 +1038,19 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterAdapter(_Factory, (ibar,))
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, AdapterRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, AdapterRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, '')
self.assertEqual(event.object.info, '')
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.factory is _Factory)
def test_unregisterAdapter_wo_explicit_required(self):
from zope.interface.declarations import InterfaceClass
@@ -1079,19 +1069,19 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterAdapter(_Factory, provided=ifoo)
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, AdapterRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, AdapterRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, '')
self.assertEqual(event.object.info, '')
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.factory is _Factory)
def test_registeredAdapters_empty(self):
comp = self._makeOne()
@@ -1116,20 +1106,20 @@ class ComponentsTests(_SilencePy3Deprecations):
comp.registerAdapter(_Factory, (ibar,), ifoo, _name2, _info)
reg = sorted(comp.registeredAdapters(), key=lambda r: r.name)
self.assertEqual(len(reg), 2)
- self.failUnless(isinstance(reg[0], AdapterRegistration))
- self.failUnless(reg[0].registry is comp)
- self.failUnless(reg[0].provided is ifoo)
+ self.assertTrue(isinstance(reg[0], AdapterRegistration))
+ self.assertTrue(reg[0].registry is comp)
+ self.assertTrue(reg[0].provided is ifoo)
self.assertEqual(reg[0].required, (ibar,))
- self.failUnless(reg[0].name is _name1)
- self.failUnless(reg[0].info is _info)
- self.failUnless(reg[0].factory is _Factory)
- self.failUnless(isinstance(reg[1], AdapterRegistration))
- self.failUnless(reg[1].registry is comp)
- self.failUnless(reg[1].provided is ifoo)
+ self.assertTrue(reg[0].name is _name1)
+ self.assertTrue(reg[0].info is _info)
+ self.assertTrue(reg[0].factory is _Factory)
+ self.assertTrue(isinstance(reg[1], AdapterRegistration))
+ self.assertTrue(reg[1].registry is comp)
+ self.assertTrue(reg[1].provided is ifoo)
self.assertEqual(reg[1].required, (ibar,))
- self.failUnless(reg[1].name is _name2)
- self.failUnless(reg[1].info is _info)
- self.failUnless(reg[1].factory is _Factory)
+ self.assertTrue(reg[1].name is _name2)
+ self.assertTrue(reg[1].info is _info)
+ self.assertTrue(reg[1].factory is _Factory)
def test_queryAdapter_miss_no_default(self):
from zope.interface.declarations import InterfaceClass
@@ -1138,7 +1128,7 @@ class ComponentsTests(_SilencePy3Deprecations):
ifoo = IFoo('IFoo')
comp = self._makeOne()
_context = object()
- self.failUnless(comp.queryAdapter(_context, ifoo) is None)
+ self.assertTrue(comp.queryAdapter(_context, ifoo) is None)
def test_queryAdapter_miss_w_default(self):
from zope.interface.declarations import InterfaceClass
@@ -1148,7 +1138,7 @@ class ComponentsTests(_SilencePy3Deprecations):
comp = self._makeOne()
_context = object()
_default = object()
- self.failUnless(
+ self.assertTrue(
comp.queryAdapter(_context, ifoo, default=_default) is _default)
def test_queryAdapter_hit(self):
@@ -1168,8 +1158,8 @@ class ComponentsTests(_SilencePy3Deprecations):
comp = self._makeOne()
comp.registerAdapter(_Factory, (ibar,), ifoo)
adapter = comp.queryAdapter(_context, ifoo)
- self.failUnless(isinstance(adapter, _Factory))
- self.failUnless(adapter.context is _context)
+ self.assertTrue(isinstance(adapter, _Factory))
+ self.assertTrue(adapter.context is _context)
def test_getAdapter_miss(self):
from zope.interface.declarations import InterfaceClass
@@ -1204,8 +1194,8 @@ class ComponentsTests(_SilencePy3Deprecations):
comp = self._makeOne()
comp.registerAdapter(_Factory, (ibar,), ifoo)
adapter = comp.getAdapter(_context, ifoo)
- self.failUnless(isinstance(adapter, _Factory))
- self.failUnless(adapter.context is _context)
+ self.assertTrue(isinstance(adapter, _Factory))
+ self.assertTrue(adapter.context is _context)
def test_queryMultiAdapter_miss(self):
from zope.interface.declarations import InterfaceClass
@@ -1245,7 +1235,7 @@ class ComponentsTests(_SilencePy3Deprecations):
_context2 = _Context2()
_default = object()
comp = self._makeOne()
- self.failUnless(
+ self.assertTrue(
comp.queryMultiAdapter((_context1, _context2), ifoo,
default=_default) is _default)
@@ -1271,7 +1261,7 @@ class ComponentsTests(_SilencePy3Deprecations):
comp = self._makeOne()
comp.registerAdapter(_Factory, (ibar, ibaz), ifoo)
adapter = comp.queryMultiAdapter((_context1, _context2), ifoo)
- self.failUnless(isinstance(adapter, _Factory))
+ self.assertTrue(isinstance(adapter, _Factory))
self.assertEqual(adapter.context, (_context1, _context2))
def test_getMultiAdapter_miss(self):
@@ -1317,7 +1307,7 @@ class ComponentsTests(_SilencePy3Deprecations):
comp = self._makeOne()
comp.registerAdapter(_Factory, (ibar, ibaz), ifoo)
adapter = comp.getMultiAdapter((_context1, _context2), ifoo)
- self.failUnless(isinstance(adapter, _Factory))
+ self.assertTrue(isinstance(adapter, _Factory))
self.assertEqual(adapter.context, (_context1, _context2))
def test_getAdapters_empty(self):
@@ -1397,9 +1387,9 @@ class ComponentsTests(_SilencePy3Deprecations):
found = sorted(comp.getAdapters((_context1, _context2), ifoo))
self.assertEqual(len(found), 2)
self.assertEqual(found[0][0], _name1)
- self.failUnless(isinstance(found[0][1], _Factory1))
+ self.assertTrue(isinstance(found[0][1], _Factory1))
self.assertEqual(found[1][0], _name2)
- self.failUnless(isinstance(found[1][1], _Factory2))
+ self.assertTrue(isinstance(found[1][1], _Factory2))
def test_registerSubscriptionAdapter_w_nonblank_name(self):
from zope.interface.declarations import InterfaceClass
@@ -1438,21 +1428,21 @@ class ComponentsTests(_SilencePy3Deprecations):
info=_info)
reg = comp.adapters._subscribers[1][ibar][ifoo][_blank]
self.assertEqual(len(reg), 1)
- self.failUnless(reg[0] is _factory)
+ self.assertTrue(reg[0] is _factory)
self.assertEqual(comp._subscription_registrations,
[((ibar,), ifoo, _blank, _factory, _info)])
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, SubscriptionRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, SubscriptionRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, _blank)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _factory)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _factory)
def test_registerSubscriptionAdapter_wo_explicit_provided(self):
from zope.interface.declarations import InterfaceClass
@@ -1477,21 +1467,21 @@ class ComponentsTests(_SilencePy3Deprecations):
comp.registerSubscriptionAdapter(_Factory, (ibar,), info=_info)
reg = comp.adapters._subscribers[1][ibar][ifoo][_blank]
self.assertEqual(len(reg), 1)
- self.failUnless(reg[0] is _Factory)
+ self.assertTrue(reg[0] is _Factory)
self.assertEqual(comp._subscription_registrations,
[((ibar,), ifoo, _blank, _Factory, _info)])
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, SubscriptionRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, SubscriptionRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, _blank)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _Factory)
def test_registerSubscriptionAdapter_wo_explicit_required(self):
from zope.interface.declarations import InterfaceClass
@@ -1515,21 +1505,21 @@ class ComponentsTests(_SilencePy3Deprecations):
_Factory, provided=ifoo, info=_info)
reg = comp.adapters._subscribers[1][ibar][ifoo][_blank]
self.assertEqual(len(reg), 1)
- self.failUnless(reg[0] is _Factory)
+ self.assertTrue(reg[0] is _Factory)
self.assertEqual(comp._subscription_registrations,
[((ibar,), ifoo, _blank, _Factory, _info)])
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, SubscriptionRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, SubscriptionRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, _blank)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _Factory)
def test_registerSubscriptionAdapter_wo_event(self):
from zope.interface.declarations import InterfaceClass
@@ -1572,20 +1562,20 @@ class ComponentsTests(_SilencePy3Deprecations):
comp.registerSubscriptionAdapter(_Factory, (ibar,), ifoo, info=_info)
reg = list(comp.registeredSubscriptionAdapters())
self.assertEqual(len(reg), 2)
- self.failUnless(isinstance(reg[0], SubscriptionRegistration))
- self.failUnless(reg[0].registry is comp)
- self.failUnless(reg[0].provided is ifoo)
+ self.assertTrue(isinstance(reg[0], SubscriptionRegistration))
+ self.assertTrue(reg[0].registry is comp)
+ self.assertTrue(reg[0].provided is ifoo)
self.assertEqual(reg[0].required, (ibar,))
self.assertEqual(reg[0].name, _blank)
- self.failUnless(reg[0].info is _info)
- self.failUnless(reg[0].factory is _Factory)
- self.failUnless(isinstance(reg[1], SubscriptionRegistration))
- self.failUnless(reg[1].registry is comp)
- self.failUnless(reg[1].provided is ifoo)
+ self.assertTrue(reg[0].info is _info)
+ self.assertTrue(reg[0].factory is _Factory)
+ self.assertTrue(isinstance(reg[1], SubscriptionRegistration))
+ self.assertTrue(reg[1].registry is comp)
+ self.assertTrue(reg[1].provided is ifoo)
self.assertEqual(reg[1].required, (ibar,))
self.assertEqual(reg[1].name, _blank)
- self.failUnless(reg[1].info is _info)
- self.failUnless(reg[1].factory is _Factory)
+ self.assertTrue(reg[1].info is _info)
+ self.assertTrue(reg[1].factory is _Factory)
def test_unregisterSubscriptionAdapter_w_nonblank_name(self):
from zope.interface.declarations import InterfaceClass
@@ -1626,8 +1616,8 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterSubscriptionAdapter(_Factory, (ibar,), ifoo)
- self.failIf(unreg)
- self.failIf(_events)
+ self.assertFalse(unreg)
+ self.assertFalse(_events)
def test_unregisterSubscriptionAdapter_hit_wo_factory(self):
from zope.interface.declarations import InterfaceClass
@@ -1645,21 +1635,21 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterSubscriptionAdapter(None, (ibar,), ifoo)
- self.failUnless(unreg)
- self.failIf(comp.adapters._subscribers)
- self.failIf(comp._subscription_registrations)
+ self.assertTrue(unreg)
+ self.assertFalse(comp.adapters._subscribers)
+ self.assertFalse(comp._subscription_registrations)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, SubscriptionRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, SubscriptionRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, '')
self.assertEqual(event.object.info, '')
- self.failUnless(event.object.factory is None)
+ self.assertTrue(event.object.factory is None)
def test_unregisterSubscriptionAdapter_hit_w_factory(self):
from zope.interface.declarations import InterfaceClass
@@ -1677,21 +1667,21 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterSubscriptionAdapter(_Factory, (ibar,), ifoo)
- self.failUnless(unreg)
- self.failIf(comp.adapters._subscribers)
- self.failIf(comp._subscription_registrations)
+ self.assertTrue(unreg)
+ self.assertFalse(comp.adapters._subscribers)
+ self.assertFalse(comp._subscription_registrations)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, SubscriptionRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, SubscriptionRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, '')
self.assertEqual(event.object.info, '')
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.factory is _Factory)
def test_unregisterSubscriptionAdapter_wo_explicit_provided(self):
from zope.interface.declarations import InterfaceClass
@@ -1711,19 +1701,19 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterSubscriptionAdapter(_Factory, (ibar,))
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, SubscriptionRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, SubscriptionRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, '')
self.assertEqual(event.object.info, '')
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.factory is _Factory)
def test_unregisterSubscriptionAdapter_wo_explicit_required(self):
from zope.interface.declarations import InterfaceClass
@@ -1742,19 +1732,19 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterSubscriptionAdapter(_Factory, provided=ifoo)
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, SubscriptionRegistration))
- self.failUnless(event.object.registry is comp)
- self.failUnless(event.object.provided is ifoo)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, SubscriptionRegistration))
+ self.assertTrue(event.object.registry is comp)
+ self.assertTrue(event.object.provided is ifoo)
self.assertEqual(event.object.required, (ibar,))
self.assertEqual(event.object.name, '')
self.assertEqual(event.object.info, '')
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.factory is _Factory)
def test_subscribers_empty(self):
from zope.interface.declarations import InterfaceClass
@@ -1795,8 +1785,8 @@ class ComponentsTests(_SilencePy3Deprecations):
return x.__class__.__name__
subscribers = sorted(subscribers, key=_klassname)
self.assertEqual(len(subscribers), 2)
- self.failUnless(isinstance(subscribers[0], _Derived))
- self.failUnless(isinstance(subscribers[1], _Factory))
+ self.assertTrue(isinstance(subscribers[0], _Derived))
+ self.assertTrue(isinstance(subscribers[1], _Factory))
def test_registerHandler_w_nonblank_name(self):
from zope.interface.declarations import InterfaceClass
@@ -1830,20 +1820,20 @@ class ComponentsTests(_SilencePy3Deprecations):
comp.registerHandler(_factory, (ifoo,), info=_info)
reg = comp.adapters._subscribers[1][ifoo][None][_blank]
self.assertEqual(len(reg), 1)
- self.failUnless(reg[0] is _factory)
+ self.assertTrue(reg[0] is _factory)
self.assertEqual(comp._handler_registrations,
[((ifoo,), _blank, _factory, _info)])
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Registered))
- self.failUnless(isinstance(event.object, HandlerRegistration))
- self.failUnless(event.object.registry is comp)
+ self.assertTrue(isinstance(event, Registered))
+ self.assertTrue(isinstance(event.object, HandlerRegistration))
+ self.assertTrue(event.object.registry is comp)
self.assertEqual(event.object.required, (ifoo,))
self.assertEqual(event.object.name, _blank)
- self.failUnless(event.object.info is _info)
- self.failUnless(event.object.factory is _factory)
+ self.assertTrue(event.object.info is _info)
+ self.assertTrue(event.object.factory is _factory)
def test_registerHandler_wo_explicit_required_no_event(self):
from zope.interface.declarations import InterfaceClass
@@ -1863,7 +1853,7 @@ class ComponentsTests(_SilencePy3Deprecations):
comp.registerHandler(_Factory, info=_info, event=False)
reg = comp.adapters._subscribers[1][ifoo][None][_blank]
self.assertEqual(len(reg), 1)
- self.failUnless(reg[0] is _Factory)
+ self.assertTrue(reg[0] is _Factory)
self.assertEqual(comp._handler_registrations,
[((ifoo,), _blank, _Factory, _info)])
self.assertEqual(len(_events), 0)
@@ -1873,7 +1863,7 @@ class ComponentsTests(_SilencePy3Deprecations):
class IFoo(InterfaceClass):
pass
comp = self._makeOne()
- self.failIf(list(comp.registeredHandlers()))
+ self.assertFalse(list(comp.registeredHandlers()))
def test_registeredHandlers_non_empty(self):
from zope.interface.declarations import InterfaceClass
@@ -1892,12 +1882,12 @@ class ComponentsTests(_SilencePy3Deprecations):
return x.factory.__code__.co_name
subscribers = sorted(comp.registeredHandlers(), key=_factory_name)
self.assertEqual(len(subscribers), 2)
- self.failUnless(isinstance(subscribers[0], HandlerRegistration))
+ self.assertTrue(isinstance(subscribers[0], HandlerRegistration))
self.assertEqual(subscribers[0].required, (ifoo,))
self.assertEqual(subscribers[0].name, '')
self.assertEqual(subscribers[0].factory, _factory1)
self.assertEqual(subscribers[0].info, '')
- self.failUnless(isinstance(subscribers[1], HandlerRegistration))
+ self.assertTrue(isinstance(subscribers[1], HandlerRegistration))
self.assertEqual(subscribers[1].required, (ifoo,))
self.assertEqual(subscribers[1].name, '')
self.assertEqual(subscribers[1].factory, _factory2)
@@ -1929,7 +1919,7 @@ class ComponentsTests(_SilencePy3Deprecations):
ifoo = IFoo('IFoo')
comp = self._makeOne()
unreg = comp.unregisterHandler(required=(ifoo,))
- self.failIf(unreg)
+ self.assertFalse(unreg)
def test_unregisterHandler_hit_w_factory_and_explicit_provided(self):
from zope.interface.declarations import InterfaceClass
@@ -1947,17 +1937,17 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterHandler(_factory, (ifoo,))
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, HandlerRegistration))
- self.failUnless(event.object.registry is comp)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, HandlerRegistration))
+ self.assertTrue(event.object.registry is comp)
self.assertEqual(event.object.required, (ifoo,))
self.assertEqual(event.object.name, '')
- self.failUnless(event.object.factory is _factory)
+ self.assertTrue(event.object.factory is _factory)
def test_unregisterHandler_hit_w_only_explicit_provided(self):
from zope.interface.declarations import InterfaceClass
@@ -1975,17 +1965,17 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterHandler(required=(ifoo,))
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, HandlerRegistration))
- self.failUnless(event.object.registry is comp)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, HandlerRegistration))
+ self.assertTrue(event.object.registry is comp)
self.assertEqual(event.object.required, (ifoo,))
self.assertEqual(event.object.name, '')
- self.failUnless(event.object.factory is None)
+ self.assertTrue(event.object.factory is None)
def test_unregisterHandler_wo_explicit_required(self):
from zope.interface.declarations import InterfaceClass
@@ -2003,18 +1993,18 @@ class ComponentsTests(_SilencePy3Deprecations):
_monkey, _events = self._wrapEvents()
with _monkey:
unreg = comp.unregisterHandler(_Factory)
- self.failUnless(unreg)
+ self.assertTrue(unreg)
self.assertEqual(len(_events), 1)
args, kw = _events[0]
event, = args
self.assertEqual(kw, {})
- self.failUnless(isinstance(event, Unregistered))
- self.failUnless(isinstance(event.object, HandlerRegistration))
- self.failUnless(event.object.registry is comp)
+ self.assertTrue(isinstance(event, Unregistered))
+ self.assertTrue(isinstance(event.object, HandlerRegistration))
+ self.assertTrue(event.object.registry is comp)
self.assertEqual(event.object.required, (ifoo,))
self.assertEqual(event.object.name, '')
self.assertEqual(event.object.info, '')
- self.failUnless(event.object.factory is _Factory)
+ self.assertTrue(event.object.factory is _Factory)
def test_handle_empty(self):
from zope.interface.declarations import InterfaceClass
@@ -2057,7 +2047,7 @@ class ComponentsTests(_SilencePy3Deprecations):
# callers (Component.registerUtility, Component.registerAdapter).
-class UtilityRegistrationTests(_SilencePy3Deprecations):
+class UtilityRegistrationTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.registry import UtilityRegistration
@@ -2131,49 +2121,49 @@ class UtilityRegistrationTests(_SilencePy3Deprecations):
def test___eq___identity(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
- self.failUnless(ur == ur)
+ self.assertTrue(ur == ur)
def test___eq___hit(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component)
- self.failUnless(ur == ur2)
+ self.assertTrue(ur == ur2)
def test___eq___miss(self):
_component = object()
_component2 = object()
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component2)
- self.failIf(ur == ur2)
+ self.assertFalse(ur == ur2)
def test___ne___identity(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
- self.failIf(ur != ur)
+ self.assertFalse(ur != ur)
def test___ne___hit(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component)
- self.failIf(ur != ur2)
+ self.assertFalse(ur != ur2)
def test___ne___miss(self):
_component = object()
_component2 = object()
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component2)
- self.failUnless(ur != ur2)
+ self.assertTrue(ur != ur2)
def test___lt___identity(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
- self.failIf(ur < ur)
+ self.assertFalse(ur < ur)
def test___lt___hit(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component)
- self.failIf(ur < ur2)
+ self.assertFalse(ur < ur2)
def test___lt___miss(self):
_component = object()
@@ -2181,18 +2171,18 @@ class UtilityRegistrationTests(_SilencePy3Deprecations):
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component2)
ur2.name = _name + '2'
- self.failUnless(ur < ur2)
+ self.assertTrue(ur < ur2)
def test___le___identity(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
- self.failUnless(ur <= ur)
+ self.assertTrue(ur <= ur)
def test___le___hit(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component)
- self.failUnless(ur <= ur2)
+ self.assertTrue(ur <= ur2)
def test___le___miss(self):
_component = object()
@@ -2200,12 +2190,12 @@ class UtilityRegistrationTests(_SilencePy3Deprecations):
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component2)
ur2.name = _name + '2'
- self.failUnless(ur <= ur2)
+ self.assertTrue(ur <= ur2)
def test___gt___identity(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
- self.failIf(ur > ur)
+ self.assertFalse(ur > ur)
def test___gt___hit(self):
_component = object()
@@ -2213,18 +2203,18 @@ class UtilityRegistrationTests(_SilencePy3Deprecations):
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component2)
ur2.name = _name + '2'
- self.failUnless(ur2 > ur)
+ self.assertTrue(ur2 > ur)
def test___gt___miss(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component)
- self.failIf(ur2 > ur)
+ self.assertFalse(ur2 > ur)
def test___ge___identity(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
- self.failUnless(ur >= ur)
+ self.assertTrue(ur >= ur)
def test___ge___miss(self):
_component = object()
@@ -2232,17 +2222,17 @@ class UtilityRegistrationTests(_SilencePy3Deprecations):
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component2)
ur2.name = _name + '2'
- self.failIf(ur >= ur2)
+ self.assertFalse(ur >= ur2)
def test___ge___hit(self):
_component = object()
ur, _registry, _name = self._makeOne(_component)
ur2, _, _ = self._makeOne(_component)
ur2.name = _name + '2'
- self.failUnless(ur2 >= ur)
+ self.assertTrue(ur2 >= ur)
-class AdapterRegistrationTests(_SilencePy3Deprecations):
+class AdapterRegistrationTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.registry import AdapterRegistration
@@ -2317,38 +2307,38 @@ class AdapterRegistrationTests(_SilencePy3Deprecations):
def test___eq___identity(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
- self.failUnless(ar == ar)
+ self.assertTrue(ar == ar)
def test___eq___hit(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component)
- self.failUnless(ar == ar2)
+ self.assertTrue(ar == ar2)
def test___eq___miss(self):
_component = object()
_component2 = object()
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component2)
- self.failIf(ar == ar2)
+ self.assertFalse(ar == ar2)
def test___ne___identity(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
- self.failIf(ar != ar)
+ self.assertFalse(ar != ar)
def test___ne___miss(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component)
- self.failIf(ar != ar2)
+ self.assertFalse(ar != ar2)
def test___ne___hit_component(self):
_component = object()
_component2 = object()
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component2)
- self.failUnless(ar != ar2)
+ self.assertTrue(ar != ar2)
def test___ne___hit_provided(self):
from zope.interface.declarations import InterfaceClass
@@ -2359,7 +2349,7 @@ class AdapterRegistrationTests(_SilencePy3Deprecations):
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component)
ar2.provided = ibaz
- self.failUnless(ar != ar2)
+ self.assertTrue(ar != ar2)
def test___ne___hit_required(self):
from zope.interface.declarations import InterfaceClass
@@ -2371,18 +2361,18 @@ class AdapterRegistrationTests(_SilencePy3Deprecations):
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component2)
ar2.required = (ibaz,)
- self.failUnless(ar != ar2)
+ self.assertTrue(ar != ar2)
def test___lt___identity(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
- self.failIf(ar < ar)
+ self.assertFalse(ar < ar)
def test___lt___hit(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component)
- self.failIf(ar < ar2)
+ self.assertFalse(ar < ar2)
def test___lt___miss(self):
_component = object()
@@ -2390,18 +2380,18 @@ class AdapterRegistrationTests(_SilencePy3Deprecations):
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component2)
ar2.name = _name + '2'
- self.failUnless(ar < ar2)
+ self.assertTrue(ar < ar2)
def test___le___identity(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
- self.failUnless(ar <= ar)
+ self.assertTrue(ar <= ar)
def test___le___hit(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component)
- self.failUnless(ar <= ar2)
+ self.assertTrue(ar <= ar2)
def test___le___miss(self):
_component = object()
@@ -2409,12 +2399,12 @@ class AdapterRegistrationTests(_SilencePy3Deprecations):
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component2)
ar2.name = _name + '2'
- self.failUnless(ar <= ar2)
+ self.assertTrue(ar <= ar2)
def test___gt___identity(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
- self.failIf(ar > ar)
+ self.assertFalse(ar > ar)
def test___gt___hit(self):
_component = object()
@@ -2422,18 +2412,18 @@ class AdapterRegistrationTests(_SilencePy3Deprecations):
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component2)
ar2.name = _name + '2'
- self.failUnless(ar2 > ar)
+ self.assertTrue(ar2 > ar)
def test___gt___miss(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component)
- self.failIf(ar2 > ar)
+ self.assertFalse(ar2 > ar)
def test___ge___identity(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
- self.failUnless(ar >= ar)
+ self.assertTrue(ar >= ar)
def test___ge___miss(self):
_component = object()
@@ -2441,14 +2431,14 @@ class AdapterRegistrationTests(_SilencePy3Deprecations):
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component2)
ar2.name = _name + '2'
- self.failIf(ar >= ar2)
+ self.assertFalse(ar >= ar2)
def test___ge___hit(self):
_component = object()
ar, _registry, _name = self._makeOne(_component)
ar2, _, _ = self._makeOne(_component)
ar2.name = _name + '2'
- self.failUnless(ar2 >= ar)
+ self.assertTrue(ar2 >= ar)
class SubscriptionRegistrationTests(unittest.TestCase):
@@ -2488,7 +2478,7 @@ class SubscriptionRegistrationTests(unittest.TestCase):
verifyObject(ISubscriptionAdapterRegistration, sar)
-class HandlerRegistrationTests(_SilencePy3Deprecations):
+class HandlerRegistrationTests(unittest.TestCase):
def _getTargetClass(self):
from zope.interface.registry import HandlerRegistration
@@ -2527,9 +2517,9 @@ class HandlerRegistrationTests(_SilencePy3Deprecations):
def _factory(context):
pass
hr, _, _ = self._makeOne(_factory)
- self.failUnless(hr.handler is _factory)
- self.failUnless(hr.factory is hr.handler)
- self.failUnless(hr.provided is None)
+ self.assertTrue(hr.handler is _factory)
+ self.assertTrue(hr.factory is hr.handler)
+ self.assertTrue(hr.provided is None)
def test___repr___factory_w_name(self):
class _Factory(object):
View Lorry Controller Status