mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 86596 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line

  #9424: Replace deprecated assert* methods in the Python test suite.
........
This commit is contained in:
Ezio Melotti 2010-11-21 13:34:58 +00:00
parent 40a92f5c65
commit 2623a37852
184 changed files with 2328 additions and 2326 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Lib/test/test_pow.py
View file

@ -5,17 +5,17 @@ class PowTest(unittest.TestCase):
def powtest(self, type):
if type != float:
for i in range(-1000, 1000):
self.assertEquals(pow(type(i), 0), 1)
self.assertEquals(pow(type(i), 1), type(i))
self.assertEquals(pow(type(0), 1), type(0))
self.assertEquals(pow(type(1), 1), type(1))
self.assertEqual(pow(type(i), 0), 1)
self.assertEqual(pow(type(i), 1), type(i))
self.assertEqual(pow(type(0), 1), type(0))
self.assertEqual(pow(type(1), 1), type(1))
for i in range(-100, 100):
self.assertEquals(pow(type(i), 3), i*i*i)
self.assertEqual(pow(type(i), 3), i*i*i)
pow2 = 1
for i in range(0,31):
self.assertEquals(pow(2, i), pow2)
self.assertEqual(pow(2, i), pow2)
if i != 30 : pow2 = pow2*2
for othertype in int, long:
@ -67,30 +67,30 @@ class PowTest(unittest.TestCase):
def test_other(self):
# Other tests-- not very systematic
self.assertEquals(pow(3,3) % 8, pow(3,3,8))
self.assertEquals(pow(3,3) % -8, pow(3,3,-8))
self.assertEquals(pow(3,2) % -2, pow(3,2,-2))
self.assertEquals(pow(-3,3) % 8, pow(-3,3,8))
self.assertEquals(pow(-3,3) % -8, pow(-3,3,-8))
self.assertEquals(pow(5,2) % -8, pow(5,2,-8))
self.assertEqual(pow(3,3) % 8, pow(3,3,8))
self.assertEqual(pow(3,3) % -8, pow(3,3,-8))
self.assertEqual(pow(3,2) % -2, pow(3,2,-2))
self.assertEqual(pow(-3,3) % 8, pow(-3,3,8))
self.assertEqual(pow(-3,3) % -8, pow(-3,3,-8))
self.assertEqual(pow(5,2) % -8, pow(5,2,-8))
self.assertEquals(pow(3L,3L) % 8, pow(3L,3L,8))
self.assertEquals(pow(3L,3L) % -8, pow(3L,3L,-8))
self.assertEquals(pow(3L,2) % -2, pow(3L,2,-2))
self.assertEquals(pow(-3L,3L) % 8, pow(-3L,3L,8))
self.assertEquals(pow(-3L,3L) % -8, pow(-3L,3L,-8))
self.assertEquals(pow(5L,2) % -8, pow(5L,2,-8))
self.assertEqual(pow(3L,3L) % 8, pow(3L,3L,8))
self.assertEqual(pow(3L,3L) % -8, pow(3L,3L,-8))
self.assertEqual(pow(3L,2) % -2, pow(3L,2,-2))
self.assertEqual(pow(-3L,3L) % 8, pow(-3L,3L,8))
self.assertEqual(pow(-3L,3L) % -8, pow(-3L,3L,-8))
self.assertEqual(pow(5L,2) % -8, pow(5L,2,-8))
for i in range(-10, 11):
for j in range(0, 6):
for k in range(-7, 11):
if j >= 0 and k != 0:
self.assertEquals(
self.assertEqual(
pow(i,j) % k,
pow(i,j,k)
)
if j >= 0 and k != 0:
self.assertEquals(
self.assertEqual(
pow(long(i),j) % k,
pow(long(i),j,k)
)
@ -104,7 +104,7 @@ class PowTest(unittest.TestCase):
def test_bug705231(self):
# -1.0 raised to an integer should never blow up. It did if the
# platform pow() was buggy, and Python didn't worm around it.
eq = self.assertEquals
eq = self.assertEqual
a = -1.0
# The next two tests can still fail if the platform floor()
# function doesn't treat all large inputs as integers