Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16444/Lib/test Modified Files: test_heapq.py Log Message: Plug a leak and beef-up test coverage. Index: test_heapq.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_heapq.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- test_heapq.py 8 Jul 2004 04:22:19 -0000 1.14 +++ test_heapq.py 28 Sep 2004 00:03:54 -0000 1.15 @@ -110,8 +110,157 @@ for n in (0, 1, 2, 10, 100, 400, 999, 1000, 1100): self.assertEqual(nlargest(n, data), sorted(data, reverse=True)[:n]) + +#============================================================================== + +class LenOnly: + "Dummy sequence class defining __len__ but not __getitem__." + def __len__(self): + return 10 + +class GetOnly: + "Dummy sequence class defining __getitem__ but not __len__." + def __getitem__(self, ndx): + return 10 + +class CmpErr: + "Dummy element that always raises an error during comparison" + def __cmp__(self, other): + raise ZeroDivisionError + +def R(seqn): + 'Regular generator' + for i in seqn: + yield i + +class G: + 'Sequence using __getitem__' + def __init__(self, seqn): + self.seqn = seqn + def __getitem__(self, i): + return self.seqn[i] + +class I: + 'Sequence using iterator protocol' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def __iter__(self): + return self + def next(self): + if self.i >= len(self.seqn): raise StopIteration + v = self.seqn[self.i] + self.i += 1 + return v + +class Ig: + 'Sequence using iterator protocol defined with a generator' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def __iter__(self): + for val in self.seqn: + yield val + +class X: + 'Missing __getitem__ and __iter__' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def next(self): + if self.i >= len(self.seqn): raise StopIteration + v = self.seqn[self.i] + self.i += 1 + return v + +class N: + 'Iterator missing next()' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def __iter__(self): + return self + +class E: + 'Test propagation of exceptions' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def __iter__(self): + return self + def next(self): + 3 // 0 + +class S: + 'Test immediate stop' + def __init__(self, seqn): + pass + def __iter__(self): + return self + def next(self): + raise StopIteration + +from itertools import chain, imap +def L(seqn): + 'Test multiple tiers of iterators' + return chain(imap(lambda x:x, R(Ig(G(seqn))))) + +class TestErrorHandling(unittest.TestCase): + + def test_non_sequence(self): + for f in (heapify, heappop): + self.assertRaises(TypeError, f, 10) + for f in (heappush, heapreplace, nlargest, nsmallest): + self.assertRaises(TypeError, f, 10, 10) + + def test_len_only(self): + for f in (heapify, heappop): + self.assertRaises(TypeError, f, LenOnly()) + for f in (heappush, heapreplace): + self.assertRaises(TypeError, f, LenOnly(), 10) + for f in (nlargest, nsmallest): + self.assertRaises(TypeError, f, 2, LenOnly()) + + def test_get_only(self): + for f in (heapify, heappop): + self.assertRaises(TypeError, f, GetOnly()) + for f in (heappush, heapreplace): + self.assertRaises(TypeError, f, GetOnly(), 10) + for f in (nlargest, nsmallest): + self.assertRaises(TypeError, f, 2, GetOnly()) + + def test_get_only(self): + seq = [CmpErr(), CmpErr(), CmpErr()] + for f in (heapify, heappop): + self.assertRaises(ZeroDivisionError, f, seq) + for f in (heappush, heapreplace): + self.assertRaises(ZeroDivisionError, f, seq, 10) + for f in (nlargest, nsmallest): + self.assertRaises(ZeroDivisionError, f, 2, seq) + + def test_arg_parsing(self): + for f in (heapify, heappop, heappush, heapreplace, nlargest, nsmallest): + self.assertRaises(TypeError, f, 10) + + def test_iterable_args(self): + for f in (nlargest, nsmallest): + for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)): + for g in (G, I, Ig, L, R): + self.assertEqual(f(2, g(s)), f(2,s)) + self.assertEqual(f(2, S(s)), []) + self.assertRaises(TypeError, f, 2, X(s)) + self.assertRaises(TypeError, f, 2, N(s)) + self.assertRaises(ZeroDivisionError, f, 2, E(s)) + +#============================================================================== + + def test_main(verbose=None): + from types import BuiltinFunctionType + test_classes = [TestHeap] + if isinstance(heapify, BuiltinFunctionType): + test_classes.append(TestErrorHandling) test_support.run_unittest(*test_classes) # verify reference counting