diff options
| author | Neil Fuller <nfuller@google.com> | 2017-10-24 14:59:57 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2017-12-08 10:17:57 +0000 |
| commit | a386f91e3b84487614e269ae4daeafc59dddb808 (patch) | |
| tree | ee6f5ad9b83cced800dbe3686170d68471187592 /android_icu4j/src/main/tests | |
| parent | 3d5136bd4dcdeddccc57625e2b9bb70cca5b3ffb (diff) | |
| download | icu-a386f91e3b84487614e269ae4daeafc59dddb808.tar.gz | |
DO NOT MERGE: Backport 2017c icu test changesandroid-vts-8.1_r3
Incorporates the 2017c test changes from upstream:
http://bugs.icu-project.org/trac/changeset/40634
These changes should make CTS pass with both 2017b
(the stock release version) and 2017c.
Bug: 68878031
Bug: 68183339
Test: build only
Change-Id: Icf230d3a176d7a31dbde92b67cbb18baeedbff20
(cherry picked from commit 8b48ba7a2de62466e6a4344db948eed9e9cb73d5)
Diffstat (limited to 'android_icu4j/src/main/tests')
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/format/TimeZoneFormatTest.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeZoneFormatTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeZoneFormatTest.java index eb3d4feb0..039e239e9 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeZoneFormatTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/format/TimeZoneFormatTest.java @@ -373,6 +373,10 @@ public class TimeZoneFormatTest extends android.icu.dev.test.TestFmwk { int testLen = 0; for (int locidx = 0; locidx < LOCALES.length; locidx++) { logln("Locale: " + LOCALES[locidx].toString()); + if (LOCALES[locidx].getLanguage().equals("fa") + && logKnownIssue("13445", "Bidi control in localized GMT pattern")) { + continue; + } for (int patidx = 0; patidx < PATTERNS.length; patidx++) { logln(" pattern: " + PATTERNS[patidx]); String pattern = BASEPATTERN + " " + PATTERNS[patidx]; @@ -414,7 +418,8 @@ public class TimeZoneFormatTest extends android.icu.dev.test.TestFmwk { } } - if (id.equals("Pacific/Apia") && PATTERNS[patidx].equals("vvvv") + if ((id.equals("Pacific/Apia") || id.equals("Pacific/Midway") || id.equals("Pacific/Pago_Pago")) + && PATTERNS[patidx].equals("vvvv") && logKnownIssue("11052", "Ambiguous zone name - Samoa Time")) { continue; } |