From d4bc9bef26e57da2a609ab8c1ed19b6e457cc80a Mon Sep 17 00:00:00 2001 From: Rich Gillam Date: Tue, 26 Mar 2024 16:23:05 -0700 Subject: [PATCH] ICU-22611 Fixed failures in EnvTest. --- icu4c/source/test/intltest/itrbnf.cpp | 8 ++++---- .../test/java/com/ibm/icu/dev/test/format/RbnfTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/icu4c/source/test/intltest/itrbnf.cpp b/icu4c/source/test/intltest/itrbnf.cpp index 16046864bb5..b764730b66e 100644 --- a/icu4c/source/test/intltest/itrbnf.cpp +++ b/icu4c/source/test/intltest/itrbnf.cpp @@ -1280,7 +1280,7 @@ void IntlTestRBNF::TestDFRounding() UErrorCode err = U_ZERO_ERROR; // no decimal places - LocalPointer nf0(new RuleBasedNumberFormat(u"1000/1000: <##K<;", parseError, err)); + LocalPointer nf0(new RuleBasedNumberFormat(u"1000/1000: <##K<;", Locale::getUS(), parseError, err)); if (U_FAILURE(err)) { errcheckln(err, "FAIL: could not construct formatter - %s", u_errorName(err)); } else { @@ -1295,7 +1295,7 @@ void IntlTestRBNF::TestDFRounding() } // 1 decimal place - LocalPointer nf1(new RuleBasedNumberFormat(u"1000/1000: <##.0K<;", parseError, err)); + LocalPointer nf1(new RuleBasedNumberFormat(u"1000/1000: <##.0K<;", Locale::getUS(), parseError, err)); if (U_FAILURE(err)) { errcheckln(err, "FAIL: could not construct formatter - %s", u_errorName(err)); } else { @@ -1308,7 +1308,7 @@ void IntlTestRBNF::TestDFRounding() } // with modulus substitution - LocalPointer nfMod(new RuleBasedNumberFormat(u"1000/1000: <####>; -x: ->>;", parseError, err)); + LocalPointer nfMod(new RuleBasedNumberFormat(u"1000/1000: <####>; -x: ->>;", Locale::getUS(), parseError, err)); if (U_FAILURE(err)) { errcheckln(err, "FAIL: could not construct formatter - %s", u_errorName(err)); } else { @@ -1323,7 +1323,7 @@ void IntlTestRBNF::TestDFRounding() } // no decimal places, but with rounding mode set to ROUND_FLOOR - LocalPointer nfFloor(new RuleBasedNumberFormat(u"1000/1000: <##K<;", parseError, err)); + LocalPointer nfFloor(new RuleBasedNumberFormat(u"1000/1000: <##K<;", Locale::getUS(), parseError, err)); nfFloor->setMaximumFractionDigits(0); nfFloor->setRoundingMode(NumberFormat::kRoundFloor); if (U_FAILURE(err)) { diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java index 15d0a2dc2f9..dbcbc789f49 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/RbnfTest.java @@ -382,26 +382,26 @@ public class RbnfTest extends CoreTestFmwk { RuleBasedNumberFormat nf; // no decimal places - nf = new RuleBasedNumberFormat("1000/1000: <##K<;"); + nf = new RuleBasedNumberFormat("1000/1000: <##K<;", Locale.US); assertEquals("-1K", nf.format(-1400)); assertEquals("-2K", nf.format(-1900)); assertEquals("1K", nf.format(1400)); assertEquals("2K", nf.format(1900)); // 1 decimal place - nf = new RuleBasedNumberFormat("1000/1000: <##.0K<;"); + nf = new RuleBasedNumberFormat("1000/1000: <##.0K<;", Locale.US); assertEquals("-1.4K", nf.format(-1440)); assertEquals("1.9K", nf.format(1890)); // with modulus substitution - nf = new RuleBasedNumberFormat("1000/1000: <####>; -x: ->>;"); + nf = new RuleBasedNumberFormat("1000/1000: <####>; -x: ->>;", Locale.US); assertEquals("-1K400", nf.format(-1400)); assertEquals("-1K900", nf.format(-1900)); assertEquals("1K400", nf.format(1400)); assertEquals("1K900", nf.format(1900)); // no decimal places, but with rounding mode set to ROUND_FLOOR - nf = new RuleBasedNumberFormat("1000/1000: <##K<;"); + nf = new RuleBasedNumberFormat("1000/1000: <##K<;", Locale.US); nf.setMaximumFractionDigits(0); nf.setRoundingMode(BigDecimal.ROUND_FLOOR); assertEquals("-2K", nf.format(-1400));