? test_charmapcodec_old.py ? test_userdict_old.py ? test_pow_old.py Index: test_charmapcodec.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_charmapcodec.py,v retrieving revision 1.5 diff -u -r1.5 test_charmapcodec.py --- test_charmapcodec.py 23 Aug 2001 18:57:01 -0000 1.5 +++ test_charmapcodec.py 5 Jan 2003 20:39:25 -0000 @@ -8,36 +8,40 @@ (c) Copyright 2000 Guido van Rossum. """#" - -def check(a, b): - if a != b: - print '*** check failed: %s != %s' % (repr(a), repr(b)) - else: - print '%s == %s: OK' % (a, b) + +import test.test_support, unittest # test codec's full path name (see test/testcodec.py) codecname = 'test.testcodec' -check(unicode('abc', codecname), u'abc') -check(unicode('xdef', codecname), u'abcdef') -check(unicode('defx', codecname), u'defabc') -check(unicode('dxf', codecname), u'dabcf') -check(unicode('dxfx', codecname), u'dabcfabc') - -check(u'abc'.encode(codecname), 'abc') -check(u'xdef'.encode(codecname), 'abcdef') -check(u'defx'.encode(codecname), 'defabc') -check(u'dxf'.encode(codecname), 'dabcf') -check(u'dxfx'.encode(codecname), 'dabcfabc') - -check(unicode('ydef', codecname), u'def') -check(unicode('defy', codecname), u'def') -check(unicode('dyf', codecname), u'df') -check(unicode('dyfy', codecname), u'df') - -try: - unicode('abc\001', codecname) -except UnicodeError: - print '\\001 maps to undefined: OK' -else: - print '*** check failed: \\001 does not map to undefined' +class CharmapCodecTest(unittest.TestCase): + def test_constructorx(self): + self.assertEquals(unicode('abc', codecname), u'abc') + self.assertEquals(unicode('xdef', codecname), u'abcdef') + self.assertEquals(unicode('defx', codecname), u'defabc') + self.assertEquals(unicode('dxf', codecname), u'dabcf') + self.assertEquals(unicode('dxfx', codecname), u'dabcfabc') + + def test_encodex(self): + self.assertEquals(u'abc'.encode(codecname), 'abc') + self.assertEquals(u'xdef'.encode(codecname), 'abcdef') + self.assertEquals(u'defx'.encode(codecname), 'defabc') + self.assertEquals(u'dxf'.encode(codecname), 'dabcf') + self.assertEquals(u'dxfx'.encode(codecname), 'dabcfabc') + + def test_constructory(self): + self.assertEquals(unicode('ydef', codecname), u'def') + self.assertEquals(unicode('defy', codecname), u'def') + self.assertEquals(unicode('dyf', codecname), u'df') + self.assertEquals(unicode('dyfy', codecname), u'df') + + def test_maptoundefined(self): + self.assertRaises(UnicodeError, unicode, 'abc\001', codecname) + +def test_main(): + suite = unittest.TestSuite() + suite.addTest(unittest.makeSuite(CharmapCodecTest)) + test.test_support.run_suite(suite) + +if __name__ == "__main__": + test_main() Index: test_pow.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_pow.py,v retrieving revision 1.16 diff -u -r1.16 test_pow.py --- test_pow.py 7 Dec 2002 10:05:27 -0000 1.16 +++ test_pow.py 5 Jan 2003 20:39:26 -0000 @@ -1,125 +1,110 @@ -import sys -from test import test_support +import test.test_support, unittest - -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' - - for i in range(-100, 100): - if pow(type(i), 3) != i*i*i: - raise ValueError, 'pow('+str(i)+',3) != '+str(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 - - 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: +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)) + + for i in range(-100, 100): + self.assertEquals(pow(type(i), 3), i*i*i) + + 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) 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) - - 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) - - -print 'Testing integer mode...' -powtest(int) -print 'Testing long integer mode...' -powtest(long) -print 'Testing floating point mode...' -powtest(float) - -# 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. + + 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) + + il, ih = -20, 20 + jl, jh = -5, 5 + kl, kh = -10, 10 + compare = cmp + if type == float: + il = 1 + compare = test.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: + self.assertRaises(TypeError, pow, type(i), j, k) + continue + self.assert_( + not compare( + 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. + + +def test_main(): + suite = unittest.TestSuite() + suite.addTest(unittest.makeSuite(PowTest)) + test.test_support.run_suite(suite) + +if __name__ == "__main__": + test_main() Index: test_userdict.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userdict.py,v retrieving revision 1.11 diff -u -r1.11 test_userdict.py --- test_userdict.py 11 Dec 2002 07:16:06 -0000 1.11 +++ test_userdict.py 5 Jan 2003 20:39:26 -0000 @@ -1,7 +1,8 @@ # Check every path through every method of UserDict - -from test.test_support import verify, verbose -from UserDict import UserDict, IterableUserDict + +import test.test_support, unittest + +import UserDict d0 = {} d1 = {"one": 1} @@ -10,228 +11,242 @@ d4 = {"one": None, "two": None} d5 = {"one": 1, "two": 1} -# Test constructors - -u = UserDict() -u0 = UserDict(d0) -u1 = UserDict(d1) -u2 = IterableUserDict(d2) - -uu = UserDict(u) -uu0 = UserDict(u0) -uu1 = UserDict(u1) -uu2 = UserDict(u2) - -verify(UserDict(one=1, two=2) == d2) # keyword arg constructor -verify(UserDict([('one',1), ('two',2)]) == d2) # item sequence constructor -verify(UserDict(dict=[('one',1), ('two',2)]) == d2) -verify(UserDict([('one',1), ('two',2)], two=3, three=5) == d3) # both together - -verify(UserDict.fromkeys('one two'.split()) == d4) # alternate constructor -verify(UserDict().fromkeys('one two'.split()) == d4) -verify(UserDict.fromkeys('one two'.split(), 1) == d5) -verify(UserDict().fromkeys('one two'.split(), 1) == d5) -verify(u1.fromkeys('one two'.split()) is not u1) -verify(isinstance(u1.fromkeys('one two'.split()), UserDict)) -verify(isinstance(u2.fromkeys('one two'.split()), IterableUserDict)) - -# Test __repr__ - -verify(str(u0) == str(d0)) -verify(repr(u1) == repr(d1)) -verify(`u2` == `d2`) - -# Test __cmp__ and __len__ - -all = [d0, d1, d2, u, u0, u1, u2, uu, uu0, uu1, uu2] -for a in all: - for b in all: - verify(cmp(a, b) == cmp(len(a), len(b))) - -# Test __getitem__ - -verify(u2["one"] == 1) -try: - u1["two"] -except KeyError: - pass -else: - verify(0, "u1['two'] shouldn't exist") - -# Test __setitem__ - -u3 = UserDict(u2) -u3["two"] = 2 -u3["three"] = 3 - -# Test __delitem__ - -del u3["three"] -try: - del u3["three"] -except KeyError: - pass -else: - verify(0, "u3['three'] shouldn't exist") - -# Test clear - -u3.clear() -verify(u3 == {}) - -# Test copy() - -u2a = u2.copy() -verify(u2a == u2) - -class MyUserDict(UserDict): - def display(self): print self - -m2 = MyUserDict(u2) -m2a = m2.copy() -verify(m2a == m2) - -# SF bug #476616 -- copy() of UserDict subclass shared data -m2['foo'] = 'bar' -verify(m2a != m2) - -# Test keys, items, values - -verify(u2.keys() == d2.keys()) -verify(u2.items() == d2.items()) -verify(u2.values() == d2.values()) - -# Test has_key and "in". - -for i in u2.keys(): - verify(u2.has_key(i) == 1) - verify((i in u2) == 1) - verify(u1.has_key(i) == d1.has_key(i)) - verify((i in u1) == (i in d1)) - verify(u0.has_key(i) == d0.has_key(i)) - verify((i in u0) == (i in d0)) - -# Test update - -t = UserDict() -t.update(u2) -verify(t == u2) - -# Test get - -for i in u2.keys(): - verify(u2.get(i) == u2[i]) - verify(u1.get(i) == d1.get(i)) - verify(u0.get(i) == d0.get(i)) - -# Test "in" iteration. -for i in xrange(20): - u2[i] = str(i) -ikeys = [] -for k in u2: - ikeys.append(k) -ikeys.sort() -keys = u2.keys() -keys.sort() -verify(ikeys == keys) - -########################## -# Test Dict Mixin - -from UserDict import DictMixin - -class SeqDict(DictMixin): - """Dictionary lookalike implemented with lists. - - Used to test and demonstrate DictMixin - """ - def __init__(self): - self.keylist = [] - self.valuelist = [] - def __getitem__(self, key): - try: - i = self.keylist.index(key) - except ValueError: - raise KeyError - return self.valuelist[i] - def __setitem__(self, key, value): - try: - i = self.keylist.index(key) - self.valuelist[i] = value - except ValueError: - self.keylist.append(key) - self.valuelist.append(value) - def __delitem__(self, key): - try: - i = self.keylist.index(key) - except ValueError: - raise KeyError - self.keylist.pop(i) - self.valuelist.pop(i) - def keys(self): - return list(self.keylist) - -## Setup test and verify working of the test class -s = SeqDict() # check init -s[10] = 'ten' # exercise setitem -s[20] = 'twenty' -s[30] = 'thirty' -del s[20] # exercise delitem -verify(s[10] == 'ten') # check getitem and setitem -verify(s.keys() == [10, 30]) # check keys() and delitem - -## Now, test the DictMixin methods one by one -verify(s.has_key(10)) # has_key -verify(not s.has_key(20)) - -verify(10 in s) # __contains__ -verify(20 not in s) - -verify([k for k in s] == [10, 30]) # __iter__ - -verify(len(s) == 2) # __len__ - -verify(list(s.iteritems()) == [(10,'ten'), (30, 'thirty')]) # iteritems - -verify(list(s.iterkeys()) == [10, 30]) # iterkeys - -verify(list(s.itervalues()) == ['ten', 'thirty']) # itervalues - -verify(s.values() == ['ten', 'thirty']) # values - -verify(s.items() == [(10,'ten'), (30, 'thirty')]) # items - -verify(s.get(10) == 'ten') # get -verify(s.get(15,'fifteen') == 'fifteen') -verify(s.get(15) == None) - -verify(s.setdefault(40, 'forty') == 'forty') # setdefault -verify(s.setdefault(10, 'null') == 'ten') -del s[40] - -verify(s.pop(10) == 'ten') # pop -verify(10 not in s) -s[10] = 'ten' - -k, v = s.popitem() # popitem -verify(k not in s) -s[k] = v - -s.clear() # clear -verify(len(s) == 0) - -try: # empty popitem - s.popitem() -except KeyError: - pass -else: - verify(0, "popitem from an empty list should raise KeyError") - -s.update({10: 'ten', 20:'twenty'}) # update -verify(s[10]=='ten' and s[20]=='twenty') - -verify(s == {10: 'ten', 20:'twenty'}) # cmp -t = SeqDict() -t[20] = 'twenty' -t[10] = 'ten' -verify(s == t) +class UserDictTest(unittest.TestCase): + def test_all(self): + # Test constructors + u = UserDict.UserDict() + u0 = UserDict.UserDict(d0) + u1 = UserDict.UserDict(d1) + u2 = UserDict.IterableUserDict(d2) + + uu = UserDict.UserDict(u) + uu0 = UserDict.UserDict(u0) + uu1 = UserDict.UserDict(u1) + uu2 = UserDict.UserDict(u2) + + # keyword arg constructor + self.assertEquals(UserDict.UserDict(one=1, two=2), d2) + # item sequence constructor + self.assertEquals(UserDict.UserDict([('one',1), ('two',2)]), d2) + self.assertEquals(UserDict.UserDict(dict=[('one',1), ('two',2)]), d2) + # both together + self.assertEquals(UserDict.UserDict([('one',1), ('two',2)], two=3, three=5), d3) + + # alternate constructor + self.assertEquals(UserDict.UserDict.fromkeys('one two'.split()), d4) + self.assertEquals(UserDict.UserDict().fromkeys('one two'.split()), d4) + self.assertEquals(UserDict.UserDict.fromkeys('one two'.split(), 1), d5) + self.assertEquals(UserDict.UserDict().fromkeys('one two'.split(), 1), d5) + self.assert_(u1.fromkeys('one two'.split()) is not u1) + self.assert_(isinstance(u1.fromkeys('one two'.split()), UserDict.UserDict)) + self.assert_(isinstance(u2.fromkeys('one two'.split()), UserDict.IterableUserDict)) + + # Test __repr__ + self.assertEquals(str(u0), str(d0)) + self.assertEquals(repr(u1), repr(d1)) + self.assertEquals(`u2`, `d2`) + + # Test __cmp__ and __len__ + all = [d0, d1, d2, u, u0, u1, u2, uu, uu0, uu1, uu2] + for a in all: + for b in all: + self.assertEquals(cmp(a, b), cmp(len(a), len(b))) + + # Test __getitem__ + self.assertEquals(u2["one"], 1) + self.assertRaises(KeyError, u1.__getitem__, "two") + + # Test __setitem__ + u3 = UserDict.UserDict(u2) + u3["two"] = 2 + u3["three"] = 3 + + # Test __delitem__ + del u3["three"] + self.assertRaises(KeyError, u3.__delitem__, "three") + + # Test clear + u3.clear() + self.assertEquals(u3, {}) + + # Test copy() + u2a = u2.copy() + self.assertEquals(u2a, u2) + + class MyUserDict(UserDict.UserDict): + def display(self): print self + + m2 = MyUserDict(u2) + m2a = m2.copy() + self.assertEquals(m2a, m2) + + # SF bug #476616 -- copy() of UserDict subclass shared data + m2['foo'] = 'bar' + self.assertNotEquals(m2a, m2) + + # Test keys, items, values + self.assertEquals(u2.keys(), d2.keys()) + self.assertEquals(u2.items(), d2.items()) + self.assertEquals(u2.values(), d2.values()) + + # Test has_key and "in". + for i in u2.keys(): + self.assert_(u2.has_key(i)) + self.assert_(i in u2) + self.assertEquals(u1.has_key(i), d1.has_key(i)) + self.assertEquals(i in u1, i in d1) + self.assertEquals(u0.has_key(i), d0.has_key(i)) + self.assertEquals(i in u0, i in d0) + + # Test update + t = UserDict.UserDict() + t.update(u2) + self.assertEquals(t, u2) + + # Test get + for i in u2.keys(): + self.assertEquals(u2.get(i), u2[i]) + self.assertEquals(u1.get(i), d1.get(i)) + self.assertEquals(u0.get(i), d0.get(i)) + + # Test "in" iteration. + for i in xrange(20): + u2[i] = str(i) + ikeys = [] + for k in u2: + ikeys.append(k) + ikeys.sort() + keys = u2.keys() + keys.sort() + self.assertEquals(ikeys, keys) + +########################## +# Test Dict Mixin + +class SeqDict(UserDict.DictMixin): + """Dictionary lookalike implemented with lists. + + Used to test and demonstrate DictMixin + """ + def __init__(self): + self.keylist = [] + self.valuelist = [] + def __getitem__(self, key): + try: + i = self.keylist.index(key) + except ValueError: + raise KeyError + return self.valuelist[i] + def __setitem__(self, key, value): + try: + i = self.keylist.index(key) + self.valuelist[i] = value + except ValueError: + self.keylist.append(key) + self.valuelist.append(value) + def __delitem__(self, key): + try: + i = self.keylist.index(key) + except ValueError: + raise KeyError + self.keylist.pop(i) + self.valuelist.pop(i) + def keys(self): + return list(self.keylist) + +class UserDictMixinTest(unittest.TestCase): + def test_all(self): + ## Setup test and verify working of the test class + + # check init + s = SeqDict() + + # exercise setitem + s[10] = 'ten' + s[20] = 'twenty' + s[30] = 'thirty' + + # exercise delitem + del s[20] + # check getitem and setitem + self.assertEquals(s[10], 'ten') + # check keys() and delitem + self.assertEquals(s.keys(), [10, 30]) + + ## Now, test the DictMixin methods one by one + # has_key + self.assert_(s.has_key(10)) + self.assert_(not s.has_key(20)) + + # __contains__ + self.assert_(10 in s) + self.assert_(20 not in s) + + # __iter__ + self.assertEquals([k for k in s], [10, 30]) + + # __len__ + self.assertEquals(len(s), 2) + + # iteritems + self.assertEquals(list(s.iteritems()), [(10,'ten'), (30, 'thirty')]) + + # iterkeys + self.assertEquals(list(s.iterkeys()), [10, 30]) + + # itervalues + self.assertEquals(list(s.itervalues()), ['ten', 'thirty']) + + # values + self.assertEquals(s.values(), ['ten', 'thirty']) + + # items + self.assertEquals(s.items(), [(10,'ten'), (30, 'thirty')]) + + # get + self.assertEquals(s.get(10), 'ten') + self.assertEquals(s.get(15,'fifteen'), 'fifteen') + self.assertEquals(s.get(15), None) + + # setdefault + self.assertEquals(s.setdefault(40, 'forty'), 'forty') + self.assertEquals(s.setdefault(10, 'null'), 'ten') + del s[40] + + # pop + self.assertEquals(s.pop(10), 'ten') + self.assert_(10 not in s) + s[10] = 'ten' + + # popitem + k, v = s.popitem() + self.assert_(k not in s) + s[k] = v + + # clear + s.clear() + self.assertEquals(len(s), 0) + + # empty popitem + self.assertRaises(KeyError, s.popitem) + + # update + s.update({10: 'ten', 20:'twenty'}) + self.assertEquals(s[10], 'ten') + self.assertEquals(s[20], 'twenty') + + # cmp + self.assertEquals(s, {10: 'ten', 20:'twenty'}) + t = SeqDict() + t[20] = 'twenty' + t[10] = 'ten' + self.assertEquals(s, t) + +def test_main(): + suite = unittest.TestSuite() + suite.addTest(unittest.makeSuite(UserDictTest)) + suite.addTest(unittest.makeSuite(UserDictMixinTest)) + test.test_support.run_suite(suite) + +if __name__ == "__main__": + test_main()