diff options
| author | Victor Chang <vichang@google.com> | 2021-04-30 12:14:48 +0100 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2021-04-30 12:29:50 +0100 |
| commit | 0be863c8690ce683c6de7e3fe3c45ed46a5b02d0 (patch) | |
| tree | e7e15f0b321982f01b6fc6b9054bc55d3bff4182 /android_icu4j | |
| parent | b3db2a3e2b21888430a560535f9686fc13aefc8f (diff) | |
| download | icu-0be863c8690ce683c6de7e3fe3c45ed46a5b02d0.tar.gz | |
Partial Cherry-pick: Test changes required for cherry-picks from CLDR 39
Upstream commit: https://github.com/unicode-org/icu/commit/3333fd557c398c98805f1ffdc63df796dc2bdcbd
Only take the test change in icu4c/source/test/intltest/dtifmtts.cpp
and icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java
Bug: 186152744
Test: atest CtsIcu4cTestCases
Change-Id: Ia961e2e202bbd7fede809b82f94aa49c112fec4c
Diffstat (limited to 'android_icu4j')
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/format/DateIntervalFormatTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/format/DateIntervalFormatTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/format/DateIntervalFormatTest.java index 2d4c948cd..e361cdae1 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/format/DateIntervalFormatTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/format/DateIntervalFormatTest.java @@ -433,7 +433,7 @@ public class DateIntervalFormatTest extends TestFmwk { "zh", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEdMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e09\\u81f32008\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e94", - "zh", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hm", "2007/10/10\\u4e0a\\u534810:10 \\u2013 2008/10/10\\u4e0a\\u534810:10", + "zh", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hm", "2007/10/10 \\u4e0a\\u534810:10 \\u2013 2008/10/10 \\u4e0a\\u534810:10", "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u81f311\\u670810\\u65e5", @@ -443,7 +443,7 @@ public class DateIntervalFormatTest extends TestFmwk { "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMMM", "10\\u670810\\u65e5\\u661f\\u671f\\u4e09\\u81f311\\u670810\\u65e5\\u661f\\u671f\\u516d", - "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmv", "2007/10/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10", + "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmv", "2007/10/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10", "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEdMMMMy", "2007\\u5e7411\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c", @@ -476,9 +476,9 @@ public class DateIntervalFormatTest extends TestFmwk { "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "MMMM", "\\u5341\\u4E00\\u6708", // (fixed expected result per ticket 6872<-6626 and others) - "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmz", "2007/11/10GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20GMT-8 \\u4e0a\\u534810:10", + "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmz", "2007/11/10 GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20 GMT-8 \\u4e0a\\u534810:10", - "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "h", "2007/11/10\\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20\\u4e0a\\u534810\\u65f6", + "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "h", "2007/11/10 \\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20 \\u4e0a\\u534810\\u65f6", "zh", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "EEEEdMMMMy", "2007\\u5e741\\u670810\\u65e5\\u661f\\u671f\\u4e09", // (fixed expected result per ticket 6872<-6626) |