Merged revisions 73715 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

........
  r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line

  convert old fail* assertions to assert*
........
This commit is contained in:
Georg Brandl 2009-08-13 08:51:18 +00:00
parent ef82be368a
commit ab91fdef1f
274 changed files with 4538 additions and 4538 deletions

View file

@ -130,14 +130,14 @@ class TestBisect(unittest.TestCase):
elem = randrange(-1, n+1)
ip = self.module.bisect_left(data, elem)
if ip < len(data):
self.failUnless(elem <= data[ip])
self.assertTrue(elem <= data[ip])
if ip > 0:
self.failUnless(data[ip-1] < elem)
self.assertTrue(data[ip-1] < elem)
ip = self.module.bisect_right(data, elem)
if ip < len(data):
self.failUnless(elem < data[ip])
self.assertTrue(elem < data[ip])
if ip > 0:
self.failUnless(data[ip-1] <= elem)
self.assertTrue(data[ip-1] <= elem)
def test_optionalSlicing(self):
for func, data, elem, expected in self.precomputedCases:
@ -146,15 +146,15 @@ class TestBisect(unittest.TestCase):
for hi in range(3,8):
hi = min(len(data), hi)
ip = func(data, elem, lo, hi)
self.failUnless(lo <= ip <= hi)
self.assertTrue(lo <= ip <= hi)
if func is self.module.bisect_left and ip < hi:
self.failUnless(elem <= data[ip])
self.assertTrue(elem <= data[ip])
if func is self.module.bisect_left and ip > lo:
self.failUnless(data[ip-1] < elem)
self.assertTrue(data[ip-1] < elem)
if func is self.module.bisect_right and ip < hi:
self.failUnless(elem < data[ip])
self.assertTrue(elem < data[ip])
if func is self.module.bisect_right and ip > lo:
self.failUnless(data[ip-1] <= elem)
self.assertTrue(data[ip-1] <= elem)
self.assertEqual(ip, max(lo, min(hi, expected)))
def test_backcompatibility(self):