[Python-checkins] python/dist/src/Lib/test test_builtin.py, 1.36,
1.37
rhettinger at users.sourceforge.net
rhettinger at users.sourceforge.net
Fri Dec 3 09:31:08 CET 2004
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14724/Lib/test
Modified Files:
test_builtin.py
Log Message:
SF patch #1077353: add key= argument to min and max
(First draft of patch contributed by Steven Bethard.)
Index: test_builtin.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_builtin.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- test_builtin.py 30 Sep 2004 07:47:20 -0000 1.36
+++ test_builtin.py 3 Dec 2004 08:30:35 -0000 1.37
@@ -1,7 +1,8 @@
# Python test set -- built-in functions
import test.test_support, unittest
-from test.test_support import fcmp, have_unicode, TESTFN, unlink
+from test.test_support import fcmp, have_unicode, TESTFN, unlink, run_unittest
+from operator import neg
import sys, warnings, cStringIO, random, UserDict
warnings.filterwarnings("ignore", "hex../oct.. of negative int",
@@ -9,6 +10,10 @@
warnings.filterwarnings("ignore", "integer argument expected",
DeprecationWarning, "unittest")
+# count the number of test runs.
+# used to skip running test_execfile() multiple times
+numruns = 0
+
class Squares:
def __init__(self, max):
@@ -343,6 +348,11 @@
execfile(TESTFN)
def test_execfile(self):
+ global numruns
+ if numruns:
+ return
+ numruns += 1
+
globals = {'a': 1, 'b': 2}
locals = {'b': 200, 'c': 300}
@@ -845,6 +855,30 @@
self.assertEqual(max(1L, 2.0, 3), 3)
self.assertEqual(max(1.0, 2, 3L), 3L)
+ for stmt in (
+ "max(key=int)", # no args
+ "max(1, key=int)", # single arg not iterable
+ "max(1, 2, keystone=int)", # wrong keyword
+ "max(1, 2, key=int, abc=int)", # two many keywords
+ "max(1, 2, key=1)", # keyfunc is not callable
+ ):
+ try:
+ exec(stmt) in globals()
+ except TypeError:
+ pass
+ else:
+ self.fail(stmt)
+
+ self.assertEqual(max((1,), key=neg), 1) # one elem iterable
+ self.assertEqual(max((1,2), key=neg), 1) # two elem iterable
+ self.assertEqual(max(1, 2, key=neg), 1) # two elems
+
+ data = [random.randrange(200) for i in range(100)]
+ keys = dict((elem, random.randrange(50)) for elem in data)
+ f = keys.__getitem__
+ self.assertEqual(max(data, key=f),
+ sorted(reversed(data), key=f)[-1])
+
def test_min(self):
self.assertEqual(min('123123'), '1')
self.assertEqual(min(1, 2, 3), 1)
@@ -867,6 +901,30 @@
raise ValueError
self.assertRaises(ValueError, min, (42, BadNumber()))
+ for stmt in (
+ "min(key=int)", # no args
+ "min(1, key=int)", # single arg not iterable
+ "min(1, 2, keystone=int)", # wrong keyword
+ "min(1, 2, key=int, abc=int)", # two many keywords
+ "min(1, 2, key=1)", # keyfunc is not callable
+ ):
+ try:
+ exec(stmt) in globals()
+ except TypeError:
+ pass
+ else:
+ self.fail(stmt)
+
+ self.assertEqual(min((1,), key=neg), 1) # one elem iterable
+ self.assertEqual(min((1,2), key=neg), 2) # two elem iterable
+ self.assertEqual(min(1, 2, key=neg), 2) # two elems
+
+ data = [random.randrange(200) for i in range(100)]
+ keys = dict((elem, random.randrange(50)) for elem in data)
+ f = keys.__getitem__
+ self.assertEqual(min(data, key=f),
+ sorted(data, key=f)[0])
+
def test_oct(self):
self.assertEqual(oct(100), '0144')
self.assertEqual(oct(100L), '0144L')
@@ -1313,8 +1371,21 @@
data = 'The quick Brown fox Jumped over The lazy Dog'.split()
self.assertRaises(TypeError, sorted, data, None, lambda x,y: 0)
-def test_main():
- test.test_support.run_unittest(BuiltinTest, TestSorted)
+def test_main(verbose=None):
+ test_classes = (BuiltinTest, TestSorted)
+
+ run_unittest(*test_classes)
+
+ # verify reference counting
+ if verbose and hasattr(sys, "gettotalrefcount"):
+ import gc
+ counts = [None] * 5
+ for i in xrange(len(counts)):
+ run_unittest(*test_classes)
+ gc.collect()
+ counts[i] = sys.gettotalrefcount()
+ print counts
+
if __name__ == "__main__":
- test_main()
+ test_main(verbose=True)
More information about the Python-checkins
mailing list