Skip to content

Update ICU to 78 - Part 4: test expectation ports #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aoruganti-msft wants to merge 7 commits into
base: user/aoruganti/icu78-data-remaining
Choose a base branch
from
Open

Update ICU to 78 - Part 4: test expectation ports #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4363aab
Port English AM/PM spacing test expectations
May 18, 2026
346540b
Port MS locale display test expectations
May 18, 2026
b365c36
Port CLDR-MS 029 locale test expectations
May 18, 2026
ed4a3a0
Port remaining format display expectations
May 18, 2026
3ee78d9
Keep codepoint trie goldens LF-only
May 18, 2026
f1fb1a6
Align region validation with blocked subdivisions
May 18, 2026
3fa86dc
Keep icu-config fragments LF-only
May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,12 @@ configure text
# Use JSONC for syntax highlighting on GitHub.com
*.json linguist-language=jsonc

# Codepoint trie golden tests compare bytes; keep generated TOML line endings stable.
icu/icu4c/source/test/testdata/codepointtrie/*.toml text eol=lf

# Shell script fragments assembled into icu-config (an executable shell script).
# They must have LF line endings so WSL/Linux can execute the generated file.
icu/icu4c/source/config/icu-config-top text eol=lf
icu/icu4c/source/config/icu-config-bottom text eol=lf
icu/icu4c/source/config/mh-* text eol=lf

4 changes: 2 additions & 2 deletions icu/icu4c/source/common/loclikely.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,8 @@ namespace {
// test/intltest/regiontst.cpp from the resource data while
// the test failed.
const uint32_t gValidRegionMap[] = {
0xeedf597c, 0xdeddbdef, 0x15943f3f, 0x0e00d580,
0xb0095c00, 0x0015fb9f, 0x781c068d, 0x0340400f,
0xeedf597c, 0xdeddbdef, 0x15843f3f, 0x0e005480,
0xb0095c00, 0x0015fb9f, 0x7818068d, 0x0340400f,
0xf42b1d00, 0xfd4f8141, 0x25d7fffc, 0x0100084b,
0x538f3c40, 0x40000001, 0xfdf15100, 0x9fbb7ae7,
0x0410419a, 0x00408557, 0x00004002, 0x00100001,
Expand Down
4 changes: 0 additions & 4 deletions icu/icu4c/source/data/misc/supplementalData.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11528,17 +11528,14 @@ supplementalData:table(nofallback){
"cyzzzz",
"czzzzz",
"dezzzz",
"dgzzzz",
"djzzzz",
"dkzzzz",
"dmzzzz",
"dozzzz",
"dzzzzz",
"eazzzz",
"eczzzz",
"eezzzz",
"egzzzz",
"ehzzzz",
"erzzzz",
"eszzzz",
"etzzzz",
Expand Down Expand Up @@ -11573,7 +11570,6 @@ supplementalData:table(nofallback){
"hrzzzz",
"htzzzz",
"huzzzz",
"iczzzz",
"idzzzz",
"iezzzz",
"ilzzzz",
Expand Down
4 changes: 2 additions & 2 deletions icu/icu4c/source/test/cintltst/ccaltst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ static void TestGetSetDateAPI(void)

/*Testing if setDate works fine */
log_verbose("\nTesting the ucal_setDate() function \n");
u_strcpy(temp, u"Dec 17, 1971, 11:05:28\u202FPM");
u_strcpy(temp, u"Dec 17, 1971, 11:05:28 PM");
ucal_setDate(caldef,1971, UCAL_DECEMBER, 17, &status);
if(U_FAILURE(status)){
log_err("error in setting the calendar date : %s\n", u_errorName(status));
Expand Down Expand Up @@ -755,7 +755,7 @@ static void TestGetSetDateAPI(void)

/*Testing if setDateTime works fine */
log_verbose("\nTesting the ucal_setDateTime() function \n");
u_strcpy(temp, u"May 3, 1972, 4:30:42\u202FPM");
u_strcpy(temp, u"May 3, 1972, 4:30:42 PM");
ucal_setDateTime(caldef,1972, UCAL_MAY, 3, 16, 30, 42, &status);
if(U_FAILURE(status)){
log_err("error in setting the calendar date : %s\n", u_errorName(status));
Expand Down
18 changes: 9 additions & 9 deletions icu/icu4c/source/test/cintltst/cdateintervalformattest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,15 @@ static const ExpectPosAndFormat exp_en_yyMMddHHmmss[kNumDeltas] = {
};

static const ExpectPosAndFormat exp_en_yMMMdhmmssz[kNumDeltas] = {
{ 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT\\u2009\\u2013\\u20099:00:20\\u202FAM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT\\u2009\\u2013\\u20099:20:00\\u202FAM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT\\u2009\\u2013\\u200911:00:00\\u202FAM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT\\u2009\\u2013\\u20099:00:00\\u202FPM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT\\u2009\\u2013\\u2009Nov 28, 2014, 9:00:00\\u202FAM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT\\u2009\\u2013\\u2009Dec 6, 2014, 9:00:00\\u202FAM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00\\u202FAM GMT\\u2009\\u2013\\u2009Feb 28, 2015, 9:00:00\\u202FAM GMT" }
{ 16, 18, "Nov 20, 2014, 9:00:00 AM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00 AM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00 AM GMT\\u2009\\u2013\\u20099:00:20 AM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00 AM GMT\\u2009\\u2013\\u20099:20:00 AM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00 AM GMT\\u2009\\u2013\\u200911:00:00 AM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00 AM GMT\\u2009\\u2013\\u20099:00:00 PM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00 AM GMT\\u2009\\u2013\\u2009Nov 28, 2014, 9:00:00 AM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00 AM GMT\\u2009\\u2013\\u2009Dec 6, 2014, 9:00:00 AM GMT" },
{ 16, 18, "Nov 20, 2014, 9:00:00 AM GMT\\u2009\\u2013\\u2009Feb 28, 2015, 9:00:00 AM GMT" }
};

static const ExpectPosAndFormat exp_ja_yyMMddHHmm[kNumDeltas] = {
Expand Down
20 changes: 10 additions & 10 deletions icu/icu4c/source/test/cintltst/cdattst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ static void TestDateFormat(void)

/*Testing udat_format()*/
log_verbose("\nTesting the udat_format() function of date format\n");
u_strcpy(temp, u"7/10/96, 4:05\u202FPM");
u_strcpy(temp, u"7/10/96, 4:05 PM");
/*format using def */
resultlength=0;
resultlengthneeded=udat_format(def, d, NULL, resultlength, NULL, &status);
Expand Down Expand Up @@ -245,7 +245,7 @@ static void TestDateFormat(void)

/*Testing parsing using udat_parse()*/
log_verbose("\nTesting parsing using udat_parse()\n");
u_strcpy(temp, u"2/3/76, 2:50\u202FAM");
u_strcpy(temp, u"2/3/76, 2:50 AM");
parsepos=0;
status=U_ZERO_ERROR;

Expand Down Expand Up @@ -966,7 +966,7 @@ static void TestDateFormatCalendar(void) {
u_errorName(ec));
goto FAIL;
}
u_strcpy(uExpected, u"5:45\u202FPM");
u_strcpy(uExpected, u"5:45 PM");
u_austrcpy(cbuf, uExpected);
if (u_strlen(uExpected) != len1 || u_strncmp(uExpected, buf1, len1) != 0) {
log_err("FAIL: udat_formatCalendar(17:45), expected: %s", cbuf);
Expand Down Expand Up @@ -2101,23 +2101,23 @@ static void TestHourCycle(void) {
static const UDate date = -845601267742; // March 16, 1943 at 3:45 PM
const UChar* testCases[] = {
// test some locales for which we have data
u"en_US", u"Tuesday, March 16, 1943 at 3:45:32 PM",
u"en_CA", u"Tuesday, March 16, 1943 at 3:45:32 p.m.",
u"en_US", u"Tuesday, March 16, 1943 at 3:45:32 PM",
u"en_CA", u"Tuesday, March 16, 1943 at 3:45:32 p.m.",
u"en_GB", u"Tuesday, 16 March 1943 at 15:45:32",
u"en_AU", u"Tuesday, 16 March 1943 at 3:45:32 pm",
u"en_AU", u"Tuesday, 16 March 1943 at 3:45:32 pm",
// test a couple locales for which we don't have specific locale files (we should still get the correct hour cycle)
u"en_CO", u"Tuesday, March 16, 1943 at 3:45:32 PM",
u"en_MX", u"Tuesday, March 16, 1943 at 3:45:32 PM",
// test that the rg subtag does the right thing
u"en_US@rg=GBzzzz", u"Tuesday, March 16, 1943 at 15:45:32",
u"en_US@rg=CAzzzz", u"Tuesday, March 16, 1943 at 3:45:32 PM",
u"en_CA@rg=USzzzz", u"Tuesday, March 16, 1943 at 3:45:32 p.m.",
u"en_GB@rg=USzzzz", u"Tuesday, 16 March 1943 at 3:45:32 pm",
u"en_GB@rg=CAzzzz", u"Tuesday, 16 March 1943 at 3:45:32 pm",
u"en_GB@rg=AUzzzz", u"Tuesday, 16 March 1943 at 3:45:32 pm",
u"en_GB@rg=USzzzz", u"Tuesday, 16 March 1943 at 3:45:32 pm",
u"en_GB@rg=CAzzzz", u"Tuesday, 16 March 1943 at 3:45:32 pm",
u"en_GB@rg=AUzzzz", u"Tuesday, 16 March 1943 at 3:45:32 pm",
// test that the hc ("hours") subtag does the right thing
u"en_US@hours=h23", u"Tuesday, March 16, 1943 at 15:45:32",
u"en_GB@hours=h12", u"Tuesday, 16 March 1943 at 3:45:32 pm",
u"en_GB@hours=h12", u"Tuesday, 16 March 1943 at 3:45:32 pm",
// test that the rg and hc subtags do the right thing when used together
u"en_US@rg=GBzzzz;hours=h12", u"Tuesday, March 16, 1943 at 3:45:32 PM",
u"en_GB@rg=USzzzz;hours=h23", u"Tuesday, 16 March 1943 at 15:45:32",
Expand Down
2 changes: 1 addition & 1 deletion icu/icu4c/source/test/cintltst/cdtrgtst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ void Test714(void)
UErrorCode status = U_ZERO_ERROR;
UDateFormat *fmt;
UChar *result;
const UChar* expect = u"7:25:43\u202FAM";
const UChar* expect = u"7:25:43 AM";

ctest_setTimeZone(NULL, &status);

Expand Down
4 changes: 2 additions & 2 deletions icu/icu4c/source/test/cintltst/cldrtest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ static void VerifyTranslation(void) {
if (U_FAILURE(errorCode)) {
log_err("ulocdata_getMeasurementSystem failed for locale %s with error: %s \n", currLoc, u_errorName(errorCode));
} else {
if ( strstr(fullLoc, "_US")!=NULL || strstr(fullLoc, "_LR")!=NULL ) {
if ( strstr(fullLoc, "_US")!=NULL || strstr(fullLoc, "_LR")!=NULL || strstr(fullLoc, "_029")!=NULL ) {
if(measurementSystem != UMS_US){
log_err("ulocdata_getMeasurementSystem did not return expected data for locale %s \n", currLoc);
}
Expand All @@ -1143,7 +1143,7 @@ static void VerifyTranslation(void) {
if ( strstr(fullLoc, "_US")!=NULL || strstr(fullLoc, "_BZ")!=NULL || strstr(fullLoc, "_CA")!=NULL || strstr(fullLoc, "_CL")!=NULL ||
strstr(fullLoc, "_CO")!=NULL || strstr(fullLoc, "_CR")!=NULL || strstr(fullLoc, "_GT")!=NULL || strstr(fullLoc, "_MX")!=NULL ||
strstr(fullLoc, "_NI")!=NULL || strstr(fullLoc, "_PA")!=NULL || strstr(fullLoc, "_PH")!=NULL || strstr(fullLoc, "_PR")!=NULL ||
strstr(fullLoc, "_SV")!=NULL || strstr(fullLoc, "_VE")!=NULL ) {
strstr(fullLoc, "_SV")!=NULL || strstr(fullLoc, "_VE")!=NULL || strstr(fullLoc, "_029")!=NULL ) {
if (height != 279 || width != 216) {
log_err("ulocdata_getPaperSize did not return expected data for locale %s \n", currLoc);
}
Expand Down
60 changes: 30 additions & 30 deletions icu/icu4c/source/test/cintltst/cloctst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,8 +1268,8 @@ typedef struct {

static const DisplayNameBracketsItem displayNameBracketsItems[] = {
{ "en", "CC", "en_CC", "Cocos (Keeling) Islands", "English (Cocos [Keeling] Islands)" },
{ "en", "MM", "my_MM", "Myanmar (Burma)", "Burmese (Myanmar [Burma])" },
{ "en", "MM", "my_Mymr_MM", "Myanmar (Burma)", "Burmese (Myanmar, Myanmar [Burma])" },
{ "en", "MM", "my_MM", "Myanmar", "Burmese (Myanmar)" },
{ "en", "MM", "my_Mymr_MM", "Myanmar", "Burmese (Myanmar, Myanmar)" },
{ "zh", "CC", "en_CC", "\\u79D1\\u79D1\\u65AF\\uFF08\\u57FA\\u6797\\uFF09\\u7FA4\\u5C9B", "\\u82F1\\u8BED\\uFF08\\u79D1\\u79D1\\u65AF\\uFF3B\\u57FA\\u6797\\uFF3D\\u7FA4\\u5C9B\\uFF09" },
{ "zh", "CG", "fr_CG", "\\u521A\\u679C\\uFF08\\u5E03\\uFF09", "\\u6CD5\\u8BED\\uFF08\\u521A\\u679C\\uFF3B\\u5E03\\uFF3D\\uFF09" },
{ NULL, NULL, NULL, NULL, NULL }
Expand Down Expand Up @@ -7163,11 +7163,11 @@ static const UldnItem en_StdMidLong[] = {
{ "en", TEST_ULOC_LANGUAGE, u"English" },
// https://unicode-org.atlassian.net/browse/ICU-20870
{ "fa_AF", TEST_ULDN_LOCALE, u"Persian (Afghanistan)" },
{ "prs", TEST_ULDN_LOCALE, u"Dari" },
{ "prs_AF", TEST_ULDN_LOCALE, u"Dari (Afghanistan)" },
{ "prs_TJ", TEST_ULDN_LOCALE, u"Dari (Tajikistan)" },
{ "prs", TEST_ULDN_LANGUAGE, u"Dari" },
{ "prs", TEST_ULOC_LANGUAGE, u"Dari" },
{ "prs", TEST_ULDN_LOCALE, u"prs" },
{ "prs_AF", TEST_ULDN_LOCALE, u"prs (Afghanistan)" },
{ "prs_TJ", TEST_ULDN_LOCALE, u"prs (Tajikistan)" },
{ "prs", TEST_ULDN_LANGUAGE, u"prs" },
{ "prs", TEST_ULOC_LANGUAGE, u"prs" },
// https://unicode-org.atlassian.net/browse/ICU-21742
{ "ji", TEST_ULDN_LOCALE, u"Yiddish" },
{ "ji_US", TEST_ULDN_LOCALE, u"Yiddish (United States)" },
Expand All @@ -7183,23 +7183,23 @@ static const UldnItem en_StdMidLong[] = {
};

static const UldnItem en_StdMidShrt[] = {
{ "en_US", TEST_ULDN_LOCALE, u"English (US)" },
{ "en_US", TEST_ULDN_LOCALE, u"English (United States)" },
{ "en", TEST_ULDN_LANGUAGE, u"English" },
};

static const UldnItem en_DiaMidLong[] = {
{ "en_US", TEST_ULDN_LOCALE, u"American English" },
{ "fa_AF", TEST_ULDN_LOCALE, u"Dari" },
{ "prs", TEST_ULDN_LOCALE, u"Dari" },
{ "prs_AF", TEST_ULDN_LOCALE, u"Dari (Afghanistan)" },
{ "prs_TJ", TEST_ULDN_LOCALE, u"Dari (Tajikistan)" },
{ "prs", TEST_ULDN_LANGUAGE, u"Dari" },
{ "en_US", TEST_ULDN_LOCALE, u"English (United States)" },
{ "fa_AF", TEST_ULDN_LOCALE, u"Persian (Afghanistan)" },
{ "prs", TEST_ULDN_LOCALE, u"prs" },
{ "prs_AF", TEST_ULDN_LOCALE, u"prs (Afghanistan)" },
{ "prs_TJ", TEST_ULDN_LOCALE, u"prs (Tajikistan)" },
{ "prs", TEST_ULDN_LANGUAGE, u"prs" },
{ "mo", TEST_ULDN_LOCALE, u"Romanian" },
{ "mo", TEST_ULDN_LANGUAGE, u"Romanian" },
};

static const UldnItem en_DiaMidShrt[] = {
{ "en_US", TEST_ULDN_LOCALE, u"US English" },
{ "en_US", TEST_ULDN_LOCALE, u"English (United States)" },
};

static const UldnItem ro_StdMidLong[] = { // https://unicode-org.atlassian.net/browse/ICU-11563
Expand All @@ -7220,26 +7220,26 @@ static const UldnItem yi_StdMidLong[] = { // https://unicode-org.atlassian.net/b

static const UldnItem zh_DiaMidLong[] = {
// zh and zh_Hant both have dialect names for the following in ICU 73
{ "ar_001", TEST_ULDN_LOCALE, u"现代标准阿拉伯语" },
{ "nl_BE", TEST_ULDN_LOCALE, u"弗拉芒语" },
{ "ro_MD", TEST_ULDN_LOCALE, u"摩尔多瓦语" },
{ "ar_001", TEST_ULDN_LOCALE, u"阿拉伯语（世界）" },
{ "nl_BE", TEST_ULDN_LOCALE, u"荷兰语（比利时）" },
{ "ro_MD", TEST_ULDN_LOCALE, u"罗马尼亚语（摩尔多瓦）" },
// zh has dialect names for the following in ICU 73
{ "en_AU", TEST_ULDN_LOCALE, u"澳大利亚英语" },
{ "en_CA", TEST_ULDN_LOCALE, u"加拿大英语" },
{ "en_GB", TEST_ULDN_LOCALE, u"英国英语" },
{ "en_US", TEST_ULDN_LOCALE, u"美国英语" },
{ "es_419", TEST_ULDN_LOCALE, u"拉丁美洲西班牙语" },
{ "es_ES", TEST_ULDN_LOCALE, u"欧洲西班牙语" },
{ "es_MX", TEST_ULDN_LOCALE, u"墨西哥西班牙语" },
{ "fr_CA", TEST_ULDN_LOCALE, u"加拿大法语" },
{ "fr_CH", TEST_ULDN_LOCALE, u"瑞士法语" },
{ "en_AU", TEST_ULDN_LOCALE, u"英语（澳大利亚）" },
{ "en_CA", TEST_ULDN_LOCALE, u"英语（加拿大）" },
{ "en_GB", TEST_ULDN_LOCALE, u"英语（英国）" },
{ "en_US", TEST_ULDN_LOCALE, u"英语（美国）" },
{ "es_419", TEST_ULDN_LOCALE, u"西班牙语（拉丁美洲）" },
{ "es_ES", TEST_ULDN_LOCALE, u"西班牙语（西班牙）" },
{ "es_MX", TEST_ULDN_LOCALE, u"西班牙语（墨西哥）" },
{ "fr_CA", TEST_ULDN_LOCALE, u"法语（加拿大）" },
{ "fr_CH", TEST_ULDN_LOCALE, u"法语（瑞士）" },
};

static const UldnItem zh_Hant_DiaMidLong[] = {
// zh and zh_Hant both have dialect names for the following in ICU 73
{ "ar_001", TEST_ULDN_LOCALE, u"現代標準阿拉伯文" },
{ "nl_BE", TEST_ULDN_LOCALE, u"法蘭德斯文" },
{ "ro_MD", TEST_ULDN_LOCALE, u"摩爾多瓦文" },
{ "ar_001", TEST_ULDN_LOCALE, u"阿拉伯文（世界）" },
{ "nl_BE", TEST_ULDN_LOCALE, u"荷蘭文（比利時）" },
{ "ro_MD", TEST_ULDN_LOCALE, u"羅馬尼亞文（摩爾多瓦）" },
// zh_Hant no dialect names for the following in ICU-73,
// use standard name
{ "en_AU", TEST_ULDN_LOCALE, u"英文（澳洲）" },
Expand Down
2 changes: 1 addition & 1 deletion icu/icu4c/source/test/cintltst/cmsgtst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static const char* const txt_testResultStrings[] = {
"Quotes ', {, a 1 {0}",
"Quotes ', {, a 1 {0}",
"You deposited 1 times an amount of $3,456.00 on 1/12/70",
"{2,time,full}, for 3,456, 1 is 5:46:40\\u202FAM Pacific Standard Time and full date is Monday, January 12, 1970",
"{2,time,full}, for 3,456, 1 is 5:46:40 AM Pacific Standard Time and full date is Monday, January 12, 1970",
"{1,number,percent} for 1 is 345,600%"
};

Expand Down
6 changes: 3 additions & 3 deletions icu/icu4c/source/test/cintltst/cnmdptst.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ static void TestGetKeywordValuesForLocale(void) {
{ "und", "USD", "USN", NULL },
/* { "und_ZZ", "USD", NULL, NULL }, -- temporarily remove as this locale now has 15 entries */
{ "en_US", "USD", "USN", NULL },
{ "en_029", "USD", "USN", NULL },
{ "en_029", "XCD", NULL, NULL },
{ "en_TH", "THB", NULL, NULL },
{ "de", "EUR", NULL, NULL },
{ "de_DE", "EUR", NULL, NULL },
Expand All @@ -827,11 +827,11 @@ static void TestGetKeywordValuesForLocale(void) {
{ "en_US@currency=CAD;rg=THZZZZ", "THB", NULL, NULL },
};
const int32_t EXPECTED_SIZE[PREFERRED_SIZE] = {
2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 1
2, 2, 2, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 2, 1
};
/* ucurr_forLocale results for same locales; "" if no result expected */
const char *FORLOCALE[PREFERRED_SIZE] = {
"", "", "USD", "",
"", "", "USD", "XCD",
"THB", "", "EUR", "",
"ILS", "CAD", "ZZZ", "DEM",
"THB", "USD", "CAD"
Expand Down
12 changes: 0 additions & 12 deletions icu/icu4c/source/test/cintltst/creststn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2715,16 +2715,6 @@ static void TestGetFunctionalEquivalent(void) {
"f", "nl_NL@collation=stroke", "root",
"f", "nl_NL_EEXT@collation=stroke", "root",
/* Additions to test aliased locales */
"f", "yue_HK", "zh@collation=stroke",
"f", "yue_Hant", "zh@collation=stroke",
"f", "yue_Hant_HK", "zh@collation=stroke",
"f", "yue@collation=stroke", "zh@collation=stroke",
"f", "yue@collation=pinyin", "zh",
"f", "yue_CN", "zh",
"f", "yue_Hans", "zh",
"f", "yue_Hans_CN", "zh",
"f", "yue_Hans@collation=pinyin", "zh",
"f", "yue_Hans@collation=stroke", "zh@collation=stroke",
"f", "mo", "mo",
"t", "no", "no",
"t", "nb", "no",
Expand All @@ -2735,8 +2725,6 @@ static void TestGetFunctionalEquivalent(void) {
"f", "zh_Hant_CN", "zh@collation=stroke",
"f", "zh_Hant_US", "zh@collation=stroke",
"f", "zh_Hans_US", "zh",
"f", "yue_TW", "zh@collation=stroke",
"f", "yue_US", "zh@collation=stroke",
"f", "ja_CN", "ja",
"f", "ja_US", "ja",
NULL
Expand Down
Loading
Loading