Skip to content
This repository was archived by the owner on Mar 23, 2023. It is now read-only.

Commit 18fb95b

Browse files
S-YOUtrotterdylan
S-YOU
authored and
trotterdylan
committed
Re-enable some datetime compare tests (#257)
1 parent f3ebb4a commit 18fb95b

File tree

1 file changed

+131
-134
lines changed

1 file changed

+131
-134
lines changed

‎third_party/stdlib/test/test_datetime.py‎

Lines changed: 131 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -328,50 +328,49 @@ def test_hash_equality(self):
328328
# derived = unpickler.loads(green)
329329
# self.assertEqual(orig, derived)
330330

331-
# TODO: this cause panic: #251
332-
# def test_compare(self):
333-
# t1 = timedelta(2, 3, 4)
334-
# t2 = timedelta(2, 3, 4)
335-
# self.assertTrue(t1 == t2)
336-
# self.assertTrue(t1 <= t2)
337-
# self.assertTrue(t1 >= t2)
338-
# self.assertFalse(t1 != t2)
339-
# self.assertFalse(t1 < t2)
340-
# self.assertFalse(t1 > t2)
341-
# self.assertEqual(cmp(t1, t2), 0)
342-
# self.assertEqual(cmp(t2, t1), 0)
343-
344-
# for args in (3, 3, 3), (2, 4, 4), (2, 3, 5):
345-
# t2 = timedelta(*args) # this is larger than t1
346-
# self.assertTrue(t1 < t2)
347-
# self.assertTrue(t2 > t1)
348-
# self.assertTrue(t1 <= t2)
349-
# self.assertTrue(t2 >= t1)
350-
# self.assertTrue(t1 != t2)
351-
# self.assertTrue(t2 != t1)
352-
# self.assertFalse(t1 == t2)
353-
# self.assertFalse(t2 == t1)
354-
# self.assertFalse(t1 > t2)
355-
# self.assertFalse(t2 < t1)
356-
# self.assertFalse(t1 >= t2)
357-
# self.assertFalse(t2 <= t1)
358-
# self.assertEqual(cmp(t1, t2), -1)
359-
# self.assertEqual(cmp(t2, t1), 1)
360-
361-
# for badarg in OTHERSTUFF:
362-
# self.assertEqual(t1 == badarg, False)
363-
# self.assertEqual(t1 != badarg, True)
364-
# self.assertEqual(badarg == t1, False)
365-
# self.assertEqual(badarg != t1, True)
366-
367-
# self.assertRaises(TypeError, lambda: t1 <= badarg)
368-
# self.assertRaises(TypeError, lambda: t1 < badarg)
369-
# self.assertRaises(TypeError, lambda: t1 > badarg)
370-
# self.assertRaises(TypeError, lambda: t1 >= badarg)
371-
# self.assertRaises(TypeError, lambda: badarg <= t1)
372-
# self.assertRaises(TypeError, lambda: badarg < t1)
373-
# self.assertRaises(TypeError, lambda: badarg > t1)
374-
# self.assertRaises(TypeError, lambda: badarg >= t1)
331+
def test_compare(self):
332+
t1 = timedelta(2, 3, 4)
333+
t2 = timedelta(2, 3, 4)
334+
self.assertTrue(t1 == t2)
335+
self.assertTrue(t1 <= t2)
336+
self.assertTrue(t1 >= t2)
337+
self.assertFalse(t1 != t2)
338+
self.assertFalse(t1 < t2)
339+
self.assertFalse(t1 > t2)
340+
self.assertEqual(cmp(t1, t2), 0)
341+
self.assertEqual(cmp(t2, t1), 0)
342+
343+
for args in (3, 3, 3), (2, 4, 4), (2, 3, 5):
344+
t2 = timedelta(*args) # this is larger than t1
345+
self.assertTrue(t1 < t2)
346+
self.assertTrue(t2 > t1)
347+
self.assertTrue(t1 <= t2)
348+
self.assertTrue(t2 >= t1)
349+
self.assertTrue(t1 != t2)
350+
self.assertTrue(t2 != t1)
351+
self.assertFalse(t1 == t2)
352+
self.assertFalse(t2 == t1)
353+
self.assertFalse(t1 > t2)
354+
self.assertFalse(t2 < t1)
355+
self.assertFalse(t1 >= t2)
356+
self.assertFalse(t2 <= t1)
357+
self.assertEqual(cmp(t1, t2), -1)
358+
self.assertEqual(cmp(t2, t1), 1)
359+
360+
for badarg in OTHERSTUFF:
361+
self.assertEqual(t1 == badarg, False)
362+
self.assertEqual(t1 != badarg, True)
363+
self.assertEqual(badarg == t1, False)
364+
self.assertEqual(badarg != t1, True)
365+
366+
self.assertRaises(TypeError, lambda: t1 <= badarg)
367+
self.assertRaises(TypeError, lambda: t1 < badarg)
368+
self.assertRaises(TypeError, lambda: t1 > badarg)
369+
self.assertRaises(TypeError, lambda: t1 >= badarg)
370+
self.assertRaises(TypeError, lambda: badarg <= t1)
371+
self.assertRaises(TypeError, lambda: badarg < t1)
372+
self.assertRaises(TypeError, lambda: badarg > t1)
373+
self.assertRaises(TypeError, lambda: badarg >= t1)
375374

376375
def test_str(self):
377376
td = timedelta
@@ -981,49 +980,48 @@ def test_timetuple(self):
981980
# derived = unpickler.loads(green)
982981
# self.assertEqual(orig, derived)
983982

984-
# TODO: this cause panic, #251
985-
# def test_compare(self):
986-
# t1 = self.theclass(2, 3, 4)
987-
# t2 = self.theclass(2, 3, 4)
988-
# self.assertTrue(t1 == t2)
989-
# self.assertTrue(t1 <= t2)
990-
# self.assertTrue(t1 >= t2)
991-
# self.assertFalse(t1 != t2)
992-
# self.assertFalse(t1 < t2)
993-
# self.assertFalse(t1 > t2)
994-
# self.assertEqual(cmp(t1, t2), 0)
995-
# self.assertEqual(cmp(t2, t1), 0)
996-
997-
# for args in (3, 3, 3), (2, 4, 4), (2, 3, 5):
998-
# t2 = self.theclass(*args) # this is larger than t1
999-
# self.assertTrue(t1 < t2)
1000-
# self.assertTrue(t2 > t1)
1001-
# self.assertTrue(t1 <= t2)
1002-
# self.assertTrue(t2 >= t1)
1003-
# self.assertTrue(t1 != t2)
1004-
# self.assertTrue(t2 != t1)
1005-
# self.assertFalse(t1 == t2)
1006-
# self.assertFalse(t2 == t1)
1007-
# self.assertFalse(t1 > t2)
1008-
# self.assertFalse(t2 < t1)
1009-
# self.assertFalse(t1 >= t2)
1010-
# self.assertFalse(t2 <= t1)
1011-
# self.assertEqual(cmp(t1, t2), -1)
1012-
# self.assertEqual(cmp(t2, t1), 1)
1013-
1014-
# for badarg in OTHERSTUFF:
1015-
# self.assertEqual(t1 == badarg, False)
1016-
# self.assertEqual(t1 != badarg, True)
1017-
# self.assertEqual(badarg == t1, False)
1018-
# self.assertEqual(badarg != t1, True)
1019-
1020-
# self.assertRaises(TypeError, lambda: t1 < badarg)
1021-
# self.assertRaises(TypeError, lambda: t1 > badarg)
1022-
# self.assertRaises(TypeError, lambda: t1 >= badarg)
1023-
# self.assertRaises(TypeError, lambda: badarg <= t1)
1024-
# self.assertRaises(TypeError, lambda: badarg < t1)
1025-
# self.assertRaises(TypeError, lambda: badarg > t1)
1026-
# self.assertRaises(TypeError, lambda: badarg >= t1)
983+
def test_compare(self):
984+
t1 = self.theclass(2, 3, 4)
985+
t2 = self.theclass(2, 3, 4)
986+
self.assertTrue(t1 == t2)
987+
self.assertTrue(t1 <= t2)
988+
self.assertTrue(t1 >= t2)
989+
self.assertFalse(t1 != t2)
990+
self.assertFalse(t1 < t2)
991+
self.assertFalse(t1 > t2)
992+
self.assertEqual(cmp(t1, t2), 0)
993+
self.assertEqual(cmp(t2, t1), 0)
994+
995+
for args in (3, 3, 3), (2, 4, 4), (2, 3, 5):
996+
t2 = self.theclass(*args) # this is larger than t1
997+
self.assertTrue(t1 < t2)
998+
self.assertTrue(t2 > t1)
999+
self.assertTrue(t1 <= t2)
1000+
self.assertTrue(t2 >= t1)
1001+
self.assertTrue(t1 != t2)
1002+
self.assertTrue(t2 != t1)
1003+
self.assertFalse(t1 == t2)
1004+
self.assertFalse(t2 == t1)
1005+
self.assertFalse(t1 > t2)
1006+
self.assertFalse(t2 < t1)
1007+
self.assertFalse(t1 >= t2)
1008+
self.assertFalse(t2 <= t1)
1009+
self.assertEqual(cmp(t1, t2), -1)
1010+
self.assertEqual(cmp(t2, t1), 1)
1011+
1012+
for badarg in OTHERSTUFF:
1013+
self.assertEqual(t1 == badarg, False)
1014+
self.assertEqual(t1 != badarg, True)
1015+
self.assertEqual(badarg == t1, False)
1016+
self.assertEqual(badarg != t1, True)
1017+
1018+
self.assertRaises(TypeError, lambda: t1 < badarg)
1019+
self.assertRaises(TypeError, lambda: t1 > badarg)
1020+
self.assertRaises(TypeError, lambda: t1 >= badarg)
1021+
self.assertRaises(TypeError, lambda: badarg <= t1)
1022+
self.assertRaises(TypeError, lambda: badarg < t1)
1023+
self.assertRaises(TypeError, lambda: badarg > t1)
1024+
self.assertRaises(TypeError, lambda: badarg >= t1)
10271025

10281026
def test_mixed_compare(self):
10291027
our = self.theclass(2000, 4, 5)
@@ -1750,53 +1748,52 @@ def test_roundtrip(self):
17501748
t.microsecond)
17511749
self.assertEqual(t, t2)
17521750

1753-
# TODO: this cause nil pointer deference panic: issue #252
1754-
# def test_comparing(self):
1755-
# args = [1, 2, 3, 4]
1756-
# t1 = self.theclass(*args)
1757-
# t2 = self.theclass(*args)
1758-
# self.assertTrue(t1 == t2)
1759-
# self.assertTrue(t1 <= t2)
1760-
# self.assertTrue(t1 >= t2)
1761-
# self.assertFalse(t1 != t2)
1762-
# self.assertFalse(t1 < t2)
1763-
# self.assertFalse(t1 > t2)
1764-
# self.assertEqual(cmp(t1, t2), 0)
1765-
# self.assertEqual(cmp(t2, t1), 0)
1766-
1767-
# for i in range(len(args)):
1768-
# newargs = args[:]
1769-
# newargs[i] = args[i] + 1
1770-
# t2 = self.theclass(*newargs) # this is larger than t1
1771-
# self.assertTrue(t1 < t2)
1772-
# self.assertTrue(t2 > t1)
1773-
# self.assertTrue(t1 <= t2)
1774-
# self.assertTrue(t2 >= t1)
1775-
# self.assertTrue(t1 != t2)
1776-
# self.assertTrue(t2 != t1)
1777-
# self.assertFalse(t1 == t2)
1778-
# self.assertFalse(t2 == t1)
1779-
# self.assertFalse(t1 > t2)
1780-
# self.assertFalse(t2 < t1)
1781-
# self.assertFalse(t1 >= t2)
1782-
# self.assertFalse(t2 <= t1)
1783-
# self.assertEqual(cmp(t1, t2), -1)
1784-
# self.assertEqual(cmp(t2, t1), 1)
1785-
1786-
# for badarg in OTHERSTUFF:
1787-
# self.assertEqual(t1 == badarg, False)
1788-
# self.assertEqual(t1 != badarg, True)
1789-
# self.assertEqual(badarg == t1, False)
1790-
# self.assertEqual(badarg != t1, True)
1791-
1792-
# self.assertRaises(TypeError, lambda: t1 <= badarg)
1793-
# self.assertRaises(TypeError, lambda: t1 < badarg)
1794-
# self.assertRaises(TypeError, lambda: t1 > badarg)
1795-
# self.assertRaises(TypeError, lambda: t1 >= badarg)
1796-
# self.assertRaises(TypeError, lambda: badarg <= t1)
1797-
# self.assertRaises(TypeError, lambda: badarg < t1)
1798-
# self.assertRaises(TypeError, lambda: badarg > t1)
1799-
# self.assertRaises(TypeError, lambda: badarg >= t1)
1751+
def test_comparing(self):
1752+
args = [1, 2, 3, 4]
1753+
t1 = self.theclass(*args)
1754+
t2 = self.theclass(*args)
1755+
self.assertTrue(t1 == t2)
1756+
self.assertTrue(t1 <= t2)
1757+
self.assertTrue(t1 >= t2)
1758+
self.assertFalse(t1 != t2)
1759+
self.assertFalse(t1 < t2)
1760+
self.assertFalse(t1 > t2)
1761+
self.assertEqual(cmp(t1, t2), 0)
1762+
self.assertEqual(cmp(t2, t1), 0)
1763+
1764+
for i in range(len(args)):
1765+
newargs = args[:]
1766+
newargs[i] = args[i] + 1
1767+
t2 = self.theclass(*newargs) # this is larger than t1
1768+
self.assertTrue(t1 < t2)
1769+
self.assertTrue(t2 > t1)
1770+
self.assertTrue(t1 <= t2)
1771+
self.assertTrue(t2 >= t1)
1772+
self.assertTrue(t1 != t2)
1773+
self.assertTrue(t2 != t1)
1774+
self.assertFalse(t1 == t2)
1775+
self.assertFalse(t2 == t1)
1776+
self.assertFalse(t1 > t2)
1777+
self.assertFalse(t2 < t1)
1778+
self.assertFalse(t1 >= t2)
1779+
self.assertFalse(t2 <= t1)
1780+
self.assertEqual(cmp(t1, t2), -1)
1781+
self.assertEqual(cmp(t2, t1), 1)
1782+
1783+
for badarg in OTHERSTUFF:
1784+
self.assertEqual(t1 == badarg, False)
1785+
self.assertEqual(t1 != badarg, True)
1786+
self.assertEqual(badarg == t1, False)
1787+
self.assertEqual(badarg != t1, True)
1788+
1789+
self.assertRaises(TypeError, lambda: t1 <= badarg)
1790+
self.assertRaises(TypeError, lambda: t1 < badarg)
1791+
self.assertRaises(TypeError, lambda: t1 > badarg)
1792+
self.assertRaises(TypeError, lambda: t1 >= badarg)
1793+
self.assertRaises(TypeError, lambda: badarg <= t1)
1794+
self.assertRaises(TypeError, lambda: badarg < t1)
1795+
self.assertRaises(TypeError, lambda: badarg > t1)
1796+
self.assertRaises(TypeError, lambda: badarg >= t1)
18001797

18011798
def test_bad_constructor_arguments(self):
18021799
# bad hours

0 commit comments

Comments
 (0)