diff options
| author | Almaz Mingaleev <mingaleev@google.com> | 2021-10-26 14:13:03 +0100 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2021-11-26 11:26:49 +0000 |
| commit | 13c356cfebf593c9721ac358c5a1e79bdc7e4233 (patch) | |
| tree | 871e02167f6f1499e1efadc5607c4525f951c33a | |
| parent | 5a06ba7187c17b726a3d0b06141def73d2a9d0c0 (diff) | |
| download | icu-13c356cfebf593c9721ac358c5a1e79bdc7e4233.tar.gz | |
Android patch: Test changes for tzdata 2021a3
The patch has changed in ICU 70.
The previous version on aosp/master can be found at
https://r.android.com/1869976
TimeZoneTest was changed: America/Panama is not canonical
representation of America/Panama as we dropped that from backward file.
Bug: 204052899
Test: n/a
Change-Id: Ib4b3d61065608c5f48f7a2ccc56c8ff6fa37bece
| -rw-r--r-- | icu4c/source/test/intltest/tztest.cpp | 6 | ||||
| -rw-r--r-- | icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 0d58bab19..05e97d4e0 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -2079,7 +2079,11 @@ void TimeZoneTest::TestCanonicalID() { {"America/Antigua", "America/Port_of_Spain"}, {"America/Anguilla", "America/Port_of_Spain"}, {"America/Cayman", "America/Panama"}, - {"America/Coral_Harbour", "America/Panama"}, + // TODO(b/204533494): Enable this check. + // Android-changed: due to issues with time zones canonicity, decision was made to keep + // America/Coral_Harbour as alias to America/Atikokan. + // See more details in system/timezone/RELEASE_NOTES.md + // {"America/Coral_Harbour", "America/Panama"}, {"America/Curacao", "America/Aruba"}, {"America/Dominica", "America/Port_of_Spain"}, {"America/Grenada", "America/Port_of_Spain"}, diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index 0cb69f33c..8846257d8 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -1519,7 +1519,11 @@ public class TimeZoneTest extends TestFmwk {"America/Antigua", "America/Port_of_Spain"}, {"America/Anguilla", "America/Port_of_Spain"}, {"America/Cayman", "America/Panama"}, - {"America/Coral_Harbour", "America/Panama"}, + // TODO(b/204533494): Enable this check. + // Android-changed: due to issues with time zones canonicity, decision was made + // to keep America/Coral_Harbour as alias to America/Atikokan. + // See more details in system/timezone/RELEASE_NOTES.md + // {"America/Coral_Harbour", "America/Panama"}, {"America/Curacao", "America/Aruba"}, {"America/Dominica", "America/Port_of_Spain"}, {"America/Grenada", "America/Port_of_Spain"}, |