convert usage of fail* to assert*

This commit is contained in:
Benjamin Peterson 2009-06-30 22:57:08 +00:00
parent be96cf608f
commit 5c8da86f3a
268 changed files with 5017 additions and 5017 deletions

View file

@ -75,7 +75,7 @@ class TestCase(unittest.TestCase):
seq = range(10)
it = iter(seq)
it2 = iter(it)
self.assert_(it is it2)
self.assertTrue(it is it2)
# Test that for loops over iterators work
def test_iter_for_loop(self):
@ -566,23 +566,23 @@ class TestCase(unittest.TestCase):
def test_in_and_not_in(self):
for sc5 in IteratingSequenceClass(5), SequenceClass(5):
for i in range(5):
self.assert_(i in sc5)
self.assertTrue(i in sc5)
for i in "abc", -1, 5, 42.42, (3, 4), [], {1: 1}, 3-12j, sc5:
self.assert_(i not in sc5)
self.assertTrue(i not in sc5)
self.assertRaises(TypeError, lambda: 3 in 12)
self.assertRaises(TypeError, lambda: 3 not in map)
d = {"one": 1, "two": 2, "three": 3, 1j: 2j}
for k in d:
self.assert_(k in d)
self.assert_(k not in d.itervalues())
self.assertTrue(k in d)
self.assertTrue(k not in d.itervalues())
for v in d.values():
self.assert_(v in d.itervalues())
self.assert_(v not in d)
self.assertTrue(v in d.itervalues())
self.assertTrue(v not in d)
for k, v in d.iteritems():
self.assert_((k, v) in d.iteritems())
self.assert_((v, k) not in d.iteritems())
self.assertTrue((k, v) in d.iteritems())
self.assertTrue((v, k) not in d.iteritems())
f = open(TESTFN, "w")
try:
@ -593,9 +593,9 @@ class TestCase(unittest.TestCase):
try:
for chunk in "abc":
f.seek(0, 0)
self.assert_(chunk not in f)
self.assertTrue(chunk not in f)
f.seek(0, 0)
self.assert_((chunk + "\n") in f)
self.assertTrue((chunk + "\n") in f)
finally:
f.close()
try: