From 68919ff8b3bb2d6b29885ee7f7b81b21fa232f2e Mon Sep 17 00:00:00 2001 From: hectr Date: Sat, 27 Apr 2019 02:05:01 +0200 Subject: [PATCH 1/3] Fix tests assert messages --- .../SwiftyChronoTests/JS/de/test_de_casual.js | 14 +-- .../JS/de/test_de_little_endian.js | 6 +- .../JS/de/test_de_time_ago.js | 36 +++--- .../SwiftyChronoTests/JS/en/test_en_casual.js | 16 +-- .../JS/en/test_en_little_endian.js | 4 +- .../JS/en/test_en_time_ago.js | 44 +++---- .../JS/en/test_en_time_exp.js | 74 ++++++------ .../SwiftyChronoTests/JS/es/test_es_casual.js | 6 +- .../JS/es/test_es_time_ago.js | 4 +- .../JS/es/test_es_time_exp.js | 30 ++--- .../SwiftyChronoTests/JS/fr/test_fr_casual.js | 18 +-- .../JS/fr/test_fr_little_endian.js | 2 +- .../JS/fr/test_fr_time_ago.js | 16 +-- .../JS/fr/test_fr_time_exp.js | 112 +++++++++--------- .../JS/zh_hans/test_zh_hans_casual.js | 10 +- .../JS/zh_hans/test_zh_hans_time_exp.js | 30 ++--- .../JS/zh_hant/test_zh_hant_casual.js | 16 +-- .../JS/zh_hant/test_zh_hant_time_exp.js | 30 ++--- 18 files changed, 234 insertions(+), 234 deletions(-) diff --git a/Tests/SwiftyChronoTests/JS/de/test_de_casual.js b/Tests/SwiftyChronoTests/JS/de/test_de_casual.js index 288679b..1de86e5 100644 --- a/Tests/SwiftyChronoTests/JS/de/test_de_casual.js +++ b/Tests/SwiftyChronoTests/JS/de/test_de_casual.js @@ -116,7 +116,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 6, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6); @@ -138,7 +138,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 15, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 15, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 15); @@ -160,7 +160,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 18, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 18, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 18); @@ -186,7 +186,7 @@ test("Test - Combined Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 17, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 17); @@ -211,7 +211,7 @@ test("Test - Casual date range", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 4, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 4, 12); @@ -222,7 +222,7 @@ test("Test - Casual date range", function() { ok(result.end.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.end.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 10, 12); @@ -245,7 +245,7 @@ test("Test - Casual date range", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 12); diff --git a/Tests/SwiftyChronoTests/JS/de/test_de_little_endian.js b/Tests/SwiftyChronoTests/JS/de/test_de_little_endian.js index 8fb0e8a..4367343 100644 --- a/Tests/SwiftyChronoTests/JS/de/test_de_little_endian.js +++ b/Tests/SwiftyChronoTests/JS/de/test_de_little_endian.js @@ -132,7 +132,7 @@ test("Test - Single expression", function() { ok(result.start.get('year') == 2013, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 1, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('weekday') == 2, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('weekday') == 2, 'Test Result - (Weekday) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2013, 1-1, 10, 12); @@ -154,7 +154,7 @@ test("Test - Single expression", function() { ok(result.start.get('year') == 2013, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 1, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('weekday') == 2, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('weekday') == 2, 'Test Result - (Weekday) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2013, 1-1, 10, 12); @@ -368,7 +368,7 @@ test("Test - Combined expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 5, 'Test Result - (Month) ' + JSON.stringify(result) ); ok(result.start.get('day') == 7, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 11, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 5-1, 7, 11, 0); diff --git a/Tests/SwiftyChronoTests/JS/de/test_de_time_ago.js b/Tests/SwiftyChronoTests/JS/de/test_de_time_ago.js index 35cbc85..61914b3 100644 --- a/Tests/SwiftyChronoTests/JS/de/test_de_time_ago.js +++ b/Tests/SwiftyChronoTests/JS/de/test_de_time_ago.js @@ -48,8 +48,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == 'vor 15 Minuten', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 59, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,59); @@ -64,8 +64,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 3, 'Wrong index'); ok(result.text == 'vor 12 Stunden', result.text ); - ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 0, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 14, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,0,14); @@ -80,8 +80,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 3, 'Wrong index'); ok(result.text == 'vor einer halben Stunde', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 44, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 44, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,44); @@ -97,8 +97,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == 'Vor 12 Stunden', result.text ); - ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 0, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 14, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,0,14); @@ -114,9 +114,9 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == 'vor 12 Sekunden', result.text ); - ok(result.start.get('hour') == 12, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('second') == 48, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); + ok(result.start.get('second') == 48, 'Test Result - (Second) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 12, 13, 48); @@ -132,9 +132,9 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == 'vor 3 Sekunden', result.text ); - ok(result.start.get('hour') == 12, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('second') == 57, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); + ok(result.start.get('second') == 57, 'Test Result - (Second) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 12, 13, 57); @@ -171,8 +171,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 3, 'Wrong index'); ok(result.text == 'vor einer halben Stunde', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 44, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 44, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,44); @@ -208,8 +208,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == 'vor einer Minute', result.text ); - ok(result.start.get('hour') == 12, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,12,13); diff --git a/Tests/SwiftyChronoTests/JS/en/test_en_casual.js b/Tests/SwiftyChronoTests/JS/en/test_en_casual.js index 991740d..fec9501 100644 --- a/Tests/SwiftyChronoTests/JS/en/test_en_casual.js +++ b/Tests/SwiftyChronoTests/JS/en/test_en_casual.js @@ -111,7 +111,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 9, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 0, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 0, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 9, 0); @@ -132,7 +132,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 6, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6); @@ -153,7 +153,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 15, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 15, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 15); @@ -174,7 +174,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 18, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 18, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 18); @@ -223,7 +223,7 @@ test("Test - Casual date range", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 4, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 4, 12); @@ -234,7 +234,7 @@ test("Test - Casual date range", function() { ok(result.end.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.end.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 10, 12); @@ -256,7 +256,7 @@ test("Test - Casual date range", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 12); @@ -267,7 +267,7 @@ test("Test - Casual date range", function() { ok(result.end.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.end.get('day') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 17, 12); diff --git a/Tests/SwiftyChronoTests/JS/en/test_en_little_endian.js b/Tests/SwiftyChronoTests/JS/en/test_en_little_endian.js index 252da9e..328961c 100644 --- a/Tests/SwiftyChronoTests/JS/en/test_en_little_endian.js +++ b/Tests/SwiftyChronoTests/JS/en/test_en_little_endian.js @@ -153,7 +153,7 @@ test("Test - Single expression", function() { ok(result.start.get('year') == 2013, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 1, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('weekday') == 2, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('weekday') == 2, 'Test Result - (Weekday) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2013, 1-1, 10, 12); @@ -175,7 +175,7 @@ test("Test - Single expression", function() { ok(result.start.get('year') == 2013, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 1, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('weekday') == 2, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('weekday') == 2, 'Test Result - (Weekday) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2013, 1-1, 10, 12); diff --git a/Tests/SwiftyChronoTests/JS/en/test_en_time_ago.js b/Tests/SwiftyChronoTests/JS/en/test_en_time_ago.js index cf2830d..ae8419d 100644 --- a/Tests/SwiftyChronoTests/JS/en/test_en_time_ago.js +++ b/Tests/SwiftyChronoTests/JS/en/test_en_time_ago.js @@ -48,8 +48,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == '15 minute ago', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 59, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,59); @@ -64,8 +64,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == '15 minute earlier', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 59, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,59); @@ -80,8 +80,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == '15 minute before', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 59, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,59); @@ -96,8 +96,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 3, 'Wrong index'); ok(result.text == '12 hours ago', result.text ); - ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 0, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 14, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,0,14); @@ -112,8 +112,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 3, 'Wrong index'); ok(result.text == 'half an hour ago', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 44, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 44, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,44); @@ -129,8 +129,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == '12 hours ago', result.text ); - ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 0, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 14, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,0,14); @@ -146,9 +146,9 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == '12 seconds ago', result.text ); - ok(result.start.get('hour') == 12, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('second') == 48, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); + ok(result.start.get('second') == 48, 'Test Result - (Second) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 12, 13, 48); @@ -164,9 +164,9 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == 'three seconds ago', result.text ); - ok(result.start.get('hour') == 12, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('second') == 57, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); + ok(result.start.get('second') == 57, 'Test Result - (Second) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 12, 13, 57); @@ -203,8 +203,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 3, 'Wrong index'); ok(result.text == 'half An hour ago', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 44, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 44, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,44); @@ -240,8 +240,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == 'a min before', result.text ); - ok(result.start.get('hour') == 12, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,12,13); diff --git a/Tests/SwiftyChronoTests/JS/en/test_en_time_exp.js b/Tests/SwiftyChronoTests/JS/en/test_en_time_exp.js index 11b6192..df2d8d8 100644 --- a/Tests/SwiftyChronoTests/JS/en/test_en_time_exp.js +++ b/Tests/SwiftyChronoTests/JS/en/test_en_time_exp.js @@ -12,8 +12,8 @@ test("Test - Single Expression", function() { ok(result.text == '8:10', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('day')) @@ -39,8 +39,8 @@ test("Test - Single Expression", function() { ok(result.text == '8:10 PM', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 20, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 20, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -60,8 +60,8 @@ test("Test - Single Expression", function() { ok(result.text == '1230pm', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 30, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 30, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -81,8 +81,8 @@ test("Test - Single Expression", function() { ok(result.text == '5:16p', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 16, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 17, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 16, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -102,8 +102,8 @@ test("Test - Single Expression", function() { ok(result.text == '5:16 p.m.', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 16, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 17, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 16, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -123,8 +123,8 @@ test("Test - Single Expression", function() { ok(result.text == 'at 6.13 AM', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 6, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6, 13); @@ -202,8 +202,8 @@ test("Test - Range Expression", function() { ok(result.text == '8:10 - 12.32', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('day')) ok(!result.start.isCertain('month')) @@ -218,8 +218,8 @@ test("Test - Range Expression", function() { ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.end.get('minute') == 32, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.end.get('minute') == 32, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.end.isCertain('day')) ok(!result.end.isCertain('month')) @@ -244,18 +244,18 @@ test("Test - Range Expression", function() { ok(result.text == 'from 6:30pm to 11:00pm', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('minute') == 30, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.start)) + ok(result.start.get('hour') == 18, 'Test Result - (Hour) ' + JSON.stringify(result.start)) + ok(result.start.get('minute') == 30, 'Test Result - (Minute) ' + JSON.stringify(result.start)) + ok(result.start.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.start)) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 18, 30); ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 23, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.end) ) + ok(result.end.get('hour') == 23, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.end) ) var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 10, 23, 0); @@ -294,7 +294,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('millisecond')) @@ -317,7 +317,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 22, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 12, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 12, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 59, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('millisecond')) @@ -340,7 +340,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 7, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 0, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -355,7 +355,7 @@ test("Test - Date + Time Expression", function() { ok(result.end.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(result.end.get('meridiem') == 0, 'Test Result - (meridiem) ' + JSON.stringify(result.end) ) @@ -381,7 +381,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 19, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -396,7 +396,7 @@ test("Test - Date + Time Expression", function() { ok(result.end.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 20, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(result.end.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.end) ) @@ -424,7 +424,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 13, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -434,7 +434,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 11, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) @@ -453,7 +453,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 13, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -463,7 +463,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 19, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) @@ -482,7 +482,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 13, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -492,7 +492,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 11, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) @@ -511,7 +511,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 1, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 0, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -521,7 +521,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) @@ -648,4 +648,4 @@ test("Test - Random date + time expression", function() { var text = "at midnight"; var result = chrono.parse(text)[0]; ok(result.text == text, result.text) -}) \ No newline at end of file +}) diff --git a/Tests/SwiftyChronoTests/JS/es/test_es_casual.js b/Tests/SwiftyChronoTests/JS/es/test_es_casual.js index 3c5ee07..a2ba9a7 100644 --- a/Tests/SwiftyChronoTests/JS/es/test_es_casual.js +++ b/Tests/SwiftyChronoTests/JS/es/test_es_casual.js @@ -111,7 +111,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ) ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 9, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('hour') == 0, 'Test Result - (hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 0, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 9, 0); @@ -132,7 +132,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ) ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('hour') == 6, 'Test Result - (hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6); @@ -153,7 +153,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ) ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('hour') == 18, 'Test Result - (hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 18, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 18); diff --git a/Tests/SwiftyChronoTests/JS/es/test_es_time_ago.js b/Tests/SwiftyChronoTests/JS/es/test_es_time_ago.js index 6e90d88..64af777 100644 --- a/Tests/SwiftyChronoTests/JS/es/test_es_time_ago.js +++ b/Tests/SwiftyChronoTests/JS/es/test_es_time_ago.js @@ -48,8 +48,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index') ok(result.text == 'hace 15 minutos', result.text ) - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 59, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,59); diff --git a/Tests/SwiftyChronoTests/JS/es/test_es_time_exp.js b/Tests/SwiftyChronoTests/JS/es/test_es_time_exp.js index 46d38b2..6e317b0 100644 --- a/Tests/SwiftyChronoTests/JS/es/test_es_time_exp.js +++ b/Tests/SwiftyChronoTests/JS/es/test_es_time_exp.js @@ -12,8 +12,8 @@ test("Test - Single Expression", function() { ok(result.text == 'a las 6.13 AM', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 6, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6, 13); @@ -36,8 +36,8 @@ test("Test - Range Expression", function() { ok(result.text == '8:10 - 12.32', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('day')) ok(!result.start.isCertain('month')) @@ -52,8 +52,8 @@ test("Test - Range Expression", function() { ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.end.get('minute') == 32, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.end.get('minute') == 32, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.end.isCertain('day')) ok(!result.end.isCertain('month')) @@ -78,18 +78,18 @@ test("Test - Range Expression", function() { ok(result.text == 'de 6:30pm a 11:00pm', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('minute') == 30, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.start)) + ok(result.start.get('hour') == 18, 'Test Result - (Hour) ' + JSON.stringify(result.start)) + ok(result.start.get('minute') == 30, 'Test Result - (Minute) ' + JSON.stringify(result.start)) + ok(result.start.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.start)) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 18, 30); ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 23, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.end) ) + ok(result.end.get('hour') == 23, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.end) ) var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 10, 23, 0); @@ -113,7 +113,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 22, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 12, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 12, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 59, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('millisecond')) @@ -141,7 +141,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 13, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -151,7 +151,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 11, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) diff --git a/Tests/SwiftyChronoTests/JS/fr/test_fr_casual.js b/Tests/SwiftyChronoTests/JS/fr/test_fr_casual.js index 5d1924d..f99b0ff 100644 --- a/Tests/SwiftyChronoTests/JS/fr/test_fr_casual.js +++ b/Tests/SwiftyChronoTests/JS/fr/test_fr_casual.js @@ -111,7 +111,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 9, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 0, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 0, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 9, 0); @@ -132,7 +132,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 8, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 8); @@ -153,7 +153,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 14, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 14, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 14); @@ -173,7 +173,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 14, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 14, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 14); @@ -194,7 +194,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 18, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 18, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 18); @@ -259,7 +259,7 @@ test("Test - Combined Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 11, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 11, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 11, 11); @@ -283,7 +283,7 @@ test("Test - Casual date range", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 4, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 4, 12); @@ -316,7 +316,7 @@ test("Test - Casual date range", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 12); @@ -327,7 +327,7 @@ test("Test - Casual date range", function() { ok(result.end.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.end.get('day') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 17, 12); diff --git a/Tests/SwiftyChronoTests/JS/fr/test_fr_little_endian.js b/Tests/SwiftyChronoTests/JS/fr/test_fr_little_endian.js index 06078d8..788fe9a 100644 --- a/Tests/SwiftyChronoTests/JS/fr/test_fr_little_endian.js +++ b/Tests/SwiftyChronoTests/JS/fr/test_fr_little_endian.js @@ -391,7 +391,7 @@ test("Test - Combined expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 5, 'Test Result - (Month) ' + JSON.stringify(result) ); ok(result.start.get('day') == 7, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 11, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 5-1, 7, 11, 0); diff --git a/Tests/SwiftyChronoTests/JS/fr/test_fr_time_ago.js b/Tests/SwiftyChronoTests/JS/fr/test_fr_time_ago.js index 11a35d9..bdcaac5 100644 --- a/Tests/SwiftyChronoTests/JS/fr/test_fr_time_ago.js +++ b/Tests/SwiftyChronoTests/JS/fr/test_fr_time_ago.js @@ -48,8 +48,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == 'il y a 15 minutes', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 59, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 59, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,59); @@ -65,8 +65,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 3, 'Wrong index'); ok(result.text == 'il y a 12 heures', result.text ); - ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 0, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 14, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,0,14); @@ -81,8 +81,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 3, 'Wrong index'); ok(result.text == 'half an hour ago', result.text ); - ok(result.start.get('hour') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 44, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 11, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 44, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,11,44); @@ -98,8 +98,8 @@ test("Test - Single Expression", function() { if(result){ ok(result.index == 0, 'Wrong index'); ok(result.text == 'il y a 12 heures', result.text ); - ok(result.start.get('hour') == 0, 'Test Result - (Month) ' + JSON.stringify(result.start) ); - ok(result.start.get('minute') == 14, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 0, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('minute') == 14, 'Test Result - (Minute) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012,7,10,0,14); diff --git a/Tests/SwiftyChronoTests/JS/fr/test_fr_time_exp.js b/Tests/SwiftyChronoTests/JS/fr/test_fr_time_exp.js index 1020f37..06b43e9 100644 --- a/Tests/SwiftyChronoTests/JS/fr/test_fr_time_exp.js +++ b/Tests/SwiftyChronoTests/JS/fr/test_fr_time_exp.js @@ -12,8 +12,8 @@ test("Test - Single Expression", function() { ok(result.text == '8h10', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('day')) @@ -39,8 +39,8 @@ test("Test - Single Expression", function() { ok(result.text == '8h10m', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('day')) @@ -66,8 +66,8 @@ test("Test - Single Expression", function() { ok(result.text == '8h10m00', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('day')) @@ -93,8 +93,8 @@ test("Test - Single Expression", function() { ok(result.text == '8h10m00s', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('day')) @@ -120,8 +120,8 @@ test("Test - Single Expression", function() { ok(result.text == '8:10 PM', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 20, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 20, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -141,8 +141,8 @@ test("Test - Single Expression", function() { ok(result.text == '8h10 PM', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 20, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 20, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -163,8 +163,8 @@ test("Test - Single Expression", function() { ok(result.text == '1230pm', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 30, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 30, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -184,8 +184,8 @@ test("Test - Single Expression", function() { ok(result.text == '5:16p', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 16, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 17, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 16, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -205,8 +205,8 @@ test("Test - Single Expression", function() { ok(result.text == '5h16p', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 16, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 17, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 16, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -226,8 +226,8 @@ test("Test - Single Expression", function() { ok(result.text == '5h16mp', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 16, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 17, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 16, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -247,8 +247,8 @@ test("Test - Single Expression", function() { ok(result.text == '5:16 p.m.', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 16, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 17, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 16, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -268,8 +268,8 @@ test("Test - Single Expression", function() { ok(result.text == '5h16 p.m.', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 16, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 17, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 16, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('second')) ok(!result.start.isCertain('millisecond')) @@ -289,8 +289,8 @@ test("Test - Single Expression", function() { ok(result.text == 'à 6.13 AM', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 6, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6, 13); @@ -424,8 +424,8 @@ test("Test - Range Expression", function() { ok(result.text == '8:10 - 12.32', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('day')) ok(!result.start.isCertain('month')) @@ -440,8 +440,8 @@ test("Test - Range Expression", function() { ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.end.get('minute') == 32, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.end.get('minute') == 32, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.end.isCertain('day')) ok(!result.end.isCertain('month')) @@ -466,8 +466,8 @@ test("Test - Range Expression", function() { ok(result.text == '8:10 - 12h32', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('day')) ok(!result.start.isCertain('month')) @@ -482,8 +482,8 @@ test("Test - Range Expression", function() { ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.end.get('minute') == 32, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.end.get('minute') == 32, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.end.isCertain('day')) ok(!result.end.isCertain('month')) @@ -509,18 +509,18 @@ test("Test - Range Expression", function() { ok(result.text == 'from 6:30pm to 11:00pm', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('minute') == 30, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.start)) + ok(result.start.get('hour') == 18, 'Test Result - (Hour) ' + JSON.stringify(result.start)) + ok(result.start.get('minute') == 30, 'Test Result - (Minute) ' + JSON.stringify(result.start)) + ok(result.start.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.start)) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 18, 30); ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 23, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.end) ) + ok(result.end.get('hour') == 23, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.end) ) var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 10, 23, 0); @@ -564,7 +564,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('millisecond')) @@ -587,7 +587,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 10, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 12, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 12, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 59, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('millisecond')) @@ -610,7 +610,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 6, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 15, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 20, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 00, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 00, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 00, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('millisecond')) @@ -633,7 +633,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 7, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('meridiem')) @@ -648,7 +648,7 @@ test("Test - Date + Time Expression", function() { ok(result.end.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem')) @@ -674,7 +674,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 7, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('meridiem')) @@ -689,7 +689,7 @@ test("Test - Date + Time Expression", function() { ok(result.end.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 20, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.start.isCertain('meridiem')) @@ -717,7 +717,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 13, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -727,7 +727,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 11, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) @@ -746,7 +746,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 13, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -756,7 +756,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 4, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 19, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) @@ -775,7 +775,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 13, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -785,7 +785,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 11, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) @@ -804,7 +804,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 1, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 0, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -814,7 +814,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) @@ -956,4 +956,4 @@ test("Test - Random date + time expression", function() { var text = "à minuit"; var result = chrono.parse(text)[0]; ok(result.text == text, result.text) -}) \ No newline at end of file +}) diff --git a/Tests/SwiftyChronoTests/JS/zh_hans/test_zh_hans_casual.js b/Tests/SwiftyChronoTests/JS/zh_hans/test_zh_hans_casual.js index e7ff2dd..c50d353 100644 --- a/Tests/SwiftyChronoTests/JS/zh_hans/test_zh_hans_casual.js +++ b/Tests/SwiftyChronoTests/JS/zh_hans/test_zh_hans_casual.js @@ -91,7 +91,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 9, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 22, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 22, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 9, 22); @@ -112,7 +112,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 6, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6); @@ -132,7 +132,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 22, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 22, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 22); @@ -189,7 +189,7 @@ test("Test - Casual date range", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 12); @@ -200,7 +200,7 @@ test("Test - Casual date range", function() { ok(result.end.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.end.get('day') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 17, 12); diff --git a/Tests/SwiftyChronoTests/JS/zh_hans/test_zh_hans_time_exp.js b/Tests/SwiftyChronoTests/JS/zh_hans/test_zh_hans_time_exp.js index 45fd6ef..6bfd2fd 100644 --- a/Tests/SwiftyChronoTests/JS/zh_hans/test_zh_hans_time_exp.js +++ b/Tests/SwiftyChronoTests/JS/zh_hans/test_zh_hans_time_exp.js @@ -12,8 +12,8 @@ test("Test - Single Expression", function() { ok(result.text == '上午6点13分', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 6, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6, 13); @@ -36,8 +36,8 @@ test("Test - Range Expression", function() { ok(result.text == '由今朝八点十分至下午11点32分', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.isCertain('day')) ok(result.start.isCertain('month')) @@ -52,8 +52,8 @@ test("Test - Range Expression", function() { ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 23, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.end.get('minute') == 32, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.end.get('hour') == 23, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.end.get('minute') == 32, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.end.isCertain('day')) ok(!result.end.isCertain('month')) @@ -78,18 +78,18 @@ test("Test - Range Expression", function() { ok(result.text == '6点30pm-11点pm', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('minute') == 30, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.start)) + ok(result.start.get('hour') == 18, 'Test Result - (Hour) ' + JSON.stringify(result.start)) + ok(result.start.get('minute') == 30, 'Test Result - (Minute) ' + JSON.stringify(result.start)) + ok(result.start.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.start)) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 18, 30); ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 23, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.end) ) + ok(result.end.get('hour') == 23, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.end) ) var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 10, 23, 0); @@ -113,7 +113,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 26, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 15, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 30, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 30, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 59, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('millisecond')) @@ -141,7 +141,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 13, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -151,7 +151,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 11, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) diff --git a/Tests/SwiftyChronoTests/JS/zh_hant/test_zh_hant_casual.js b/Tests/SwiftyChronoTests/JS/zh_hant/test_zh_hant_casual.js index aa741b5..499d6df 100644 --- a/Tests/SwiftyChronoTests/JS/zh_hant/test_zh_hant_casual.js +++ b/Tests/SwiftyChronoTests/JS/zh_hant/test_zh_hant_casual.js @@ -111,7 +111,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 9, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 22, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 22, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 9, 22); @@ -132,7 +132,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 6, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6); @@ -153,7 +153,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 15, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 15, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 15); @@ -174,7 +174,7 @@ test("Test - Single Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 22, 'Test Result - (hour) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 22, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 22); @@ -199,7 +199,7 @@ test("Test - Combined Expression", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 17, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 17); @@ -223,7 +223,7 @@ test("Test - Casual date range", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 4, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 4, 12); @@ -256,7 +256,7 @@ test("Test - Casual date range", function() { ok(result.start.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.start.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.start.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 12); @@ -267,7 +267,7 @@ test("Test - Casual date range", function() { ok(result.end.get('year') == 2012, 'Test Result - (Year) ' + JSON.stringify(result.start) ); ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ); ok(result.end.get('day') == 17, 'Test Result - (Day) ' + JSON.stringify(result.start) ); - ok(result.end.get('hour') == 12, 'Test Result - (Day) ' + JSON.stringify(result.start) ); + ok(result.end.get('hour') == 12, 'Test Result - (Hour) ' + JSON.stringify(result.start) ); var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 17, 12); diff --git a/Tests/SwiftyChronoTests/JS/zh_hant/test_zh_hant_time_exp.js b/Tests/SwiftyChronoTests/JS/zh_hant/test_zh_hant_time_exp.js index 4b902c4..5f625ac 100644 --- a/Tests/SwiftyChronoTests/JS/zh_hant/test_zh_hant_time_exp.js +++ b/Tests/SwiftyChronoTests/JS/zh_hant/test_zh_hant_time_exp.js @@ -12,8 +12,8 @@ test("Test - Single Expression", function() { ok(result.text == '上午6點13分', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 6, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 13, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 6, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 13, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 6, 13); @@ -36,8 +36,8 @@ test("Test - Range Expression", function() { ok(result.text == '由今朝八點十分至下午11點32分', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 8, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.start.get('hour') == 8, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 10, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.isCertain('day')) ok(result.start.isCertain('month')) @@ -52,8 +52,8 @@ test("Test - Range Expression", function() { ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 23, 'Test Result - (Day) ' + JSON.stringify(result.start) ) - ok(result.end.get('minute') == 32, 'Test Result - (Day) ' + JSON.stringify(result.start) ) + ok(result.end.get('hour') == 23, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) + ok(result.end.get('minute') == 32, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(!result.end.isCertain('day')) ok(!result.end.isCertain('month')) @@ -78,18 +78,18 @@ test("Test - Range Expression", function() { ok(result.text == '6點30pm-11點pm', result.text ) ok(result.start, JSON.stringify(result.start) ) - ok(result.start.get('hour') == 18, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('minute') == 30, 'Test Result - (Day) ' + JSON.stringify(result.start)) - ok(result.start.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.start)) + ok(result.start.get('hour') == 18, 'Test Result - (Hour) ' + JSON.stringify(result.start)) + ok(result.start.get('minute') == 30, 'Test Result - (Minute) ' + JSON.stringify(result.start)) + ok(result.start.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.start)) var resultDate = result.start.date(); var expectDate = new Date(2012, 7, 10, 18, 30); ok(Math.abs(expectDate.getTime() - resultDate.getTime()) < 100000, 'Test result.startDate ' + resultDate +'/' +expectDate) ok(result.end, JSON.stringify(result.start) ) - ok(result.end.get('hour') == 23, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (Day) ' + JSON.stringify(result.end) ) - ok(result.end.get('meridiem') == 1, 'Test Result - (Day) ' + JSON.stringify(result.end) ) + ok(result.end.get('hour') == 23, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('meridiem') == 1, 'Test Result - (Meridiem) ' + JSON.stringify(result.end) ) var resultDate = result.end.date(); var expectDate = new Date(2012, 7, 10, 23, 0); @@ -113,7 +113,7 @@ test("Test - Date + Time Expression", function() { ok(result.start.get('month') == 11, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 26, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 15, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 30, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 30, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 59, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(!result.start.isCertain('millisecond')) @@ -141,7 +141,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.start.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.start) ) ok(result.start.get('day') == 10, 'Test Result - (Day) ' + JSON.stringify(result.start) ) ok(result.start.get('hour') == 13, 'Test Result - (Hour) ' + JSON.stringify(result.start) ) - ok(result.start.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.start) ) + ok(result.start.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.start) ) ok(result.start.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.start) ) ok(result.start.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.start) ) ok(result.start.get('meridiem') == 1, 'Test Result - (meridiem) ' + JSON.stringify(result.start) ) @@ -151,7 +151,7 @@ test("Test - Time Expression's Meridiem imply", function() { ok(result.end.get('month') == 8, 'Test Result - (Month) ' + JSON.stringify(result.end) ) ok(result.end.get('day') == 11, 'Test Result - (Day) ' + JSON.stringify(result.end) ) ok(result.end.get('hour') == 3, 'Test Result - (Hour) ' + JSON.stringify(result.end) ) - ok(result.end.get('minute') == 0, 'Test Result - (minute) ' + JSON.stringify(result.end) ) + ok(result.end.get('minute') == 0, 'Test Result - (Minute) ' + JSON.stringify(result.end) ) ok(result.end.get('second') == 0, 'Test Result - (second) ' + JSON.stringify(result.end) ) ok(result.end.get('millisecond') == 0, 'Test Result - (millisecond) ' + JSON.stringify(result.end) ) ok(!result.end.isCertain('meridiem'), JSON.stringify(result)) From a9ad8734bff3e7a45de119e2ad619020ee0f395e Mon Sep 17 00:00:00 2001 From: hectr Date: Sat, 27 Apr 2019 02:07:04 +0200 Subject: [PATCH 2/3] Translate Tomorrow into spanish in es casual test --- Tests/SwiftyChronoTests/JS/es/test_es_casual.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/SwiftyChronoTests/JS/es/test_es_casual.js b/Tests/SwiftyChronoTests/JS/es/test_es_casual.js index a2ba9a7..d6064a1 100644 --- a/Tests/SwiftyChronoTests/JS/es/test_es_casual.js +++ b/Tests/SwiftyChronoTests/JS/es/test_es_casual.js @@ -66,7 +66,7 @@ test("Test - Single Expression", function() { } // Say.."Tomorrow" in the late night (1 AM) - var text = "La fecha límite es Tomorrow"; + var text = "La fecha límite es Mañana"; var results = chrono.casual.parse(text, new Date(2012, 7, 10, 1)); ok(results.length == 1, JSON.stringify( results ) ) From 3d9a3cf5e6d7af358cfa1111d043e3197e26fa1f Mon Sep 17 00:00:00 2001 From: hectr Date: Sat, 27 Apr 2019 02:14:42 +0200 Subject: [PATCH 3/3] Fix es weekday parser adverbs gender and translate week into Spanish --- Sources/Parsers/ES/ESWeekdayParser.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/Parsers/ES/ESWeekdayParser.swift b/Sources/Parsers/ES/ESWeekdayParser.swift index 81495a2..b81a78d 100644 --- a/Sources/Parsers/ES/ESWeekdayParser.swift +++ b/Sources/Parsers/ES/ESWeekdayParser.swift @@ -13,7 +13,7 @@ private let PATTERN = "(\\W|^)" + "(?:(este|pasado|pr[oó]ximo)\\s*)?" + "(\(ES_WEEKDAY_OFFSET.keys.joined(separator: "|")))" + "(?:\\s*(?:\\,|\\)|\\）))?" + - "(?:\\s*(este|pasado|pr[óo]ximo)\\s*week)?" + + "(?:\\s*(esta|pasada|pr[óo]xima)\\s*semana)?" + "(?=\\W|$)" private let prefixGroup = 2 @@ -39,13 +39,13 @@ public class ESWeekdayParser: Parser { if prefix != nil || postfix != nil { let norm = (prefix ?? postfix ?? "").lowercased() - if norm == "pasado" { + if norm == "pasado" || norm == "pasada" { modifier = "last" } - else if norm == "próximo" || norm == "proximo" { + else if norm == "próximo" || norm == "proximo" || norm == "próxima" || norm == "proxima" { modifier = "next" } - else if norm == "este" { + else if norm == "este" || norm == "esta" { modifier = "this" } }