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

@ -76,7 +76,7 @@ class TestBasicOps(unittest.TestCase):
def test_iteration(self):
for v in self.set:
self.assert_(v in self.values)
self.assertTrue(v in self.values)
def test_pickling(self):
p = pickle.dumps(self.set)
@ -107,10 +107,10 @@ class TestBasicOpsSingleton(TestBasicOps):
self.repr = "Set([3])"
def test_in(self):
self.failUnless(3 in self.set)
self.assertTrue(3 in self.set)
def test_not_in(self):
self.failUnless(2 not in self.set)
self.assertTrue(2 not in self.set)
#------------------------------------------------------------------------------
@ -124,10 +124,10 @@ class TestBasicOpsTuple(TestBasicOps):
self.repr = "Set([(0, 'zero')])"
def test_in(self):
self.failUnless((0, "zero") in self.set)
self.assertTrue((0, "zero") in self.set)
def test_not_in(self):
self.failUnless(9 not in self.set)
self.assertTrue(9 not in self.set)
#------------------------------------------------------------------------------
@ -406,7 +406,7 @@ class TestMutate(unittest.TestCase):
popped[self.set.pop()] = None
self.assertEqual(len(popped), len(self.values))
for v in self.values:
self.failUnless(v in popped)
self.assertTrue(v in popped)
def test_update_empty_tuple(self):
self.set.union_update(())
@ -683,7 +683,7 @@ class TestCopying(unittest.TestCase):
set_list = list(self.set); set_list.sort()
self.assertEqual(len(dup_list), len(set_list))
for i in range(len(dup_list)):
self.failUnless(dup_list[i] is set_list[i])
self.assertTrue(dup_list[i] is set_list[i])
def test_deep_copy(self):
dup = copy.deepcopy(self.set)
@ -733,13 +733,13 @@ class TestIdentities(unittest.TestCase):
def test_binopsVsSubsets(self):
a, b = self.a, self.b
self.assert_(a - b <= a)
self.assert_(b - a <= b)
self.assert_(a & b <= a)
self.assert_(a & b <= b)
self.assert_(a | b >= a)
self.assert_(a | b >= b)
self.assert_(a ^ b <= a | b)
self.assertTrue(a - b <= a)
self.assertTrue(b - a <= b)
self.assertTrue(a & b <= a)
self.assertTrue(a & b <= b)
self.assertTrue(a | b >= a)
self.assertTrue(a | b >= b)
self.assertTrue(a ^ b <= a | b)
def test_commutativity(self):
a, b = self.a, self.b
@ -755,9 +755,9 @@ class TestIdentities(unittest.TestCase):
self.assertEqual(a - a, zero)
self.assertEqual(a | a, a)
self.assertEqual(a & a, a)
self.assert_(a <= a)
self.assert_(a >= a)
self.assert_(a == a)
self.assertTrue(a <= a)
self.assertTrue(a >= a)
self.assertTrue(a == a)
def test_summations(self):
# check that sums of parts equal the whole