diff options
| author | Fredrik Roubert <roubert@google.com> | 2015-03-20 19:44:11 +0100 |
|---|---|---|
| committer | Fredrik Roubert <roubert@google.com> | 2015-10-02 12:35:48 +0200 |
| commit | a844c5a87154d8e21f46314b500182b968e1219a (patch) | |
| tree | 2424164ec05eeabdef58ed948db8d418f9d82fa1 | |
| parent | 8d98a6a81e97717b2d2ef62fa4ab033e43f15f5b (diff) | |
| download | icu-a844c5a87154d8e21f46314b500182b968e1219a.tar.gz | |
Android patch: ICU4J: Revert to "9" instead of "Month9".
This changes ICU4J tests to expect the changes made to Android ICU4C:
https://android.googlesource.com/platform/external/icu/+/fd15ce7
Change-Id: I5f94b1faf74dc38279a1c0328a6ba55df0374470
| -rw-r--r-- | icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java index 86fe91c7d..9e3212eac 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java @@ -4138,6 +4138,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { dateString[2] = dateStr2; } }; + // Android patch: Revert to "9" instead of "Month9". final MonthPatternItem[] items = { new MonthPatternItem( "root@calendar=chinese", DateFormat.LONG, "2012(ren-chen) M04 2", "2012(ren-chen) M04bis 2", "2012(ren-chen) M05 2" ), new MonthPatternItem( "root@calendar=chinese", DateFormat.SHORT, "2012-04-02", "2012-04bis-02", "2012-05-02" ), @@ -4146,7 +4147,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { new MonthPatternItem( "root@calendar=chinese", -3, "ren-chen-4-2", "ren-chen-4bis-2", "ren-chen-5-2" ), new MonthPatternItem( "root@calendar=chinese", -4, "ren-chen M04 2", "ren-chen M04bis 2", "ren-chen M05 2" ), new MonthPatternItem( "en@calendar=gregorian", -3, "2012-4-22", "2012-5-22", "2012-6-20" ), - new MonthPatternItem( "en@calendar=chinese", DateFormat.LONG, "Month4 2, 2012(ren-chen)", "Month4bis 2, 2012(ren-chen)", "Month5 2, 2012(ren-chen)" ), + new MonthPatternItem( "en@calendar=chinese", DateFormat.LONG, "4 2, 2012(ren-chen)", "4bis 2, 2012(ren-chen)", "5 2, 2012(ren-chen)" ), new MonthPatternItem( "en@calendar=chinese", DateFormat.SHORT, "4/2/2012", "4bis/2/2012", "5/2/2012" ), new MonthPatternItem( "zh@calendar=chinese", DateFormat.LONG, "2012\u58EC\u8FB0\u5E74\u56DB\u6708\u521D\u4E8C", "2012\u58EC\u8FB0\u5E74\u95F0\u56DB\u6708\u521D\u4E8C", @@ -4164,7 +4165,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { new MonthPatternItem( "zh_Hant@calendar=chinese", DateFormat.SHORT, "2012/4/2", "2012/\u958F4/2", "2012/5/2" ), new MonthPatternItem( "fr@calendar=chinese", DateFormat.LONG, "2 s\u00ECyu\u00E8 ren-chen", "2 s\u00ECyu\u00E8bis ren-chen", "2 w\u01D4yu\u00E8 ren-chen" ), new MonthPatternItem( "fr@calendar=chinese", DateFormat.SHORT, "2/4/29", "2/4bis/29", "2/5/29" ), - new MonthPatternItem( "en@calendar=dangi", DateFormat.LONG, "Month3bis 2, 2012(ren-chen)", "Month4 2, 2012(ren-chen)", "Month5 1, 2012(ren-chen)" ), + new MonthPatternItem( "en@calendar=dangi", DateFormat.LONG, "3bis 2, 2012(ren-chen)", "4 2, 2012(ren-chen)", "5 1, 2012(ren-chen)" ), new MonthPatternItem( "en@calendar=dangi", DateFormat.SHORT, "3bis/2/2012", "4/2/2012", "5/1/2012" ), new MonthPatternItem( "en@calendar=dangi", -2, "78x29-3bis-2", "78x29-4-2", "78x29-5-1" ), new MonthPatternItem( "ko@calendar=dangi", DateFormat.LONG, "\uC784\uC9C4\uB144 \uC7243\uC6D4 2\uC77C", @@ -4174,6 +4175,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { "29. 4. 2.", "29. 5. 1." ), }; + // Android patch end. // style: -1 -2 -3 -4 final String[] customPatterns = { "y-Ml-d", "G'x'y-Ml-d", "U-M-d", "U MMM d" }; // previously G and l for chinese cal only handled by ChineseDateFormat Calendar rootChineseCalendar = Calendar.getInstance(new ULocale("root@calendar=chinese")); |