convert usage of fail* to assert*
diff --git a/Lib/test/test_contains.py b/Lib/test/test_contains.py
index 0d54099..73e0685 100644
--- a/Lib/test/test_contains.py
+++ b/Lib/test/test_contains.py
@@ -20,57 +20,57 @@
a = base_set(1)
b = set(1)
c = seq(1)
- self.assert_(1 in b)
- self.assert_(0 not in b)
- self.assert_(1 in c)
- self.assert_(0 not in c)
+ self.assertTrue(1 in b)
+ self.assertTrue(0 not in b)
+ self.assertTrue(1 in c)
+ self.assertTrue(0 not in c)
self.assertRaises(TypeError, lambda: 1 in a)
self.assertRaises(TypeError, lambda: 1 not in a)
# test char in string
- self.assert_('c' in 'abc')
- self.assert_('d' not in 'abc')
+ self.assertTrue('c' in 'abc')
+ self.assertTrue('d' not in 'abc')
- self.assert_('' in '')
- self.assert_('' in 'abc')
+ self.assertTrue('' in '')
+ self.assertTrue('' in 'abc')
self.assertRaises(TypeError, lambda: None in 'abc')
if have_unicode:
def test_char_in_unicode(self):
- self.assert_('c' in unicode('abc'))
- self.assert_('d' not in unicode('abc'))
+ self.assertTrue('c' in unicode('abc'))
+ self.assertTrue('d' not in unicode('abc'))
- self.assert_('' in unicode(''))
- self.assert_(unicode('') in '')
- self.assert_(unicode('') in unicode(''))
- self.assert_('' in unicode('abc'))
- self.assert_(unicode('') in 'abc')
- self.assert_(unicode('') in unicode('abc'))
+ self.assertTrue('' in unicode(''))
+ self.assertTrue(unicode('') in '')
+ self.assertTrue(unicode('') in unicode(''))
+ self.assertTrue('' in unicode('abc'))
+ self.assertTrue(unicode('') in 'abc')
+ self.assertTrue(unicode('') in unicode('abc'))
self.assertRaises(TypeError, lambda: None in unicode('abc'))
# test Unicode char in Unicode
- self.assert_(unicode('c') in unicode('abc'))
- self.assert_(unicode('d') not in unicode('abc'))
+ self.assertTrue(unicode('c') in unicode('abc'))
+ self.assertTrue(unicode('d') not in unicode('abc'))
# test Unicode char in string
- self.assert_(unicode('c') in 'abc')
- self.assert_(unicode('d') not in 'abc')
+ self.assertTrue(unicode('c') in 'abc')
+ self.assertTrue(unicode('d') not in 'abc')
def test_builtin_sequence_types(self):
# a collection of tests on builtin sequence types
a = range(10)
for i in a:
- self.assert_(i in a)
- self.assert_(16 not in a)
- self.assert_(a not in a)
+ self.assertTrue(i in a)
+ self.assertTrue(16 not in a)
+ self.assertTrue(a not in a)
a = tuple(a)
for i in a:
- self.assert_(i in a)
- self.assert_(16 not in a)
- self.assert_(a not in a)
+ self.assertTrue(i in a)
+ self.assertTrue(16 not in a)
+ self.assertTrue(a not in a)
class Deviant1:
"""Behaves strangely when compared
@@ -86,7 +86,7 @@
self.aList.remove(14)
return 1
- self.assert_(Deviant1() not in Deviant1.aList)
+ self.assertTrue(Deviant1() not in Deviant1.aList)
class Deviant2:
"""Behaves strangely when compared
@@ -99,7 +99,7 @@
raise RuntimeError, "gotcha"
try:
- self.assert_(Deviant2() not in a)
+ self.assertTrue(Deviant2() not in a)
except TypeError:
pass