From b5fa1d89ef25940d751463ef20dac0eee7ce5114 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 11 Aug 2018 10:38:46 -0400 Subject: [PATCH] Fix new tests not being date-neutral --- build_pycompat.py | 2 +- src/tests/pycompat_parser.rs | 6 +++--- src/tests/pycompat_tokenizer.rs | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build_pycompat.py b/build_pycompat.py index 18937ba..f95e104 100644 --- a/build_pycompat.py +++ b/build_pycompat.py @@ -51,7 +51,7 @@ tests = { '2003-09-25T10:49:41-03:00', '20030925T104941.5-0300', '20030925T104941-0300', # dtparse-specific - "10:00:00 UTC+3", "03:36:47 PM GMT-4", "04:15:00 AM Z-02:00" + "2018-08-10 10:00:00 UTC+3", "2018-08-10 03:36:47 PM GMT-4", "2018-08-10 04:15:00 AM Z-02:00" ], 'test_parse_dayfirst': [ '10-09-2003', '10.09.2003', '10/09/2003', '10 09 2003', diff --git a/src/tests/pycompat_parser.rs b/src/tests/pycompat_parser.rs index 92189ca..e9f3825 100644 --- a/src/tests/pycompat_parser.rs +++ b/src/tests/pycompat_parser.rs @@ -1442,7 +1442,7 @@ fn test_parse_offset5() { hour: 10, minute: 0, second: 0, micros: 0, tzo: Some(-10800), }; - parse_and_assert(pdt, info, "10:00:00 UTC+3", None, None, false, false, + parse_and_assert(pdt, info, "2018-08-10 10:00:00 UTC+3", None, None, false, false, None, false, &HashMap::new()); } @@ -1454,7 +1454,7 @@ fn test_parse_offset6() { hour: 15, minute: 36, second: 47, micros: 0, tzo: Some(14400), }; - parse_and_assert(pdt, info, "03:36:47 PM GMT-4", None, None, false, false, + parse_and_assert(pdt, info, "2018-08-10 03:36:47 PM GMT-4", None, None, false, false, None, false, &HashMap::new()); } @@ -1466,7 +1466,7 @@ fn test_parse_offset7() { hour: 4, minute: 15, second: 0, micros: 0, tzo: Some(7200), }; - parse_and_assert(pdt, info, "04:15:00 AM Z-02:00", None, None, false, false, + parse_and_assert(pdt, info, "2018-08-10 04:15:00 AM Z-02:00", None, None, false, false, None, false, &HashMap::new()); } diff --git a/src/tests/pycompat_tokenizer.rs b/src/tests/pycompat_tokenizer.rs index 644c5cc..9cbbf21 100644 --- a/src/tests/pycompat_tokenizer.rs +++ b/src/tests/pycompat_tokenizer.rs @@ -708,20 +708,20 @@ fn test_tokenize115() { #[test] fn test_tokenize116() { - let comp = vec!["10", ":", "00", ":", "00", " ", "UTC", "+", "3"]; - tokenize_assert("10:00:00 UTC+3", comp); + let comp = vec!["2018", "-", "08", "-", "10", " ", "10", ":", "00", ":", "00", " ", "UTC", "+", "3"]; + tokenize_assert("2018-08-10 10:00:00 UTC+3", comp); } #[test] fn test_tokenize117() { - let comp = vec!["03", ":", "36", ":", "47", " ", "PM", " ", "GMT", "-", "4"]; - tokenize_assert("03:36:47 PM GMT-4", comp); + let comp = vec!["2018", "-", "08", "-", "10", " ", "03", ":", "36", ":", "47", " ", "PM", " ", "GMT", "-", "4"]; + tokenize_assert("2018-08-10 03:36:47 PM GMT-4", comp); } #[test] fn test_tokenize118() { - let comp = vec!["04", ":", "15", ":", "00", " ", "AM", " ", "Z", "-", "02", ":", "00"]; - tokenize_assert("04:15:00 AM Z-02:00", comp); + let comp = vec!["2018", "-", "08", "-", "10", " ", "04", ":", "15", ":", "00", " ", "AM", " ", "Z", "-", "02", ":", "00"]; + tokenize_assert("2018-08-10 04:15:00 AM Z-02:00", comp); } #[test]