mirror of https://github.com/python/cpython
Port test_userdict.py to PyUnit. From SF patch #662807,
with additional tests for setdefault(), pop() and popitem().
This commit is contained in:
parent
9c564755b8
commit
e28be59686
|
@ -1,7 +1,8 @@
|
||||||
# Check every path through every method of UserDict
|
# Check every path through every method of UserDict
|
||||||
|
|
||||||
from test.test_support import verify, verbose
|
import test.test_support, unittest
|
||||||
from UserDict import UserDict, IterableUserDict
|
|
||||||
|
import UserDict
|
||||||
|
|
||||||
d0 = {}
|
d0 = {}
|
||||||
d1 = {"one": 1}
|
d1 = {"one": 1}
|
||||||
|
@ -10,119 +11,112 @@ d3 = {"one": 1, "two": 3, "three": 5}
|
||||||
d4 = {"one": None, "two": None}
|
d4 = {"one": None, "two": None}
|
||||||
d5 = {"one": 1, "two": 1}
|
d5 = {"one": 1, "two": 1}
|
||||||
|
|
||||||
|
class UserDictTest(unittest.TestCase):
|
||||||
|
def test_all(self):
|
||||||
# Test constructors
|
# Test constructors
|
||||||
|
u = UserDict.UserDict()
|
||||||
|
u0 = UserDict.UserDict(d0)
|
||||||
|
u1 = UserDict.UserDict(d1)
|
||||||
|
u2 = UserDict.IterableUserDict(d2)
|
||||||
|
|
||||||
u = UserDict()
|
uu = UserDict.UserDict(u)
|
||||||
u0 = UserDict(d0)
|
uu0 = UserDict.UserDict(u0)
|
||||||
u1 = UserDict(d1)
|
uu1 = UserDict.UserDict(u1)
|
||||||
u2 = IterableUserDict(d2)
|
uu2 = UserDict.UserDict(u2)
|
||||||
|
|
||||||
uu = UserDict(u)
|
# keyword arg constructor
|
||||||
uu0 = UserDict(u0)
|
self.assertEqual(UserDict.UserDict(one=1, two=2), d2)
|
||||||
uu1 = UserDict(u1)
|
# item sequence constructor
|
||||||
uu2 = UserDict(u2)
|
self.assertEqual(UserDict.UserDict([('one',1), ('two',2)]), d2)
|
||||||
|
self.assertEqual(UserDict.UserDict(dict=[('one',1), ('two',2)]), d2)
|
||||||
|
# both together
|
||||||
|
self.assertEqual(UserDict.UserDict([('one',1), ('two',2)], two=3, three=5), d3)
|
||||||
|
|
||||||
verify(UserDict(one=1, two=2) == d2) # keyword arg constructor
|
# alternate constructor
|
||||||
verify(UserDict([('one',1), ('two',2)]) == d2) # item sequence constructor
|
self.assertEqual(UserDict.UserDict.fromkeys('one two'.split()), d4)
|
||||||
verify(UserDict(dict=[('one',1), ('two',2)]) == d2)
|
self.assertEqual(UserDict.UserDict().fromkeys('one two'.split()), d4)
|
||||||
verify(UserDict([('one',1), ('two',2)], two=3, three=5) == d3) # both together
|
self.assertEqual(UserDict.UserDict.fromkeys('one two'.split(), 1), d5)
|
||||||
|
self.assertEqual(UserDict.UserDict().fromkeys('one two'.split(), 1), d5)
|
||||||
verify(UserDict.fromkeys('one two'.split()) == d4) # alternate constructor
|
self.assert_(u1.fromkeys('one two'.split()) is not u1)
|
||||||
verify(UserDict().fromkeys('one two'.split()) == d4)
|
self.assert_(isinstance(u1.fromkeys('one two'.split()), UserDict.UserDict))
|
||||||
verify(UserDict.fromkeys('one two'.split(), 1) == d5)
|
self.assert_(isinstance(u2.fromkeys('one two'.split()), UserDict.IterableUserDict))
|
||||||
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__
|
# Test __repr__
|
||||||
|
self.assertEqual(str(u0), str(d0))
|
||||||
verify(str(u0) == str(d0))
|
self.assertEqual(repr(u1), repr(d1))
|
||||||
verify(repr(u1) == repr(d1))
|
self.assertEqual(`u2`, `d2`)
|
||||||
verify(`u2` == `d2`)
|
|
||||||
|
|
||||||
# Test __cmp__ and __len__
|
# Test __cmp__ and __len__
|
||||||
|
|
||||||
all = [d0, d1, d2, u, u0, u1, u2, uu, uu0, uu1, uu2]
|
all = [d0, d1, d2, u, u0, u1, u2, uu, uu0, uu1, uu2]
|
||||||
for a in all:
|
for a in all:
|
||||||
for b in all:
|
for b in all:
|
||||||
verify(cmp(a, b) == cmp(len(a), len(b)))
|
self.assertEqual(cmp(a, b), cmp(len(a), len(b)))
|
||||||
|
|
||||||
# Test __getitem__
|
# Test __getitem__
|
||||||
|
self.assertEqual(u2["one"], 1)
|
||||||
verify(u2["one"] == 1)
|
self.assertRaises(KeyError, u1.__getitem__, "two")
|
||||||
try:
|
|
||||||
u1["two"]
|
|
||||||
except KeyError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
verify(0, "u1['two'] shouldn't exist")
|
|
||||||
|
|
||||||
# Test __setitem__
|
# Test __setitem__
|
||||||
|
u3 = UserDict.UserDict(u2)
|
||||||
u3 = UserDict(u2)
|
|
||||||
u3["two"] = 2
|
u3["two"] = 2
|
||||||
u3["three"] = 3
|
u3["three"] = 3
|
||||||
|
|
||||||
# Test __delitem__
|
# Test __delitem__
|
||||||
|
|
||||||
del u3["three"]
|
del u3["three"]
|
||||||
try:
|
self.assertRaises(KeyError, u3.__delitem__, "three")
|
||||||
del u3["three"]
|
|
||||||
except KeyError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
verify(0, "u3['three'] shouldn't exist")
|
|
||||||
|
|
||||||
# Test clear
|
# Test clear
|
||||||
|
|
||||||
u3.clear()
|
u3.clear()
|
||||||
verify(u3 == {})
|
self.assertEqual(u3, {})
|
||||||
|
|
||||||
# Test copy()
|
# Test copy()
|
||||||
|
|
||||||
u2a = u2.copy()
|
u2a = u2.copy()
|
||||||
verify(u2a == u2)
|
self.assertEqual(u2a, u2)
|
||||||
|
u2b = UserDict.UserDict(x=42, y=23)
|
||||||
|
u2c = u2b.copy() # making a copy of a UserDict is special cased
|
||||||
|
self.assertEqual(u2b, u2c)
|
||||||
|
|
||||||
class MyUserDict(UserDict):
|
class MyUserDict(UserDict.UserDict):
|
||||||
def display(self): print self
|
def display(self): print self
|
||||||
|
|
||||||
m2 = MyUserDict(u2)
|
m2 = MyUserDict(u2)
|
||||||
m2a = m2.copy()
|
m2a = m2.copy()
|
||||||
verify(m2a == m2)
|
self.assertEqual(m2a, m2)
|
||||||
|
|
||||||
# SF bug #476616 -- copy() of UserDict subclass shared data
|
# SF bug #476616 -- copy() of UserDict subclass shared data
|
||||||
m2['foo'] = 'bar'
|
m2['foo'] = 'bar'
|
||||||
verify(m2a != m2)
|
self.assertNotEqual(m2a, m2)
|
||||||
|
|
||||||
# Test keys, items, values
|
# Test keys, items, values
|
||||||
|
self.assertEqual(u2.keys(), d2.keys())
|
||||||
verify(u2.keys() == d2.keys())
|
self.assertEqual(u2.items(), d2.items())
|
||||||
verify(u2.items() == d2.items())
|
self.assertEqual(u2.values(), d2.values())
|
||||||
verify(u2.values() == d2.values())
|
|
||||||
|
|
||||||
# Test has_key and "in".
|
# Test has_key and "in".
|
||||||
|
|
||||||
for i in u2.keys():
|
for i in u2.keys():
|
||||||
verify(u2.has_key(i) == 1)
|
self.assert_(u2.has_key(i))
|
||||||
verify((i in u2) == 1)
|
self.assert_(i in u2)
|
||||||
verify(u1.has_key(i) == d1.has_key(i))
|
self.assertEqual(u1.has_key(i), d1.has_key(i))
|
||||||
verify((i in u1) == (i in d1))
|
self.assertEqual(i in u1, i in d1)
|
||||||
verify(u0.has_key(i) == d0.has_key(i))
|
self.assertEqual(u0.has_key(i), d0.has_key(i))
|
||||||
verify((i in u0) == (i in d0))
|
self.assertEqual(i in u0, i in d0)
|
||||||
|
|
||||||
# Test update
|
# Test update
|
||||||
|
t = UserDict.UserDict()
|
||||||
t = UserDict()
|
|
||||||
t.update(u2)
|
t.update(u2)
|
||||||
verify(t == u2)
|
self.assertEqual(t, u2)
|
||||||
|
class Items:
|
||||||
|
def items(self):
|
||||||
|
return (("x", 42), ("y", 23))
|
||||||
|
t = UserDict.UserDict()
|
||||||
|
t.update(Items())
|
||||||
|
self.assertEqual(t, {"x": 42, "y": 23})
|
||||||
|
|
||||||
# Test get
|
# Test get
|
||||||
|
|
||||||
for i in u2.keys():
|
for i in u2.keys():
|
||||||
verify(u2.get(i) == u2[i])
|
self.assertEqual(u2.get(i), u2[i])
|
||||||
verify(u1.get(i) == d1.get(i))
|
self.assertEqual(u1.get(i), d1.get(i))
|
||||||
verify(u0.get(i) == d0.get(i))
|
self.assertEqual(u0.get(i), d0.get(i))
|
||||||
|
|
||||||
# Test "in" iteration.
|
# Test "in" iteration.
|
||||||
for i in xrange(20):
|
for i in xrange(20):
|
||||||
|
@ -133,14 +127,28 @@ for k in u2:
|
||||||
ikeys.sort()
|
ikeys.sort()
|
||||||
keys = u2.keys()
|
keys = u2.keys()
|
||||||
keys.sort()
|
keys.sort()
|
||||||
verify(ikeys == keys)
|
self.assertEqual(ikeys, keys)
|
||||||
|
|
||||||
|
# Test setdefault
|
||||||
|
t = UserDict.UserDict()
|
||||||
|
self.assertEqual(t.setdefault("x", 42), 42)
|
||||||
|
self.assert_(t.has_key("x"))
|
||||||
|
self.assertEqual(t.setdefault("x", 23), 42)
|
||||||
|
|
||||||
|
# Test pop
|
||||||
|
t = UserDict.UserDict(x=42)
|
||||||
|
self.assertEqual(t.pop("x"), 42)
|
||||||
|
self.assertRaises(KeyError, t.pop, "x")
|
||||||
|
|
||||||
|
# Test popitem
|
||||||
|
t = UserDict.UserDict(x=42)
|
||||||
|
self.assertEqual(t.popitem(), ("x", 42))
|
||||||
|
self.assertRaises(KeyError, t.popitem)
|
||||||
|
|
||||||
##########################
|
##########################
|
||||||
# Test Dict Mixin
|
# Test Dict Mixin
|
||||||
|
|
||||||
from UserDict import DictMixin
|
class SeqDict(UserDict.DictMixin):
|
||||||
|
|
||||||
class SeqDict(DictMixin):
|
|
||||||
"""Dictionary lookalike implemented with lists.
|
"""Dictionary lookalike implemented with lists.
|
||||||
|
|
||||||
Used to test and demonstrate DictMixin
|
Used to test and demonstrate DictMixin
|
||||||
|
@ -171,67 +179,99 @@ class SeqDict(DictMixin):
|
||||||
def keys(self):
|
def keys(self):
|
||||||
return list(self.keylist)
|
return list(self.keylist)
|
||||||
|
|
||||||
|
class UserDictMixinTest(unittest.TestCase):
|
||||||
|
def test_all(self):
|
||||||
## Setup test and verify working of the test class
|
## Setup test and verify working of the test class
|
||||||
s = SeqDict() # check init
|
|
||||||
s[10] = 'ten' # exercise setitem
|
# check init
|
||||||
|
s = SeqDict()
|
||||||
|
|
||||||
|
# exercise setitem
|
||||||
|
s[10] = 'ten'
|
||||||
s[20] = 'twenty'
|
s[20] = 'twenty'
|
||||||
s[30] = 'thirty'
|
s[30] = 'thirty'
|
||||||
del s[20] # exercise delitem
|
|
||||||
verify(s[10] == 'ten') # check getitem and setitem
|
# exercise delitem
|
||||||
verify(s.keys() == [10, 30]) # check keys() and delitem
|
del s[20]
|
||||||
|
# check getitem and setitem
|
||||||
|
self.assertEqual(s[10], 'ten')
|
||||||
|
# check keys() and delitem
|
||||||
|
self.assertEqual(s.keys(), [10, 30])
|
||||||
|
|
||||||
## Now, test the DictMixin methods one by one
|
## Now, test the DictMixin methods one by one
|
||||||
verify(s.has_key(10)) # has_key
|
# has_key
|
||||||
verify(not s.has_key(20))
|
self.assert_(s.has_key(10))
|
||||||
|
self.assert_(not s.has_key(20))
|
||||||
|
|
||||||
verify(10 in s) # __contains__
|
# __contains__
|
||||||
verify(20 not in s)
|
self.assert_(10 in s)
|
||||||
|
self.assert_(20 not in s)
|
||||||
|
|
||||||
verify([k for k in s] == [10, 30]) # __iter__
|
# __iter__
|
||||||
|
self.assertEqual([k for k in s], [10, 30])
|
||||||
|
|
||||||
verify(len(s) == 2) # __len__
|
# __len__
|
||||||
|
self.assertEqual(len(s), 2)
|
||||||
|
|
||||||
verify(list(s.iteritems()) == [(10,'ten'), (30, 'thirty')]) # iteritems
|
# iteritems
|
||||||
|
self.assertEqual(list(s.iteritems()), [(10,'ten'), (30, 'thirty')])
|
||||||
|
|
||||||
verify(list(s.iterkeys()) == [10, 30]) # iterkeys
|
# iterkeys
|
||||||
|
self.assertEqual(list(s.iterkeys()), [10, 30])
|
||||||
|
|
||||||
verify(list(s.itervalues()) == ['ten', 'thirty']) # itervalues
|
# itervalues
|
||||||
|
self.assertEqual(list(s.itervalues()), ['ten', 'thirty'])
|
||||||
|
|
||||||
verify(s.values() == ['ten', 'thirty']) # values
|
# values
|
||||||
|
self.assertEqual(s.values(), ['ten', 'thirty'])
|
||||||
|
|
||||||
verify(s.items() == [(10,'ten'), (30, 'thirty')]) # items
|
# items
|
||||||
|
self.assertEqual(s.items(), [(10,'ten'), (30, 'thirty')])
|
||||||
|
|
||||||
verify(s.get(10) == 'ten') # get
|
# get
|
||||||
verify(s.get(15,'fifteen') == 'fifteen')
|
self.assertEqual(s.get(10), 'ten')
|
||||||
verify(s.get(15) == None)
|
self.assertEqual(s.get(15,'fifteen'), 'fifteen')
|
||||||
|
self.assertEqual(s.get(15), None)
|
||||||
|
|
||||||
verify(s.setdefault(40, 'forty') == 'forty') # setdefault
|
# setdefault
|
||||||
verify(s.setdefault(10, 'null') == 'ten')
|
self.assertEqual(s.setdefault(40, 'forty'), 'forty')
|
||||||
|
self.assertEqual(s.setdefault(10, 'null'), 'ten')
|
||||||
del s[40]
|
del s[40]
|
||||||
|
|
||||||
verify(s.pop(10) == 'ten') # pop
|
# pop
|
||||||
verify(10 not in s)
|
self.assertEqual(s.pop(10), 'ten')
|
||||||
|
self.assert_(10 not in s)
|
||||||
s[10] = 'ten'
|
s[10] = 'ten'
|
||||||
|
|
||||||
k, v = s.popitem() # popitem
|
# popitem
|
||||||
verify(k not in s)
|
k, v = s.popitem()
|
||||||
|
self.assert_(k not in s)
|
||||||
s[k] = v
|
s[k] = v
|
||||||
|
|
||||||
s.clear() # clear
|
# clear
|
||||||
verify(len(s) == 0)
|
s.clear()
|
||||||
|
self.assertEqual(len(s), 0)
|
||||||
|
|
||||||
try: # empty popitem
|
# empty popitem
|
||||||
s.popitem()
|
self.assertRaises(KeyError, s.popitem)
|
||||||
except KeyError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
verify(0, "popitem from an empty list should raise KeyError")
|
|
||||||
|
|
||||||
s.update({10: 'ten', 20:'twenty'}) # update
|
# update
|
||||||
verify(s[10]=='ten' and s[20]=='twenty')
|
s.update({10: 'ten', 20:'twenty'})
|
||||||
|
self.assertEqual(s[10], 'ten')
|
||||||
|
self.assertEqual(s[20], 'twenty')
|
||||||
|
|
||||||
verify(s == {10: 'ten', 20:'twenty'}) # cmp
|
# cmp
|
||||||
|
self.assertEqual(s, {10: 'ten', 20:'twenty'})
|
||||||
t = SeqDict()
|
t = SeqDict()
|
||||||
t[20] = 'twenty'
|
t[20] = 'twenty'
|
||||||
t[10] = 'ten'
|
t[10] = 'ten'
|
||||||
verify(s == t)
|
self.assertEqual(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()
|
||||||
|
|
Loading…
Reference in New Issue