[Python-checkins] python/dist/src/Lib/test list_tests.py, 1.4,
1.5 seq_tests.py, 1.2, 1.3 test_builtin.py, 1.35,
1.36 test_genexps.py, 1.5, 1.6 test_tuple.py, 1.4, 1.5
rhettinger at users.sourceforge.net
rhettinger at users.sourceforge.net
Thu Sep 30 09:47:24 CEST 2004
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20201
Modified Files:
list_tests.py seq_tests.py test_builtin.py test_genexps.py
test_tuple.py
Log Message:
Improve test coverage.
Index: list_tests.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/list_tests.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- list_tests.py 29 Sep 2004 08:03:17 -0000 1.4
+++ list_tests.py 30 Sep 2004 07:47:20 -0000 1.5
@@ -29,14 +29,6 @@
self.assertNotEqual(id(a), id(b))
self.assertEqual(a, b)
- def test_mul(self):
- for m in xrange(4):
- s = tuple(range(m))
- for n in xrange(-3, 5):
- self.assertEqual(self.type2test(s*n), self.type2test(s)*n)
- self.assertEqual(self.type2test(s)*(-4), self.type2test([]))
- self.assertEqual(id(s), id(s*1))
-
def test_repr(self):
l0 = []
l2 = [0, 1, 2]
@@ -70,31 +62,6 @@
fo.close()
os.remove(test_support.TESTFN)
- def test_getitem(self):
- a = self.type2test([10, 11])
- self.assertEqual(a[0], 10)
- self.assertEqual(a[1], 11)
- self.assertEqual(a[-2], 10)
- self.assertEqual(a[-1], 11)
- self.assertRaises(IndexError, a.__getitem__, -3)
- self.assertRaises(IndexError, a.__getitem__, 3)
-
- def test_subscript(self):
- a = self.type2test([10, 11])
- self.assertEqual(a.__getitem__(0L), 10)
- self.assertEqual(a.__getitem__(1L), 11)
- self.assertEqual(a.__getitem__(-2L), 10)
- self.assertEqual(a.__getitem__(-1L), 11)
- self.assertRaises(IndexError, a.__getitem__, -3)
- self.assertRaises(IndexError, a.__getitem__, 3)
- self.assertEqual(a.__getitem__(slice(0,1)), self.type2test([10]))
- self.assertEqual(a.__getitem__(slice(1,2)), self.type2test([11]))
- self.assertEqual(a.__getitem__(slice(0,2)), self.type2test([10, 11]))
- self.assertEqual(a.__getitem__(slice(0,3)), self.type2test([10, 11]))
- self.assertEqual(a.__getitem__(slice(3,5)), self.type2test([]))
- self.assertRaises(ValueError, a.__getitem__, slice(0, 10, 0))
- self.assertRaises(TypeError, a.__getitem__, 'x')
-
def test_set_subscript(self):
a = self.type2test(range(20))
self.assertRaises(ValueError, a.__setitem__, slice(0, 10, 0), [1,2,3])
Index: seq_tests.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/seq_tests.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- seq_tests.py 18 Jan 2004 21:03:23 -0000 1.2
+++ seq_tests.py 30 Sep 2004 07:47:20 -0000 1.3
@@ -48,10 +48,13 @@
u = self.type2test([0, 1, 2, 3, 4])
for i in xrange(len(u)):
self.assertEqual(u[i], i)
+ self.assertEqual(u[long(i)], i)
for i in xrange(-len(u), -1):
self.assertEqual(u[i], len(u)+i)
+ self.assertEqual(u[long(i)], len(u)+i)
self.assertRaises(IndexError, u.__getitem__, -len(u)-1)
self.assertRaises(IndexError, u.__getitem__, len(u))
+ self.assertRaises(ValueError, u.__getitem__, slice(0,10,0))
u = self.type2test()
self.assertRaises(IndexError, u.__getitem__, 0)
@@ -59,6 +62,14 @@
self.assertRaises(TypeError, u.__getitem__)
+ a = self.type2test([10, 11])
+ self.assertEqual(a[0], 10)
+ self.assertEqual(a[1], 11)
+ self.assertEqual(a[-2], 10)
+ self.assertEqual(a[-1], 11)
+ self.assertRaises(IndexError, a.__getitem__, -3)
+ self.assertRaises(IndexError, a.__getitem__, 3)
+
def test_getslice(self):
l = [0, 1, 2, 3, 4]
u = self.type2test(l)
@@ -169,3 +180,27 @@
def __getitem__(self, key):
return str(key) + '!!!'
self.assertEqual(iter(T((1,2))).next(), 1)
+
+ def test_repeat(self):
+ for m in xrange(4):
+ s = tuple(range(m))
+ for n in xrange(-3, 5):
+ self.assertEqual(self.type2test(s*n), self.type2test(s)*n)
+ self.assertEqual(self.type2test(s)*(-4), self.type2test([]))
+ self.assertEqual(id(s), id(s*1))
+
+ def test_subscript(self):
+ a = self.type2test([10, 11])
+ self.assertEqual(a.__getitem__(0L), 10)
+ self.assertEqual(a.__getitem__(1L), 11)
+ self.assertEqual(a.__getitem__(-2L), 10)
+ self.assertEqual(a.__getitem__(-1L), 11)
+ self.assertRaises(IndexError, a.__getitem__, -3)
+ self.assertRaises(IndexError, a.__getitem__, 3)
+ self.assertEqual(a.__getitem__(slice(0,1)), self.type2test([10]))
+ self.assertEqual(a.__getitem__(slice(1,2)), self.type2test([11]))
+ self.assertEqual(a.__getitem__(slice(0,2)), self.type2test([10, 11]))
+ self.assertEqual(a.__getitem__(slice(0,3)), self.type2test([10, 11]))
+ self.assertEqual(a.__getitem__(slice(3,5)), self.type2test([]))
+ self.assertRaises(ValueError, a.__getitem__, slice(0, 10, 0))
+ self.assertRaises(TypeError, a.__getitem__, 'x')
Index: test_builtin.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_builtin.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- test_builtin.py 26 Sep 2004 19:24:19 -0000 1.35
+++ test_builtin.py 30 Sep 2004 07:47:20 -0000 1.36
@@ -229,6 +229,9 @@
self.assertEqual(divmod(12L, -7), (-2L, -2))
self.assertEqual(divmod(-12L, -7), (1L, -5))
+ self.assertEqual(divmod(-sys.maxint-1, -1),
+ (sys.maxint+1, 0))
+
self.assert_(not fcmp(divmod(3.25, 1.0), (3.0, 0.25)))
self.assert_(not fcmp(divmod(-3.25, 1.0), (-4.0, 0.75)))
self.assert_(not fcmp(divmod(3.25, -1.0), (-4.0, -0.75)))
Index: test_genexps.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_genexps.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test_genexps.py 16 Aug 2004 01:45:34 -0000 1.5
+++ test_genexps.py 30 Sep 2004 07:47:20 -0000 1.6
@@ -121,7 +121,6 @@
0
-
########### Tests borrowed from or inspired by test_generators.py ############
Make a generator that acts like range()
Index: test_tuple.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_tuple.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test_tuple.py 1 Jun 2004 18:58:04 -0000 1.4
+++ test_tuple.py 30 Sep 2004 07:47:20 -0000 1.5
@@ -65,6 +65,17 @@
collisions = len(inps) - len(set(map(hash, inps)))
self.assert_(collisions <= 15)
+ def test_repr(self):
+ l0 = tuple()
+ l2 = (0, 1, 2)
+ a0 = self.type2test(l0)
+ a2 = self.type2test(l2)
+
+ self.assertEqual(str(a0), repr(l0))
+ self.assertEqual(str(a2), repr(l2))
+ self.assertEqual(repr(a0), "()")
+ self.assertEqual(repr(a2), "(0, 1, 2)")
+
def test_main():
test_support.run_unittest(TupleTest)
More information about the Python-checkins
mailing list