From 363f6d65a764ace00524e96da78055c8e2ef9cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Walter=20D=C3=B6rwald?= Date: Mon, 3 Feb 2003 20:17:19 +0000 Subject: [PATCH] Port test_pow.py to PyUnit. From SF patch #662807 --- Lib/test/output/test_pow | 25 ----- Lib/test/test_pow.py | 214 ++++++++++++++++++--------------------- 2 files changed, 100 insertions(+), 139 deletions(-) delete mode 100644 Lib/test/output/test_pow diff --git a/Lib/test/output/test_pow b/Lib/test/output/test_pow deleted file mode 100644 index 96499368569..00000000000 --- a/Lib/test/output/test_pow +++ /dev/null @@ -1,25 +0,0 @@ -test_pow -Testing integer mode... - Testing 2-argument pow() function... - Testing 3-argument pow() function... -Testing long integer mode... - Testing 2-argument pow() function... - Testing 3-argument pow() function... -Testing floating point mode... - Testing 3-argument pow() function... -The number in both columns should match. -3 3 --5 -5 --1 -1 -5 5 --3 -3 --7 -7 - -3L 3L --5L -5L --1L -1L -5L 5L --3L -3L --7L -7L - - diff --git a/Lib/test/test_pow.py b/Lib/test/test_pow.py index e88a63d08eb..83696db3f1e 100644 --- a/Lib/test/test_pow.py +++ b/Lib/test/test_pow.py @@ -1,125 +1,111 @@ -import sys -from test import test_support +import test.test_support, unittest +class PowTest(unittest.TestCase): -def powtest(type): - if type != float: - print " Testing 2-argument pow() function..." - for i in range(-1000, 1000): - if pow(type(i), 0) != 1: - raise ValueError, 'pow('+str(i)+',0) != 1' - if pow(type(i), 1) != type(i): - raise ValueError, 'pow('+str(i)+',1) != '+str(i) - if pow(type(0), 1) != type(0): - raise ValueError, 'pow(0,'+str(i)+') != 0' - if pow(type(1), 1) != type(1): - raise ValueError, 'pow(1,'+str(i)+') != 1' + 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)) - for i in range(-100, 100): - if pow(type(i), 3) != i*i*i: - raise ValueError, 'pow('+str(i)+',3) != '+str(i*i*i) + for i in range(-100, 100): + self.assertEquals(pow(type(i), 3), i*i*i) - pow2 = 1 - for i in range(0,31): - if pow(2, i) != pow2: - raise ValueError, 'pow(2,'+str(i)+') != '+str(pow2) - if i != 30 : pow2 = pow2*2 + pow2 = 1 + for i in range(0,31): + self.assertEquals(pow(2, i), pow2) + if i != 30 : pow2 = pow2*2 - for othertype in int, long: - for i in range(-10, 0) + range(1, 10): - ii = type(i) - for j in range(1, 11): - jj = -othertype(j) - try: + for othertype in int, long: + for i in range(-10, 0) + range(1, 10): + ii = type(i) + for j in range(1, 11): + jj = -othertype(j) pow(ii, jj) - except ValueError: - raise ValueError, "pow(%s, %s) failed" % (ii, jj) - for othertype in int, long, float: - for i in range(1, 100): - zero = type(0) - exp = -othertype(i/10.0) - if exp == 0: - continue - try: - pow(zero, exp) - except ZeroDivisionError: - pass # taking zero to any negative exponent should fail - else: - raise ValueError, "pow(%s, %s) did not fail" % (zero, exp) + for othertype in int, long, float: + for i in range(1, 100): + zero = type(0) + exp = -othertype(i/10.0) + if exp == 0: + continue + self.assertRaises(ZeroDivisionError, pow, zero, exp) - print " Testing 3-argument pow() function..." - il, ih = -20, 20 - jl, jh = -5, 5 - kl, kh = -10, 10 - compare = cmp - if type == float: - il = 1 - compare = test_support.fcmp - elif type == int: - jl = 0 - elif type == long: - jl, jh = 0, 15 - for i in range(il, ih+1): - for j in range(jl, jh+1): - for k in range(kl, kh+1): - if k != 0: - if type == float or j < 0: - try: - pow(type(i),j,k) - except TypeError: - pass - else: - raise ValueError, "expected TypeError from " + \ - "pow%r" % ((type(i), j, k),) - continue - if compare(pow(type(i),j,k), pow(type(i),j)% type(k)): - raise ValueError, "pow(" +str(i)+ "," +str(j)+ \ - "," +str(k)+ ") != pow(" +str(i)+ "," + \ - str(j)+ ") % " +str(k) + il, ih = -20, 20 + jl, jh = -5, 5 + kl, kh = -10, 10 + asseq = self.assertEqual + if type == float: + il = 1 + asseq = self.assertAlmostEqual + elif type == int: + jl = 0 + elif type == long: + jl, jh = 0, 15 + for i in range(il, ih+1): + for j in range(jl, jh+1): + for k in range(kl, kh+1): + if k != 0: + if type == float or j < 0: + self.assertRaises(TypeError, pow, type(i), j, k) + continue + asseq( + pow(type(i),j,k), + pow(type(i),j)% type(k) + ) + + def test_powint(self): + self.powtest(int) + + def test_powlong(self): + self.powtest(long) + + def test_powfloat(self): + self.powtest(float) + + 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.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)) + + 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( + pow(i,j) % k, + pow(i,j,k) + ) + if j >= 0 and k != 0: + self.assertEquals( + pow(long(i),j) % k, + pow(long(i),j,k) + ) + + def test_bug643260(self): + class TestRpow: + def __rpow__(self, other): + return None + None ** TestRpow() # Won't fail when __rpow__ invoked. SF bug #643260. -print 'Testing integer mode...' -powtest(int) -print 'Testing long integer mode...' -powtest(long) -print 'Testing floating point mode...' -powtest(float) +def test_main(): + suite = unittest.TestSuite() + suite.addTest(unittest.makeSuite(PowTest)) + test.test_support.run_suite(suite) -# Other tests-- not very systematic - -print 'The number in both columns should match.' -print `pow(3,3) % 8`, `pow(3,3,8)` -print `pow(3,3) % -8`, `pow(3,3,-8)` -print `pow(3,2) % -2`, `pow(3,2,-2)` -print `pow(-3,3) % 8`, `pow(-3,3,8)` -print `pow(-3,3) % -8`, `pow(-3,3,-8)` -print `pow(5,2) % -8`, `pow(5,2,-8)` -print - -print `pow(3L,3L) % 8`, `pow(3L,3L,8)` -print `pow(3L,3L) % -8`, `pow(3L,3L,-8)` -print `pow(3L,2) % -2`, `pow(3L,2,-2)` -print `pow(-3L,3L) % 8`, `pow(-3L,3L,8)` -print `pow(-3L,3L) % -8`, `pow(-3L,3L,-8)` -print `pow(5L,2) % -8`, `pow(5L,2,-8)` -print - -print - -for i in range(-10, 11): - for j in range(0, 6): - for k in range(-7, 11): - if j >= 0 and k != 0: - o = pow(i,j) % k - n = pow(i,j,k) - if o != n: print 'Integer mismatch:', i,j,k - if j >= 0 and k != 0: - o = pow(long(i),j) % k - n = pow(long(i),j,k) - if o != n: print 'Integer mismatch:', i,j,k - -class TestRpow: - def __rpow__(self, other): - return None -None ** TestRpow() # Won't fail when __rpow__ invoked. SF bug #643260. +if __name__ == "__main__": + test_main()