mirror of
https://github.com/python/cpython.git
synced 2025-11-01 18:51:43 +00:00
Port test_new.py to unittest.
This commit is contained in:
Walter Dörwald
parent
d414302eec
commit
71cd55150b
2 changed files with 141 additions and 169 deletions
|
|
@ -1,7 +0,0 @@
|
||||||
test_new
|
|
||||||
new.module()
|
|
||||||
new.classobj()
|
|
||||||
new.instance()
|
|
||||||
new.instancemethod()
|
|
||||||
new.function()
|
|
||||||
new.code()
|
|
||||||
|
|
@ -1,183 +1,162 @@
|
||||||
from test.test_support import verbose, verify, TestFailed
|
import unittest
|
||||||
import sys
|
from test import test_support
|
||||||
import new
|
import sys, new
|
||||||
|
|
||||||
class Eggs:
|
class NewTest(unittest.TestCase):
|
||||||
def get_yolks(self):
|
def test_spam(self):
|
||||||
return self.yolks
|
class Eggs:
|
||||||
|
def get_yolks(self):
|
||||||
|
return self.yolks
|
||||||
|
|
||||||
print 'new.module()'
|
m = new.module('Spam')
|
||||||
m = new.module('Spam')
|
m.Eggs = Eggs
|
||||||
if verbose:
|
sys.modules['Spam'] = m
|
||||||
print m
|
import Spam
|
||||||
m.Eggs = Eggs
|
|
||||||
sys.modules['Spam'] = m
|
|
||||||
import Spam
|
|
||||||
|
|
||||||
def get_more_yolks(self):
|
def get_more_yolks(self):
|
||||||
return self.yolks + 3
|
return self.yolks + 3
|
||||||
|
|
||||||
print 'new.classobj()'
|
# new.classobj()
|
||||||
C = new.classobj('Spam', (Spam.Eggs,), {'get_more_yolks': get_more_yolks})
|
C = new.classobj('Spam', (Spam.Eggs,), {'get_more_yolks': get_more_yolks})
|
||||||
if verbose:
|
|
||||||
print C
|
|
||||||
print 'new.instance()'
|
|
||||||
c = new.instance(C, {'yolks': 3})
|
|
||||||
if verbose:
|
|
||||||
print c
|
|
||||||
o = new.instance(C)
|
|
||||||
verify(o.__dict__ == {},
|
|
||||||
"new __dict__ should be empty")
|
|
||||||
del o
|
|
||||||
o = new.instance(C, None)
|
|
||||||
verify(o.__dict__ == {},
|
|
||||||
"new __dict__ should be empty")
|
|
||||||
del o
|
|
||||||
|
|
||||||
def break_yolks(self):
|
# new.instance()
|
||||||
self.yolks = self.yolks - 2
|
c = new.instance(C, {'yolks': 3})
|
||||||
print 'new.instancemethod()'
|
|
||||||
im = new.instancemethod(break_yolks, c, C)
|
|
||||||
if verbose:
|
|
||||||
print im
|
|
||||||
|
|
||||||
verify(c.get_yolks() == 3 and c.get_more_yolks() == 6,
|
o = new.instance(C)
|
||||||
'Broken call of hand-crafted class instance')
|
self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
|
||||||
im()
|
del o
|
||||||
verify(c.get_yolks() == 1 and c.get_more_yolks() == 4,
|
o = new.instance(C, None)
|
||||||
'Broken call of hand-crafted instance method')
|
self.assertEqual(o.__dict__, {}, "new __dict__ should be empty")
|
||||||
|
del o
|
||||||
|
|
||||||
im = new.instancemethod(break_yolks, c)
|
def break_yolks(self):
|
||||||
im()
|
self.yolks = self.yolks - 2
|
||||||
verify(c.get_yolks() == -1)
|
|
||||||
try:
|
|
||||||
new.instancemethod(break_yolks, None)
|
|
||||||
except TypeError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
raise TestFailed, "dangerous instance method creation allowed"
|
|
||||||
|
|
||||||
# Verify that instancemethod() doesn't allow keyword args
|
# new.instancemethod()
|
||||||
try:
|
im = new.instancemethod(break_yolks, c, C)
|
||||||
new.instancemethod(break_yolks, c, kw=1)
|
|
||||||
except TypeError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
raise TestFailed, "instancemethod shouldn't accept keyword args"
|
|
||||||
|
|
||||||
# It's unclear what the semantics should be for a code object compiled at
|
self.assertEqual(c.get_yolks(), 3,
|
||||||
# module scope, but bound and run in a function. In CPython, `c' is global
|
'Broken call of hand-crafted class instance')
|
||||||
# (by accident?) while in Jython, `c' is local. The intent of the test
|
self.assertEqual(c.get_more_yolks(), 6,
|
||||||
# clearly is to make `c' global, so let's be explicit about it.
|
'Broken call of hand-crafted class instance')
|
||||||
codestr = '''
|
|
||||||
global c
|
|
||||||
a = 1
|
|
||||||
b = 2
|
|
||||||
c = a + b
|
|
||||||
'''
|
|
||||||
|
|
||||||
ccode = compile(codestr, '<string>', 'exec')
|
im()
|
||||||
# Jython doesn't have a __builtins__, so use a portable alternative
|
self.assertEqual(c.get_yolks(), 1,
|
||||||
import __builtin__
|
'Broken call of hand-crafted instance method')
|
||||||
g = {'c': 0, '__builtins__': __builtin__}
|
self.assertEqual(c.get_more_yolks(), 4,
|
||||||
# this test could be more robust
|
'Broken call of hand-crafted instance method')
|
||||||
print 'new.function()'
|
|
||||||
func = new.function(ccode, g)
|
|
||||||
if verbose:
|
|
||||||
print func
|
|
||||||
func()
|
|
||||||
verify(g['c'] == 3,
|
|
||||||
'Could not create a proper function object')
|
|
||||||
|
|
||||||
# test the various extended flavors of function.new
|
im = new.instancemethod(break_yolks, c)
|
||||||
def f(x):
|
im()
|
||||||
def g(y):
|
self.assertEqual(c.get_yolks(), -1)
|
||||||
return x + y
|
|
||||||
return g
|
|
||||||
g = f(4)
|
|
||||||
new.function(f.func_code, {}, "blah")
|
|
||||||
g2 = new.function(g.func_code, {}, "blah", (2,), g.func_closure)
|
|
||||||
verify(g2() == 6)
|
|
||||||
g3 = new.function(g.func_code, {}, "blah", None, g.func_closure)
|
|
||||||
verify(g3(5) == 9)
|
|
||||||
def test_closure(func, closure, exc):
|
|
||||||
try:
|
|
||||||
new.function(func.func_code, {}, "", None, closure)
|
|
||||||
except exc:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
print "corrupt closure accepted"
|
|
||||||
|
|
||||||
test_closure(g, None, TypeError) # invalid closure
|
# Verify that dangerous instance method creation is forbidden
|
||||||
test_closure(g, (1,), TypeError) # non-cell in closure
|
self.assertRaises(TypeError, new.instancemethod, break_yolks, None)
|
||||||
test_closure(g, (1, 1), ValueError) # closure is wrong size
|
|
||||||
test_closure(f, g.func_closure, ValueError) # no closure needed
|
|
||||||
|
|
||||||
print 'new.code()'
|
# Verify that instancemethod() doesn't allow keyword args
|
||||||
# bogus test of new.code()
|
self.assertRaises(TypeError, new.instancemethod, break_yolks, c, kw=1)
|
||||||
# Note: Jython will never have new.code()
|
|
||||||
if hasattr(new, 'code'):
|
|
||||||
def f(a): pass
|
|
||||||
|
|
||||||
c = f.func_code
|
def test_scope(self):
|
||||||
argcount = c.co_argcount
|
# It's unclear what the semantics should be for a code object compiled
|
||||||
nlocals = c.co_nlocals
|
# at module scope, but bound and run in a function. In CPython, `c' is
|
||||||
stacksize = c.co_stacksize
|
# global (by accident?) while in Jython, `c' is local. The intent of
|
||||||
flags = c.co_flags
|
# the test clearly is to make `c' global, so let's be explicit about it.
|
||||||
codestring = c.co_code
|
codestr = '''
|
||||||
constants = c.co_consts
|
global c
|
||||||
names = c.co_names
|
a = 1
|
||||||
varnames = c.co_varnames
|
b = 2
|
||||||
filename = c.co_filename
|
c = a + b
|
||||||
name = c.co_name
|
'''
|
||||||
firstlineno = c.co_firstlineno
|
|
||||||
lnotab = c.co_lnotab
|
|
||||||
freevars = c.co_freevars
|
|
||||||
cellvars = c.co_cellvars
|
|
||||||
|
|
||||||
d = new.code(argcount, nlocals, stacksize, flags, codestring,
|
codestr = "\n".join(l.strip() for l in codestr.splitlines())
|
||||||
constants, names, varnames, filename, name,
|
|
||||||
firstlineno, lnotab, freevars, cellvars)
|
|
||||||
|
|
||||||
# test backwards-compatibility version with no freevars or cellvars
|
ccode = compile(codestr, '<string>', 'exec')
|
||||||
d = new.code(argcount, nlocals, stacksize, flags, codestring,
|
# Jython doesn't have a __builtins__, so use a portable alternative
|
||||||
constants, names, varnames, filename, name,
|
import __builtin__
|
||||||
firstlineno, lnotab)
|
g = {'c': 0, '__builtins__': __builtin__}
|
||||||
|
|
||||||
try: # this used to trigger a SystemError
|
# this test could be more robust
|
||||||
d = new.code(-argcount, nlocals, stacksize, flags, codestring,
|
func = new.function(ccode, g)
|
||||||
constants, names, varnames, filename, name,
|
func()
|
||||||
firstlineno, lnotab)
|
self.assertEqual(g['c'], 3, 'Could not create a proper function object')
|
||||||
except ValueError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
raise TestFailed, "negative co_argcount didn't trigger an exception"
|
|
||||||
|
|
||||||
try: # this used to trigger a SystemError
|
def test_function(self):
|
||||||
d = new.code(argcount, -nlocals, stacksize, flags, codestring,
|
# test the various extended flavors of function.new
|
||||||
constants, names, varnames, filename, name,
|
def f(x):
|
||||||
firstlineno, lnotab)
|
def g(y):
|
||||||
except ValueError:
|
return x + y
|
||||||
pass
|
return g
|
||||||
else:
|
g = f(4)
|
||||||
raise TestFailed, "negative co_nlocals didn't trigger an exception"
|
new.function(f.func_code, {}, "blah")
|
||||||
|
g2 = new.function(g.func_code, {}, "blah", (2,), g.func_closure)
|
||||||
|
self.assertEqual(g2(), 6)
|
||||||
|
g3 = new.function(g.func_code, {}, "blah", None, g.func_closure)
|
||||||
|
self.assertEqual(g3(5), 9)
|
||||||
|
def test_closure(func, closure, exc):
|
||||||
|
self.assertRaises(exc, new.function, func.func_code, {}, "", None, closure)
|
||||||
|
|
||||||
try: # this used to trigger a Py_FatalError!
|
test_closure(g, None, TypeError) # invalid closure
|
||||||
d = new.code(argcount, nlocals, stacksize, flags, codestring,
|
test_closure(g, (1,), TypeError) # non-cell in closure
|
||||||
constants, (5,), varnames, filename, name,
|
test_closure(g, (1, 1), ValueError) # closure is wrong size
|
||||||
firstlineno, lnotab)
|
test_closure(f, g.func_closure, ValueError) # no closure needed
|
||||||
except TypeError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
raise TestFailed, "non-string co_name didn't trigger an exception"
|
|
||||||
|
|
||||||
# new.code used to be a way to mutate a tuple...
|
# Note: Jython will never have new.code()
|
||||||
class S(str): pass
|
if hasattr(new, 'code'):
|
||||||
t = (S("ab"),)
|
def test_code(self):
|
||||||
d = new.code(argcount, nlocals, stacksize, flags, codestring,
|
# bogus test of new.code()
|
||||||
constants, t, varnames, filename, name,
|
def f(a): pass
|
||||||
firstlineno, lnotab)
|
|
||||||
verify(type(t[0]) is S, "eek, tuple changed under us!")
|
|
||||||
|
|
||||||
if verbose:
|
c = f.func_code
|
||||||
print d
|
argcount = c.co_argcount
|
||||||
|
nlocals = c.co_nlocals
|
||||||
|
stacksize = c.co_stacksize
|
||||||
|
flags = c.co_flags
|
||||||
|
codestring = c.co_code
|
||||||
|
constants = c.co_consts
|
||||||
|
names = c.co_names
|
||||||
|
varnames = c.co_varnames
|
||||||
|
filename = c.co_filename
|
||||||
|
name = c.co_name
|
||||||
|
firstlineno = c.co_firstlineno
|
||||||
|
lnotab = c.co_lnotab
|
||||||
|
freevars = c.co_freevars
|
||||||
|
cellvars = c.co_cellvars
|
||||||
|
|
||||||
|
d = new.code(argcount, nlocals, stacksize, flags, codestring,
|
||||||
|
constants, names, varnames, filename, name,
|
||||||
|
firstlineno, lnotab, freevars, cellvars)
|
||||||
|
|
||||||
|
# test backwards-compatibility version with no freevars or cellvars
|
||||||
|
d = new.code(argcount, nlocals, stacksize, flags, codestring,
|
||||||
|
constants, names, varnames, filename, name,
|
||||||
|
firstlineno, lnotab)
|
||||||
|
|
||||||
|
# negative co_argcount used to trigger a SystemError
|
||||||
|
self.assertRaises(ValueError, new.code,
|
||||||
|
-argcount, nlocals, stacksize, flags, codestring,
|
||||||
|
constants, names, varnames, filename, name, firstlineno, lnotab)
|
||||||
|
|
||||||
|
# negative co_nlocals used to trigger a SystemError
|
||||||
|
self.assertRaises(ValueError, new.code,
|
||||||
|
argcount, -nlocals, stacksize, flags, codestring,
|
||||||
|
constants, names, varnames, filename, name, firstlineno, lnotab)
|
||||||
|
|
||||||
|
# non-string co_name used to trigger a Py_FatalError
|
||||||
|
self.assertRaises(TypeError, new.code,
|
||||||
|
argcount, nlocals, stacksize, flags, codestring,
|
||||||
|
constants, (5,), varnames, filename, name, firstlineno, lnotab)
|
||||||
|
|
||||||
|
# new.code used to be a way to mutate a tuple...
|
||||||
|
class S(str):
|
||||||
|
pass
|
||||||
|
t = (S("ab"),)
|
||||||
|
d = new.code(argcount, nlocals, stacksize, flags, codestring,
|
||||||
|
constants, t, varnames, filename, name,
|
||||||
|
firstlineno, lnotab)
|
||||||
|
self.assert_(type(t[0]) is S, "eek, tuple changed under us!")
|
||||||
|
|
||||||
|
def test_main():
|
||||||
|
test_support.run_unittest(NewTest)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
test_main()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue