diff options
author | Almaz Mingaleev <mingaleev@google.com> | 2021-01-18 11:36:13 +0000 |
---|---|---|
committer | wonil <wonil@google.com> | 2021-02-02 03:39:33 +0000 |
commit | f98e0cd3d5ffce5c613ec8eb96a8accab262c9a8 (patch) | |
tree | e3bca584ce120f0093606825eac493eb615d1eae | |
parent | 7b17d00611ddc046d53441ca8649a95fb5e62c63 (diff) | |
download | icu-f98e0cd3d5ffce5c613ec8eb96a8accab262c9a8.tar.gz |
DO NOT MERGE Cherry-pick ICU-21448: Update Android ICU tzdata from 2020d
to 2020f. [P CTS]
Cherry-pick ICU-21448: Update Android ICU tzdata
from 2020d to 2020f. [P CTS]
This is a cherry pick of
https://github.com/unicode-org/icu/commit/25eb1510ec4e536fe0d0d1024b3ce71819510d0a.
New test cases in SimpleDateFormat.java and tzfmttst.cpp
were skipped as they rely on prod code changes. See
https://github.com/unicode-org/icu/pull/1526/files#r552372640
for more details.
For CTS, code and data changes were skipped from original CL as goal
is to fix failing TimeZoneTest on devices with 2020f update.
See b/177644925 for partner reported waiver req.
Bug: 177868678
Test: CtsIcuTestCases
Merged-In: Ic537360ec304c72468f558d7a5093a54a60d654f
Change-Id: Ic537360ec304c72468f558d7a5093a54a60d654f
(cherry picked from commit 5f4df32641bdf69b1a66cca7ee1c1a895e63fd6f)
5 files changed, 16 insertions, 10 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 ed24ab8cb..3fdfe8065 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 @@ -388,7 +388,7 @@ public class TimeZoneFormatTest extends TestFmwk { Set<String> ids = null; if (JDKTZ) { - ids = new TreeSet<String>(); + ids = new TreeSet<>(); String[] jdkIDs = java.util.TimeZone.getAvailableIDs(); for (String jdkID : jdkIDs) { if (EXCL_TZ_PATTERN.matcher(jdkID).matches()) { @@ -662,7 +662,7 @@ public class TimeZoneFormatTest extends TestFmwk { TimeType expType = (TimeType)test[7]; TimeZoneFormat tzfmt = TimeZoneFormat.getInstance(loc); - Output<TimeType> timeType = new Output<TimeType>(TimeType.UNKNOWN); + Output<TimeType> timeType = new Output<>(TimeType.UNKNOWN); ParsePosition pos = new ParsePosition(inPos); TimeZone tz = tzfmt.parse(style, text, pos, options, timeType); @@ -953,7 +953,7 @@ public class TimeZoneFormatTest extends TestFmwk { for (Object[] testCase : TESTDATA) { TimeZone tz = TimeZone.getTimeZone((String)testCase[1]); - Output<TimeType> timeType = new Output<TimeType>(); + Output<TimeType> timeType = new Output<>(); ULocale uloc = new ULocale((String)testCase[0]); TimeZoneFormat tzfmt = TimeZoneFormat.getInstance(uloc); @@ -1049,7 +1049,7 @@ public class TimeZoneFormatTest extends TestFmwk { tzfmt.setTimeZoneNames(tzdbNames); TimeZone tz = TimeZone.getTimeZone((String)testCase[1]); - Output<TimeType> timeType = new Output<TimeType>(); + Output<TimeType> timeType = new Output<>(); String out = tzfmt.format((Style)testCase[3], tz, ((Date)testCase[2]).getTime(), timeType); if (!out.equals(testCase[4]) || timeType.value != testCase[5]) { @@ -1105,7 +1105,7 @@ public class TimeZoneFormatTest extends TestFmwk { public void TestTZDBNamesThreading() { final TZDBTimeZoneNames names = new TZDBTimeZoneNames(ULocale.ENGLISH); final AtomicInteger found = new AtomicInteger(); - List<Thread> threads = new ArrayList<Thread>(); + List<Thread> threads = new ArrayList<>(); final int numIteration = 1000; try { diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java index 63999a77a..b633c2a91 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java @@ -1578,6 +1578,8 @@ public class TimeZoneTest extends TestFmwk {"Asia/Vientiane", "Asia/Bangkok"}, {"Atlantic/Jan_Mayen", "Europe/Oslo"}, {"Atlantic/St_Helena", "Africa/Abidjan"}, + {"Australia/Currie", "Australia/Hobart"}, + {"Australia/Tasmania", "Australia/Hobart"}, {"Europe/Bratislava", "Europe/Prague"}, {"Europe/Busingen", "Europe/Zurich"}, {"Europe/Guernsey", "Europe/London"}, diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 3ab04d206..8185f36e0 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -2072,6 +2072,8 @@ void TimeZoneTest::TestCanonicalID() { {"Asia/Vientiane", "Asia/Bangkok"}, {"Atlantic/Jan_Mayen", "Europe/Oslo"}, {"Atlantic/St_Helena", "Africa/Abidjan"}, + {"Australia/Currie", "Australia/Hobart"}, + {"Australia/Tasmania", "Australia/Hobart"}, {"Europe/Bratislava", "Europe/Prague"}, {"Europe/Busingen", "Europe/Zurich"}, {"Europe/Guernsey", "Europe/London"}, diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java index 8562992d9..d95ee42a2 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java @@ -385,7 +385,7 @@ public class TimeZoneFormatTest extends TestFmwk { Set<String> ids = null; if (JDKTZ) { - ids = new TreeSet<String>(); + ids = new TreeSet<>(); String[] jdkIDs = java.util.TimeZone.getAvailableIDs(); for (String jdkID : jdkIDs) { if (EXCL_TZ_PATTERN.matcher(jdkID).matches()) { @@ -659,7 +659,7 @@ public class TimeZoneFormatTest extends TestFmwk { TimeType expType = (TimeType)test[7]; TimeZoneFormat tzfmt = TimeZoneFormat.getInstance(loc); - Output<TimeType> timeType = new Output<TimeType>(TimeType.UNKNOWN); + Output<TimeType> timeType = new Output<>(TimeType.UNKNOWN); ParsePosition pos = new ParsePosition(inPos); TimeZone tz = tzfmt.parse(style, text, pos, options, timeType); @@ -950,7 +950,7 @@ public class TimeZoneFormatTest extends TestFmwk { for (Object[] testCase : TESTDATA) { TimeZone tz = TimeZone.getTimeZone((String)testCase[1]); - Output<TimeType> timeType = new Output<TimeType>(); + Output<TimeType> timeType = new Output<>(); ULocale uloc = new ULocale((String)testCase[0]); TimeZoneFormat tzfmt = TimeZoneFormat.getInstance(uloc); @@ -1046,7 +1046,7 @@ public class TimeZoneFormatTest extends TestFmwk { tzfmt.setTimeZoneNames(tzdbNames); TimeZone tz = TimeZone.getTimeZone((String)testCase[1]); - Output<TimeType> timeType = new Output<TimeType>(); + Output<TimeType> timeType = new Output<>(); String out = tzfmt.format((Style)testCase[3], tz, ((Date)testCase[2]).getTime(), timeType); if (!out.equals(testCase[4]) || timeType.value != testCase[5]) { @@ -1102,7 +1102,7 @@ public class TimeZoneFormatTest extends TestFmwk { public void TestTZDBNamesThreading() { final TZDBTimeZoneNames names = new TZDBTimeZoneNames(ULocale.ENGLISH); final AtomicInteger found = new AtomicInteger(); - List<Thread> threads = new ArrayList<Thread>(); + List<Thread> threads = new ArrayList<>(); final int numIteration = 1000; try { 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 767ac57da..0353f099e 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 @@ -1575,6 +1575,8 @@ public class TimeZoneTest extends TestFmwk {"Asia/Vientiane", "Asia/Bangkok"}, {"Atlantic/Jan_Mayen", "Europe/Oslo"}, {"Atlantic/St_Helena", "Africa/Abidjan"}, + {"Australia/Currie", "Australia/Hobart"}, + {"Australia/Tasmania", "Australia/Hobart"}, {"Europe/Bratislava", "Europe/Prague"}, {"Europe/Busingen", "Europe/Zurich"}, {"Europe/Guernsey", "Europe/London"}, |