diff options
author | Almaz Mingaleev <mingaleev@google.com> | 2021-10-06 10:58:30 +0000 |
---|---|---|
committer | Almaz Mingaleev <mingaleev@google.com> | 2021-10-06 10:59:29 +0000 |
commit | a0aff57e0cef614f9707d0fcd912364edcaf8d34 (patch) | |
tree | fb038f90a67d1905281897bc44a92f3a611ce463 | |
parent | d0e69876605332cbefea48be5944f505167577d5 (diff) | |
download | icu-a0aff57e0cef614f9707d0fcd912364edcaf8d34.tar.gz |
Update Android ICU tzdata from 2021a to 2021a1. [R CTS]
This change is associated with tzdb 2021a rev. 2 changes in system/timezone.
Please keep in mind that ICU's reported version will be 2021a, not
2021a1 even though technically it is 2021a1.
Test file updates are picked from
https://github.com/unicode-org/icu/pull/1885/commits/bbb2084853c3dfaa54c89730c3f8235be62277bc.
For CTS, code and data changes were skipped from original CL.
Goal of this CL is to allow non-5 letter tzdb versions.
Bug: 201762561
Test: see tests in system/timezone CL
Change-Id: I0d2b0b1a64a59721f845a63500801abfd96daca3
Merged-In: I0d2b0b1a64a59721f845a63500801abfd96daca3
-rw-r--r-- | icu4c/source/test/cintltst/ccaltst.c | 10 | ||||
-rw-r--r-- | icu4c/source/test/intltest/tztest.cpp | 9 | ||||
-rw-r--r-- | icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java | 6 |
3 files changed, 16 insertions, 9 deletions
diff --git a/icu4c/source/test/cintltst/ccaltst.c b/icu4c/source/test/cintltst/ccaltst.c index f9cdcc439..814c43617 100644 --- a/icu4c/source/test/cintltst/ccaltst.c +++ b/icu4c/source/test/cintltst/ccaltst.c @@ -117,6 +117,7 @@ static void TestCalendar() char tempMsgBuf2[256]; // u_austrcpy() of some formatted dates & times. UChar zone1[64], zone2[64]; const char *tzver = 0; + int32_t tzverLen = 0; UChar canonicalID[64]; UBool isSystemID = FALSE; const UCalGetTypeTest * ucalGetTypeTestPtr; @@ -271,10 +272,13 @@ static void TestCalendar() tzver = ucal_getTZDataVersion(&status); if (U_FAILURE(status)) { log_err_status(status, "FAIL: ucal_getTZDataVersion() => %s\n", u_errorName(status)); - } else if (uprv_strlen(tzver) != 5 /*4 digits + 1 letter*/) { - log_err("FAIL: Bad version string was returned by ucal_getTZDataVersion\n"); } else { - log_verbose("PASS: ucal_getTZDataVersion returned %s\n", tzver); + tzverLen = uprv_strlen(tzver); + if (tzverLen == 5 || tzverLen == 6 /* 4 digits + 1 or 2 letters */) { + log_verbose("PASS: ucal_getTZDataVersion returned %s\n", tzver); + } else { + log_err("FAIL: Bad version string was returned by ucal_getTZDataVersion\n"); + } } /*Testing ucal_getCanonicalTimeZoneID*/ diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index 62f67be38..91e3fb2e8 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -152,10 +152,13 @@ TimeZoneTest::TestGenericAPI() const char* tzver = TimeZone::getTZDataVersion(status); if (U_FAILURE(status)) { errcheckln(status, "FAIL: getTZDataVersion failed - %s", u_errorName(status)); - } else if (uprv_strlen(tzver) != 5 /* 4 digits + 1 letter */) { - errln((UnicodeString)"FAIL: getTZDataVersion returned " + tzver); } else { - logln((UnicodeString)"tzdata version: " + tzver); + int32_t tzverLen = uprv_strlen(tzver); + if (tzverLen == 5 || tzverLen == 6 /* 4 digits + 1 or 2 letters */) { + logln((UnicodeString)"tzdata version: " + tzver); + } else { + errln((UnicodeString)"FAIL: getTZDataVersion returned " + tzver); + } } } 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 b9db76053..ad6ec26d4 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 @@ -551,10 +551,10 @@ public class TimeZoneTest extends TestFmwk String tzver = TimeZone.getTZDataVersion(); - if (tzver.length() != 5 /* 4 digits + 1 letter */) { - errln("FAIL: getTZDataVersion returned " + tzver); - } else { + if (tzver != null && (tzver.length() == 5 || tzver.length() == 6) /* 4 digits + 1 or 2 letters */ ) { logln("PASS: tzdata version: " + tzver); + } else { + errln("FAIL: getTZDataVersion returned " + tzver); } } |