From e6d208b6a0d514c4df558af3516ac2043a85b27d Mon Sep 17 00:00:00 2001 From: Frank Tang Date: Tue, 25 Sep 2018 22:22:48 -0700 Subject: [PATCH] [Intl] add tests for 'quarter' Add tests for 'quarter' unit in Intl.RelativeTimeFormat#format Bug: v8:7869 Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng Change-Id: I03077d5d89e1b9e459af0c31b5bf7378d9c4a1f0 Reviewed-on: https://chromium-review.googlesource.com/1244758 Commit-Queue: Frank Tang Reviewed-by: Sathya Gunasekaran Cr-Commit-Position: refs/heads/master@{#56249} --- test/intl/relative-time-format/format-en.js | 23 ++----------------- .../format-to-parts-plural.js | 3 +-- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/test/intl/relative-time-format/format-en.js b/test/intl/relative-time-format/format-en.js index cd58d65355..2af755dcbf 100644 --- a/test/intl/relative-time-format/format-en.js +++ b/test/intl/relative-time-format/format-en.js @@ -67,9 +67,6 @@ assertEquals('next month', longAuto.format(1, 'month')); assertEquals('in 2 months', longAuto.format(2, 'month')); assertEquals('in 345 months', longAuto.format(345, 'month')); -// "quarter" is not working in ICU now -// Tracked by ICU bug in http://bugs.icu-project.org/trac/ticket/12171 -/* assertEquals('3 quarters ago', longAuto.format(-3, 'quarter')); assertEquals('2 quarters ago', longAuto.format(-2, 'quarter')); assertEquals('last quarter', longAuto.format(-1, 'quarter')); @@ -78,7 +75,6 @@ assertEquals('this quarter', longAuto.format(-0, 'quarter')); assertEquals('next quarter', longAuto.format(1, 'quarter')); assertEquals('in 2 quarters', longAuto.format(2, 'quarter')); assertEquals('in 345 quarters', longAuto.format(345, 'quarter')); -*/ assertEquals('3 years ago', longAuto.format(-3, 'year')); assertEquals('2 years ago', longAuto.format(-2, 'year')); @@ -146,8 +142,6 @@ assertEquals('next mo.', shortAuto.format(1, 'month')); assertEquals('in 2 mo.', shortAuto.format(2, 'month')); assertEquals('in 345 mo.', shortAuto.format(345, 'month')); -// "quarter" is not working in ICU now -/* assertEquals('3 qtrs. ago', shortAuto.format(-3, 'quarter')); assertEquals('2 qtrs. ago', shortAuto.format(-2, 'quarter')); assertEquals('last qtr.', shortAuto.format(-1, 'quarter')); @@ -156,7 +150,6 @@ assertEquals('this qtr.', shortAuto.format(-0, 'quarter')); assertEquals('next qtr.', shortAuto.format(1, 'quarter')); assertEquals('in 2 qtrs.', shortAuto.format(2, 'quarter')); assertEquals('in 345 qtrs.', shortAuto.format(345, 'quarter')); -*/ assertEquals('3 yr. ago', shortAuto.format(-3, 'year')); assertEquals('2 yr. ago', shortAuto.format(-2, 'year')); @@ -225,8 +218,6 @@ assertEquals('next mo.', narrowAuto.format(1, 'month')); assertEquals('in 2 mo.', narrowAuto.format(2, 'month')); assertEquals('in 345 mo.', narrowAuto.format(345, 'month')); -// "quarter" is not working in ICU now -/* assertEquals('3 qtrs. ago', narrowAuto.format(-3, 'quarter')); assertEquals('2 qtrs. ago', narrowAuto.format(-2, 'quarter')); assertEquals('last qtr.', narrowAuto.format(-1, 'quarter')); @@ -235,7 +226,6 @@ assertEquals('this qtr.', narrowAuto.format(-0, 'quarter')); assertEquals('next qtr.', narrowAuto.format(1, 'quarter')); assertEquals('in 2 qtrs.', narrowAuto.format(2, 'quarter')); assertEquals('in 345 qtrs.', narrowAuto.format(345, 'quarter')); -*/ assertEquals('3 yr. ago', narrowAuto.format(-3, 'year')); assertEquals('2 yr. ago', narrowAuto.format(-2, 'year')); @@ -303,8 +293,6 @@ assertEquals('in 1 month', longAlways.format(1, 'month')); assertEquals('in 2 months', longAlways.format(2, 'month')); assertEquals('in 345 months', longAlways.format(345, 'month')); -// "quarter" is not working in ICU now -/* assertEquals('3 quarters ago', longAlways.format(-3, 'quarter')); assertEquals('2 quarters ago', longAlways.format(-2, 'quarter')); assertEquals('1 quarter ago', longAlways.format(-1, 'quarter')); @@ -313,7 +301,6 @@ assertEquals('0 quarters ago', longAlways.format(-0, 'quarter')); assertEquals('in 1 quarter', longAlways.format(1, 'quarter')); assertEquals('in 2 quarters', longAlways.format(2, 'quarter')); assertEquals('in 345 quarters', longAlways.format(345, 'quarter')); -*/ assertEquals('3 years ago', longAlways.format(-3, 'year')); assertEquals('2 years ago', longAlways.format(-2, 'year')); @@ -381,17 +368,14 @@ assertEquals('in 1 mo.', shortAlways.format(1, 'month')); assertEquals('in 2 mo.', shortAlways.format(2, 'month')); assertEquals('in 345 mo.', shortAlways.format(345, 'month')); -// "quarter" is not working in ICU now -/* assertEquals('3 qtrs. ago', shortAlways.format(-3, 'quarter')); assertEquals('2 qtrs. ago', shortAlways.format(-2, 'quarter')); assertEquals('1 qtr. ago', shortAlways.format(-1, 'quarter')); assertEquals('in 0 qtrs.', shortAlways.format(0, 'quarter')); -assertEquals('0 qtr. ago', shortAlways.format(-0, 'quarter')); +assertEquals('0 qtrs. ago', shortAlways.format(-0, 'quarter')); assertEquals('in 1 qtr.', shortAlways.format(1, 'quarter')); assertEquals('in 2 qtrs.', shortAlways.format(2, 'quarter')); assertEquals('in 345 qtrs.', shortAlways.format(345, 'quarter')); -*/ assertEquals('3 yr. ago', shortAlways.format(-3, 'year')); assertEquals('2 yr. ago', shortAlways.format(-2, 'year')); @@ -460,17 +444,14 @@ assertEquals('in 1 mo.', narrowAlways.format(1, 'month')); assertEquals('in 2 mo.', narrowAlways.format(2, 'month')); assertEquals('in 345 mo.', narrowAlways.format(345, 'month')); -// "quarter" is not working in ICU now -/* assertEquals('3 qtrs. ago', narrowAlways.format(-3, 'quarter')); assertEquals('2 qtrs. ago', narrowAlways.format(-2, 'quarter')); assertEquals('1 qtr. ago', narrowAlways.format(-1, 'quarter')); assertEquals('in 0 qtrs.', narrowAlways.format(0, 'quarter')); -assertEquals('0 qtr. ago', narrowAlways.format(-0, 'quarter')); +assertEquals('0 qtrs. ago', narrowAlways.format(-0, 'quarter')); assertEquals('in 1 qtr.', narrowAlways.format(1, 'quarter')); assertEquals('in 2 qtrs.', narrowAlways.format(2, 'quarter')); assertEquals('in 345 qtrs.', narrowAlways.format(345, 'quarter')); -*/ assertEquals('3 yr. ago', narrowAlways.format(-3, 'year')); assertEquals('2 yr. ago', narrowAlways.format(-2, 'year')); diff --git a/test/intl/relative-time-format/format-to-parts-plural.js b/test/intl/relative-time-format/format-to-parts-plural.js index cfe85e23d7..7e5e1b79a6 100644 --- a/test/intl/relative-time-format/format-to-parts-plural.js +++ b/test/intl/relative-time-format/format-to-parts-plural.js @@ -19,8 +19,7 @@ function verifyElement(part, expectedUnit) { } }; -// TODO(ftang): add "quarter" after the fix of 8151 -['year', 'month', 'week', 'day', 'hour', 'minute', 'second'].forEach( +['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second'].forEach( function(unit) { rtf.formatToParts(100, unit + 's').forEach( function(part) {