ICU-20109 Upgrade Java RelativeDateTimeFormatter QUARTER to @draft

(#221)

add tests for AbsoluteUnit.QUARTER

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java
index 6e90d417d365f03a6233e3187aa972fd03721665..3cba6ac371a3074a0e5685028a0749e8825b8a0d 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java
@@ -239,10 +239,9 @@ public final class RelativeDateTimeFormatter {
 
         /**
          * Quarter
-         * @internal TODO: propose for addition in ICU 57
-         * @deprecated This API is ICU internal only.
+         * @draft ICU 64
+         * @provisional This API might change or be removed in a future release.
          */
-        @Deprecated
         QUARTER,
     }
 

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java
index 5e186672197944a39b0afa4976db715e8a3c0cd1..1800e10fd76c61e19c30cae6426e4b6983e589d3 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/RelativeDateTimeFormatterTest.java
@@ -366,6 +366,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.NEXT, AbsoluteUnit.DAY, "tomorrow"},
                 {Direction.NEXT, AbsoluteUnit.WEEK, "next week"},
                 {Direction.NEXT, AbsoluteUnit.MONTH, "next month"},
+                {Direction.NEXT, AbsoluteUnit.QUARTER, "next quarter"},
                 {Direction.NEXT, AbsoluteUnit.YEAR, "next year"},
                 {Direction.NEXT, AbsoluteUnit.MONDAY, "next Monday"},
                 {Direction.NEXT, AbsoluteUnit.TUESDAY, "next Tuesday"},
@@ -380,6 +381,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.LAST, AbsoluteUnit.DAY, "yesterday"},
                 {Direction.LAST, AbsoluteUnit.WEEK, "last week"},
                 {Direction.LAST, AbsoluteUnit.MONTH, "last month"},
+                {Direction.LAST, AbsoluteUnit.QUARTER, "last quarter"},
                 {Direction.LAST, AbsoluteUnit.YEAR, "last year"},
                 {Direction.LAST, AbsoluteUnit.MONDAY, "last Monday"},
                 {Direction.LAST, AbsoluteUnit.TUESDAY, "last Tuesday"},
@@ -392,6 +394,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.THIS, AbsoluteUnit.DAY, "today"},
                 {Direction.THIS, AbsoluteUnit.WEEK, "this week"},
                 {Direction.THIS, AbsoluteUnit.MONTH, "this month"},
+                {Direction.THIS, AbsoluteUnit.QUARTER, "this quarter"},
                 {Direction.THIS, AbsoluteUnit.YEAR, "this year"},
                 {Direction.THIS, AbsoluteUnit.MONDAY, "this Monday"},
                 {Direction.THIS, AbsoluteUnit.TUESDAY, "this Tuesday"},
@@ -404,6 +407,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.PLAIN, AbsoluteUnit.DAY, "day"},
                 {Direction.PLAIN, AbsoluteUnit.WEEK, "week"},
                 {Direction.PLAIN, AbsoluteUnit.MONTH, "month"},
+                {Direction.PLAIN, AbsoluteUnit.QUARTER, "quarter"},
                 {Direction.PLAIN, AbsoluteUnit.YEAR, "year"},
                 {Direction.PLAIN, AbsoluteUnit.MONDAY, "Monday"},
                 {Direction.PLAIN, AbsoluteUnit.TUESDAY, "Tuesday"},
@@ -430,6 +434,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.NEXT, AbsoluteUnit.DAY, "Tomorrow"},
                 {Direction.NEXT, AbsoluteUnit.WEEK, "Next week"},
                 {Direction.NEXT, AbsoluteUnit.MONTH, "Next month"},
+                {Direction.NEXT, AbsoluteUnit.QUARTER, "Next quarter"},
                 {Direction.NEXT, AbsoluteUnit.YEAR, "Next year"},
 
                 {Direction.NEXT, AbsoluteUnit.MONDAY, "Next Monday"},
@@ -445,6 +450,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.LAST, AbsoluteUnit.DAY, "Yesterday"},
                 {Direction.LAST, AbsoluteUnit.WEEK, "Last week"},
                 {Direction.LAST, AbsoluteUnit.MONTH, "Last month"},
+                {Direction.LAST, AbsoluteUnit.QUARTER, "Last quarter"},
                 {Direction.LAST, AbsoluteUnit.YEAR, "Last year"},
                 {Direction.LAST, AbsoluteUnit.MONDAY, "Last Monday"},
                 {Direction.LAST, AbsoluteUnit.TUESDAY, "Last Tuesday"},
@@ -457,6 +463,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.THIS, AbsoluteUnit.DAY, "Today"},
                 {Direction.THIS, AbsoluteUnit.WEEK, "This week"},
                 {Direction.THIS, AbsoluteUnit.MONTH, "This month"},
+                {Direction.THIS, AbsoluteUnit.QUARTER, "This quarter"},
                 {Direction.THIS, AbsoluteUnit.YEAR, "This year"},
                 {Direction.THIS, AbsoluteUnit.MONDAY, "This Monday"},
                 {Direction.THIS, AbsoluteUnit.TUESDAY, "This Tuesday"},
@@ -469,6 +476,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.PLAIN, AbsoluteUnit.DAY, "Day"},
                 {Direction.PLAIN, AbsoluteUnit.WEEK, "Week"},
                 {Direction.PLAIN, AbsoluteUnit.MONTH, "Month"},
+                {Direction.PLAIN, AbsoluteUnit.QUARTER, "Quarter"},
                 {Direction.PLAIN, AbsoluteUnit.YEAR, "Year"},
                 {Direction.PLAIN, AbsoluteUnit.MONDAY, "Monday"},
                 {Direction.PLAIN, AbsoluteUnit.TUESDAY, "Tuesday"},
@@ -501,6 +509,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.NEXT, AbsoluteUnit.WEEK, "next wk."},
 
                 {Direction.NEXT, AbsoluteUnit.MONTH, "next mo."},
+                {Direction.NEXT, AbsoluteUnit.QUARTER, "next qtr."},
                 {Direction.NEXT, AbsoluteUnit.YEAR, "next yr."},
 
                 {Direction.NEXT, AbsoluteUnit.MONDAY, "next Mon."},
@@ -517,6 +526,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.LAST, AbsoluteUnit.DAY, "yesterday"},
                 {Direction.LAST, AbsoluteUnit.WEEK, "last wk."},
                 {Direction.LAST, AbsoluteUnit.MONTH, "last mo."},
+                {Direction.LAST, AbsoluteUnit.QUARTER, "last qtr."},
                 {Direction.LAST, AbsoluteUnit.YEAR, "last yr."},
                 {Direction.LAST, AbsoluteUnit.MONDAY, "last Mon."},
                 {Direction.LAST, AbsoluteUnit.TUESDAY, "last Tue."},
@@ -531,6 +541,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.THIS, AbsoluteUnit.DAY, "today"},
                 {Direction.THIS, AbsoluteUnit.WEEK, "this wk."},
                 {Direction.THIS, AbsoluteUnit.MONTH, "this mo."},
+                {Direction.THIS, AbsoluteUnit.QUARTER, "this qtr."},
                 {Direction.THIS, AbsoluteUnit.YEAR, "this yr."},
                 {Direction.THIS, AbsoluteUnit.MONDAY, "this Mon."},
                 {Direction.THIS, AbsoluteUnit.TUESDAY, "this Tue."},
@@ -543,6 +554,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.PLAIN, AbsoluteUnit.DAY, "day"},
                 {Direction.PLAIN, AbsoluteUnit.WEEK, "wk."},
                 {Direction.PLAIN, AbsoluteUnit.MONTH, "mo."},
+                {Direction.PLAIN, AbsoluteUnit.QUARTER, "qtr."},
                 {Direction.PLAIN, AbsoluteUnit.YEAR, "yr."},
                 {Direction.PLAIN, AbsoluteUnit.MONDAY, "Mo"},
                 {Direction.PLAIN, AbsoluteUnit.TUESDAY, "Tu"},
@@ -575,6 +587,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.NEXT, AbsoluteUnit.WEEK, "next wk."},
 
                 {Direction.NEXT, AbsoluteUnit.MONTH, "next mo."},
+                {Direction.NEXT, AbsoluteUnit.QUARTER, "next qtr."},
                 {Direction.NEXT, AbsoluteUnit.YEAR, "next yr."},
 
                 {Direction.NEXT, AbsoluteUnit.MONDAY, "next M"},
@@ -591,6 +604,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.LAST, AbsoluteUnit.DAY, "yesterday"},
                 {Direction.LAST, AbsoluteUnit.WEEK, "last wk."},
                 {Direction.LAST, AbsoluteUnit.MONTH, "last mo."},
+                {Direction.LAST, AbsoluteUnit.QUARTER, "last qtr."},
                 {Direction.LAST, AbsoluteUnit.YEAR, "last yr."},
                 {Direction.LAST, AbsoluteUnit.MONDAY, "last M"},
                 {Direction.LAST, AbsoluteUnit.TUESDAY, "last Tu"},
@@ -603,6 +617,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.THIS, AbsoluteUnit.DAY, "today"},
                 {Direction.THIS, AbsoluteUnit.WEEK, "this wk."},
                 {Direction.THIS, AbsoluteUnit.MONTH, "this mo."},
+                {Direction.THIS, AbsoluteUnit.QUARTER, "this qtr."},
                 {Direction.THIS, AbsoluteUnit.YEAR, "this yr."},
                 {Direction.THIS, AbsoluteUnit.MONDAY, "this M"},
                 {Direction.THIS, AbsoluteUnit.TUESDAY, "this Tu"},
@@ -617,6 +632,7 @@ public class RelativeDateTimeFormatterTest extends TestFmwk {
                 {Direction.PLAIN, AbsoluteUnit.DAY, "day"},
                 {Direction.PLAIN, AbsoluteUnit.WEEK, "wk."},
                 {Direction.PLAIN, AbsoluteUnit.MONTH, "mo."},
+                {Direction.PLAIN, AbsoluteUnit.QUARTER, "qtr."},
                 {Direction.PLAIN, AbsoluteUnit.YEAR, "yr."},
                 {Direction.PLAIN, AbsoluteUnit.MONDAY, "M"},
                 {Direction.PLAIN, AbsoluteUnit.TUESDAY, "T"},