diff options
Diffstat (limited to 'Lib/test/test_xrange.py')
| -rw-r--r-- | Lib/test/test_xrange.py | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/Lib/test/test_xrange.py b/Lib/test/test_xrange.py index 5225250..1e7f9de 100644 --- a/Lib/test/test_xrange.py +++ b/Lib/test/test_xrange.py @@ -9,56 +9,52 @@ warnings.filterwarnings("ignore", "integer argument expected", class XrangeTest(unittest.TestCase): def test_xrange(self): - self.assertEqual(list(xrange(3)), [0, 1, 2]) - self.assertEqual(list(xrange(1, 5)), [1, 2, 3, 4]) - self.assertEqual(list(xrange(0)), []) - self.assertEqual(list(xrange(-3)), []) - self.assertEqual(list(xrange(1, 10, 3)), [1, 4, 7]) - self.assertEqual(list(xrange(5, -5, -3)), [5, 2, -1, -4]) + self.assertEqual(list(range(3)), [0, 1, 2]) + self.assertEqual(list(range(1, 5)), [1, 2, 3, 4]) + self.assertEqual(list(range(0)), []) + self.assertEqual(list(range(-3)), []) + self.assertEqual(list(range(1, 10, 3)), [1, 4, 7]) + self.assertEqual(list(range(5, -5, -3)), [5, 2, -1, -4]) a = 10 b = 100 c = 50 - self.assertEqual(list(xrange(a, a+2)), [a, a+1]) - self.assertEqual(list(xrange(a+2, a, -1)), [a+2, a+1]) - self.assertEqual(list(xrange(a+4, a, -2)), [a+4, a+2]) + self.assertEqual(list(range(a, a+2)), [a, a+1]) + self.assertEqual(list(range(a+2, a, -1)), [a+2, a+1]) + self.assertEqual(list(range(a+4, a, -2)), [a+4, a+2]) - seq = list(xrange(a, b, c)) + seq = list(range(a, b, c)) self.assert_(a in seq) self.assert_(b not in seq) self.assertEqual(len(seq), 2) - seq = list(xrange(b, a, -c)) + seq = list(range(b, a, -c)) self.assert_(b in seq) self.assert_(a not in seq) self.assertEqual(len(seq), 2) - seq = list(xrange(-a, -b, -c)) + seq = list(range(-a, -b, -c)) self.assert_(-a in seq) self.assert_(-b not in seq) self.assertEqual(len(seq), 2) - self.assertRaises(TypeError, xrange) - self.assertRaises(TypeError, xrange, 1, 2, 3, 4) - self.assertRaises(ValueError, xrange, 1, 2, 0) + self.assertRaises(TypeError, range) + self.assertRaises(TypeError, range, 1, 2, 3, 4) + self.assertRaises(ValueError, range, 1, 2, 0) - self.assertRaises(TypeError, xrange, 0.0, 2, 1) - self.assertRaises(TypeError, xrange, 1, 2.0, 1) - self.assertRaises(TypeError, xrange, 1, 2, 1.0) - self.assertRaises(TypeError, xrange, 1e100, 1e101, 1e101) + self.assertRaises(TypeError, range, 0.0, 2, 1) + self.assertRaises(TypeError, range, 1, 2.0, 1) + self.assertRaises(TypeError, range, 1, 2, 1.0) + self.assertRaises(TypeError, range, 1e100, 1e101, 1e101) - self.assertRaises(TypeError, xrange, 0, "spam") - self.assertRaises(TypeError, xrange, 0, 42, "spam") + self.assertRaises(TypeError, range, 0, "spam") + self.assertRaises(TypeError, range, 0, 42, "spam") - self.assertEqual(len(xrange(0, sys.maxint, sys.maxint-1)), 2) + self.assertEqual(len(range(0, sys.maxint, sys.maxint-1)), 2) - self.assertRaises(OverflowError, xrange, -sys.maxint, sys.maxint) - self.assertRaises(OverflowError, xrange, 0, 2*sys.maxint) - - r = xrange(-sys.maxint, sys.maxint, 2) + r = range(-sys.maxint, sys.maxint, 2) self.assertEqual(len(r), sys.maxint) - self.assertRaises(OverflowError, xrange, -sys.maxint-1, sys.maxint, 2) def test_main(): test.test_support.run_unittest(XrangeTest) |