Skip to content

Commit

Permalink
ICU-22723 Integrate CLDR 46 release alpha0, part 4, fixes for exausti…
Browse files Browse the repository at this point in the history
…ng tests
  • Loading branch information
DraganBesevic committed Aug 15, 2024
1 parent d041548 commit 045350e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion icu4c/source/test/cintltst/creststn.c
Original file line number Diff line number Diff line change
Expand Up @@ -2185,7 +2185,7 @@ static void TestFallback(void)
UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err);
UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err);
const UChar* version = NULL;
static const UChar versionStr[] = u"46"; // 45 in nn_NO or in a parent bundle/root
static const UChar versionStr[] = u"46"; // 46 in nn_NO or in a parent bundle/root

if(U_FAILURE(err)) {
log_data_err("Expected success when trying to test no_NO_NY aliased to nn_NO for Version "
Expand Down
4 changes: 4 additions & 0 deletions icu4c/source/test/intltest/dtfmtrtts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,10 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, const Locale &origLocale, UB
// Use @v to see verbose results on successful cases
UBool fail = (dmatch > maxDmatch || smatch > maxSmatch);
if (optionv || fail) {
if (timeOnly && uprv_strcmp(origLocale.getName(),"hu_HU@calendar=islamic")==0 &&
logKnownIssue("ICU-21049", "hu_HU@calendar=islamic fails round trip")) {
continue;
}
if (fail) {
errln(UnicodeString("\nFAIL: Pattern: ") + pat +
" in Locale: " + origLocale.getName() +
Expand Down
2 changes: 1 addition & 1 deletion icu4c/source/test/intltest/numfmtst.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2110,7 +2110,7 @@ void NumberFormatTest::TestCurrencyNames() {

ucurr_getName(CAD, "to", UCURR_LONG_NAME, &isChoiceFormat,
&len, &ec);
assertTrue("ucurr_getName (ti default)",
assertTrue("ucurr_getName (to default)",
U_USING_DEFAULT_WARNING == ec, true);

// Test that a default warning is being returned when falling back to root. JB 4536.
Expand Down
4 changes: 4 additions & 0 deletions icu4c/source/test/intltest/tzfmttst.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,10 @@ TimeZoneFormatTest::TestTimeZoneRoundTrip() {
} else {
// Specific or generic: raw offset must be preserved.
if (inRaw != outRaw) {
if ((strcmp(LOCALES[locidx].getName(), "tg") == 0 || strcmp(LOCALES[locidx].getName(), "tg_TJ") == 0)
&& logKnownIssue("ICU-22857", "Time zone round test fails for tg/tg_TJ")) {
continue;
}
errln(UnicodeString("Raw offset round trip failed; tz=") + *tzid
+ ", locale=" + LOCALES[locidx].getName() + ", pattern=" + PATTERNS[patidx]
+ ", time=" + DATES[datidx] + ", str=" + tzstr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@ public void TestTimeZoneRoundTrip() {
} else {
// Specific or generic: raw offset must be preserved.
if (inOffsets[0] != outOffsets[0] ) {
if ((LOCALES[locidx].toString().equals("tg") || LOCALES[locidx].toString().equals("tg_TJ"))
&& logKnownIssue("ICU-22857", "Time zone round test fails for tg/tg_TJ")) {
continue;
}
if (JDKTZ && tzids[tzidx].startsWith("SystemV/")) {
// JDK uses rule SystemV for these zones while
// ICU handles these zones as aliases of existing time zones
Expand Down

1 comment on commit 045350e

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 045350e Previous: 37b2bc6 Ratio
TestCtor2 60.104 ns/iter 24.1972 ns/iter 2.48
TestAssign1 96.1562 ns/iter 37.2335 ns/iter 2.58
TestScan1 79.3579 ns/iter 38.5603 ns/iter 2.06
TestScan2 102.4131 ns/iter 39.4825 ns/iter 2.59

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.