Changeset 391 for python/trunk/Lib/test/test_enumerate.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_enumerate.py (modified) (4 diffs)

python/trunk/Lib/test/test_enumerate.py

@@ -104 +104 @@
         self.assertRaises(TypeError, self.enum, 'abc', 2, 3) # too many arguments
 
+    @test_support.cpython_only
     def test_tuple_reuse(self):
         # Tests an implementation detail where tuple is reused
@@ -142 +143 @@
         self.assertRaises(TypeError, reversed, [], a=1)
 
+    def test_classic_class(self):
+        class A:
+            def __reversed__(self):
+                return [2, 1]
+        self.assertEqual(list(reversed(A())), [2, 1])
+
     def test_xrange_optimization(self):
         x = xrange(1)
         self.assertEqual(type(reversed(x)), type(iter(x)))
 
+    @test_support.cpython_only
     def test_len(self):
         # This is an implementation detail, not an interface requirement
@@ -199 +207 @@
         self.assertEqual(rc, sys.getrefcount(r))
 
-
-class TestStart(EnumerateTestCase):
-
-    enum = lambda i: enumerate(i, start=11)
-    seq, res = 'abc', [(1, 'a'), (2, 'b'), (3, 'c')]
-
-
-class TestLongStart(EnumerateTestCase):
-
-    enum = lambda i: enumerate(i, start=sys.maxint+1)
+    def test_objmethods(self):
+        # Objects must have __len__() and __getitem__() implemented.
+        class NoLen(object):
+            def __getitem__(self): return 1
+        nl = NoLen()
+        self.assertRaises(TypeError, reversed, nl)
+
+        class NoGetItem(object):
+            def __len__(self): return 2
+        ngi = NoGetItem()
+        self.assertRaises(TypeError, reversed, ngi)
+
+
+class EnumerateStartTestCase(EnumerateTestCase):
+
+    def test_basicfunction(self):
+        e = self.enum(self.seq)
+        self.assertEqual(iter(e), e)
+        self.assertEqual(list(self.enum(self.seq)), self.res)
+
+
+class TestStart(EnumerateStartTestCase):
+
+    enum = lambda self, i: enumerate(i, start=11)
+    seq, res = 'abc', [(11, 'a'), (12, 'b'), (13, 'c')]
+
+
+class TestLongStart(EnumerateStartTestCase):
+
+    enum = lambda self, i: enumerate(i, start=sys.maxint+1)
     seq, res = 'abc', [(sys.maxint+1,'a'), (sys.maxint+2,'b'),
                        (sys.maxint+3,'c')]
@@ -214 +242 @@
 
 def test_main(verbose=None):
-    testclasses = (EnumerateTestCase, SubclassTestCase, TestEmpty, TestBig,
-                   TestReversed)
-    test_support.run_unittest(*testclasses)
+    test_support.run_unittest(__name__)
 
     # verify reference counting
-    import sys
     if verbose and hasattr(sys, "gettotalrefcount"):
         counts = [None] * 5
         for i in xrange(len(counts)):
-            test_support.run_unittest(*testclasses)
+            test_support.run_unittest(__name__)
             counts[i] = sys.gettotalrefcount()
         print counts