Skip to content

Commit

Permalink
ICU-22340 Fix it so that UNUM_NUMBERING_SYSTEM again always returns a…
Browse files Browse the repository at this point in the history 
… RuleBasedNumberFormat.

(cherry picked from commit c702950)
  • Loading branch information
@richgillam @pedberg-icu
richgillam authored and pedberg-icu committed Apr 7, 2023
1 parent f4687fc commit 7d4e57d
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 21 deletions.
16 changes: 15 additions & 1 deletion icu4c/source/i18n/unum.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ unum_open( UNumberFormatStyle style,
case UNUM_CURRENCY_ACCOUNTING:
case UNUM_CASH_CURRENCY:
case UNUM_CURRENCY_STANDARD:
case UNUM_NUMBERING_SYSTEM:
retVal = NumberFormat::createInstance(Locale(locale), style, *status);
break;

Expand Down Expand Up @@ -113,6 +112,21 @@ unum_open( UNumberFormatStyle style,
case UNUM_DURATION:
retVal = new RuleBasedNumberFormat(URBNF_DURATION, Locale(locale), *status);
break;

case UNUM_NUMBERING_SYSTEM: {
// if the locale ID specifies a numbering system, go through NumberFormat::createInstance()
// to handle it properly (we have to specify UNUM_DEFAULT to get it to handle the numbering
// system, but we'll always get a RuleBasedNumberFormat back); otherwise, just go ahead and
// create a RuleBasedNumberFormat ourselves
UErrorCode localErr = U_ZERO_ERROR;
Locale localeObj(locale);
int32_t keywordLength = localeObj.getKeywordValue("numbers", nullptr, 0, localErr);
if (keywordLength > 0) {
retVal = NumberFormat::createInstance(localeObj, UNUM_DEFAULT, *status);
} else {
retVal = new RuleBasedNumberFormat(URBNF_NUMBERING_SYSTEM, localeObj, *status);
}
} break;
#endif

case UNUM_DECIMAL_COMPACT_SHORT:
Expand Down
96 changes: 76 additions & 20 deletions icu4c/source/test/cintltst/cnumtst.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ static void TestSciNotationMaxFracCap(void);
static void TestMinIntMinFracZero(void);
static void Test21479_ExactCurrency(void);
static void Test22088_Ethiopic(void);
static void TestChangingRuleset(void);
static void TestParseWithEmptyCurr(void);

#define TESTCASE(x) addTest(root, &x, "tsformat/cnumtst/" #x)
Expand Down Expand Up @@ -122,6 +123,7 @@ void addNumForTest(TestNode** root)
TESTCASE(TestMinIntMinFracZero);
TESTCASE(Test21479_ExactCurrency);
TESTCASE(Test22088_Ethiopic);
TESTCASE(TestChangingRuleset);
TESTCASE(TestParseWithEmptyCurr);
}

Expand Down Expand Up @@ -3611,29 +3613,83 @@ static void Test21479_ExactCurrency(void) {
}

static void Test22088_Ethiopic(void) {
UErrorCode err = U_ZERO_ERROR;
UNumberFormat* nf1 = unum_open(UNUM_DEFAULT, NULL, 0, "am_ET@numbers=ethi", NULL, &err);
UNumberFormat* nf2 = unum_open(UNUM_NUMBERING_SYSTEM, NULL, 0, "am_ET@numbers=ethi", NULL, &err);
UNumberFormat* nf3 = unum_open(UNUM_NUMBERING_SYSTEM, NULL, 0, "en_US", NULL, &err);
const struct TestCase {
const char* localeID;
UNumberFormatStyle style;
const UChar* expectedResult;
} testCases[] = {
{ "am_ET@numbers=ethi", UNUM_DEFAULT, u"፻፳፫" },
{ "am_ET@numbers=ethi", UNUM_NUMBERING_SYSTEM, u"፻፳፫" },
{ "am_ET@numbers=traditional", UNUM_DEFAULT, u"፻፳፫" },
{ "am_ET@numbers=traditional", UNUM_NUMBERING_SYSTEM, u"፻፳፫" },
{ "am_ET", UNUM_NUMBERING_SYSTEM, u"123" }, // make sure default for Ethiopic still works
{ "en_US", UNUM_NUMBERING_SYSTEM, u"123" }, // make sure non-algorithmic default still works
{ "ar_SA", UNUM_NUMBERING_SYSTEM, u"١٢٣" }, // make sure non-algorithmic default still works
// NOTE: There are NO locales in ICU 72 whose default numbering system is algorithmic!
};
for (int32_t i = 0; i < UPRV_LENGTHOF(testCases); i++) {
char errorMessage[200];
UErrorCode err = U_ZERO_ERROR;
UNumberFormat* nf = unum_open(testCases[i].style, NULL, 0, testCases[i].localeID, NULL, &err);

snprintf(errorMessage, 200, "Creation of number formatter for %s failed", testCases[i].localeID);
if (assertSuccess(errorMessage, &err)) {
UChar result[200];

unum_formatDouble(nf, 123, result, 200, NULL, &err);
snprintf(errorMessage, 200, "Formatting of number for %s failed", testCases[i].localeID);
if (assertSuccess(errorMessage, &err)) {
snprintf(errorMessage, 200, "Wrong result for %s", testCases[i].localeID);
assertUEquals(errorMessage, testCases[i].expectedResult, result);
}
}
unum_close(nf);
}
}

static void TestChangingRuleset(void) {
const struct TestCase {
const char* localeID;
const UChar* rulesetName;
const UChar* expectedResult;
} testCases[] = {
{ "en_US", NULL, u"123" },
{ "en_US", u"%roman-upper", u"CXXIII" },
{ "en_US", u"%ethiopic", u"፻፳፫" },
{ "en_US@numbers=roman", NULL, u"CXXIII" },
{ "en_US@numbers=ethi", NULL, u"፻፳፫" },
{ "am_ET", NULL, u"123" },
{ "am_ET", u"%ethiopic", u"፻፳፫" },
{ "am_ET@numbers=ethi", NULL, u"፻፳፫" },
};

if (assertSuccess("Creation of number formatters failed", &err)) {
UChar result[200];
for (int32_t i = 0; i < UPRV_LENGTHOF(testCases); i++) {
char errorMessage[200];
const char* rulesetNameString = (testCases[i].rulesetName != NULL) ? austrdup(testCases[i].rulesetName) : "NULL";
UErrorCode err = U_ZERO_ERROR;
UNumberFormat* nf = unum_open(UNUM_NUMBERING_SYSTEM, NULL, 0, testCases[i].localeID, NULL, &err);

unum_formatDouble(nf1, 123, result, 200, NULL, &err);
assertSuccess("Formatting of number failed", &err);
assertUEquals("Wrong result with UNUM_DEFAULT", u"፻፳፫", result);

unum_formatDouble(nf2, 123, result, 200, NULL, &err);
assertSuccess("Formatting of number failed", &err);
assertUEquals("Wrong result with UNUM_NUMBERING_SYSTEM", u"፻፳፫", result);

unum_formatDouble(nf3, 123, result, 200, NULL, &err);
assertSuccess("Formatting of number failed", &err);
assertUEquals("Wrong result with UNUM_NUMBERING_SYSTEM and English", u"123", result);
snprintf(errorMessage, 200, "Creating of number formatter for %s failed", testCases[i].localeID);
if (assertSuccess(errorMessage, &err)) {
if (testCases[i].rulesetName != NULL) {
unum_setTextAttribute(nf, UNUM_DEFAULT_RULESET, testCases[i].rulesetName, -1, &err);
snprintf(errorMessage, 200, "Changing formatter for %s's default ruleset to %s failed", testCases[i].localeID, rulesetNameString);
assertSuccess(errorMessage, &err);
}

if (U_SUCCESS(err)) {
UChar result[200];

unum_formatDouble(nf, 123, result, 200, NULL, &err);
snprintf(errorMessage, 200, "Formatting of number with %s/%s failed", testCases[i].localeID, rulesetNameString);
if (assertSuccess(errorMessage, &err)) {
snprintf(errorMessage, 200, "Wrong result for %s/%s", testCases[i].localeID, rulesetNameString);
assertUEquals(errorMessage, testCases[i].expectedResult, result);
}
}
}
unum_close(nf);
}
unum_close(nf1);
unum_close(nf2);
unum_close(nf3);
}

static void TestParseWithEmptyCurr(void) {
Expand Down

0 comments on commit 7d4e57d

Please sign in to comment.