organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-21394 Don't use null to test for unset ICU4J NumberFormatter options

Browse source 
See #1466
This commit is contained in:
Shane F. Carr 2020-11-13 18:22:33 +00:00 • committed by Shane F. Carr
parent 8251d93e82
commit f48165d9cc
3 changed files with 42 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
icu4c/source/test/intltest/numbertest_api.cpp
View file

@ -798,6 +798,15 @@ void NumberFormatterApiTest::unitMeasure() {
Locale("de-DE"),
-1.24,
u"-1 Std., 14 Min. und 24 Sek.");
assertFormatSingle(
u"Zero out the unit field",
u"",
u"",
NumberFormatter::with().unit(KELVIN).unit(MeasureUnit()),
Locale("en"),
100,
u"100");
}
void NumberFormatterApiTest::unitCompoundMeasure() {

72
icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
View file

@ -613,91 +613,67 @@ public abstract class NumberFormatterSettings<T extends NumberFormatterSettings<
// of a MacroProps object at each step.
// TODO: Remove the reference to the parent after the macros are resolved?
MacroProps macros = new MacroProps();
// Bitmap: 1 if seen; 0 if unseen
long seen = 0;
NumberFormatterSettings<?> current = this;
while (current != null) {
long keyBitmask = (1L << current.key);
if (0 != (seen & keyBitmask)) {
current = current.parent;
continue;
}
seen |= keyBitmask;
switch (current.key) {
case KEY_MACROS:
macros.fallback((MacroProps) current.value);
break;
case KEY_LOCALE:
if (macros.loc == null) {
macros.loc = (ULocale) current.value;
}
macros.loc = (ULocale) current.value;
break;
case KEY_NOTATION:
if (macros.notation == null) {
macros.notation = (Notation) current.value;
}
macros.notation = (Notation) current.value;
break;
case KEY_UNIT:
if (macros.unit == null) {
macros.unit = (MeasureUnit) current.value;
}
macros.unit = (MeasureUnit) current.value;
break;
case KEY_PRECISION:
if (macros.precision == null) {
macros.precision = (Precision) current.value;
}
macros.precision = (Precision) current.value;
break;
case KEY_ROUNDING_MODE:
if (macros.roundingMode == null) {
macros.roundingMode = (RoundingMode) current.value;
}
macros.roundingMode = (RoundingMode) current.value;
break;
case KEY_GROUPING:
if (macros.grouping == null) {
macros.grouping = /* (Object) */ current.value;
}
macros.grouping = /* (Object) */ current.value;
break;
case KEY_PADDER:
if (macros.padder == null) {
macros.padder = (Padder) current.value;
}
macros.padder = (Padder) current.value;
break;
case KEY_INTEGER:
if (macros.integerWidth == null) {
macros.integerWidth = (IntegerWidth) current.value;
}
macros.integerWidth = (IntegerWidth) current.value;
break;
case KEY_SYMBOLS:
if (macros.symbols == null) {
macros.symbols = /* (Object) */ current.value;
}
macros.symbols = /* (Object) */ current.value;
break;
case KEY_UNIT_WIDTH:
if (macros.unitWidth == null) {
macros.unitWidth = (UnitWidth) current.value;
}
macros.unitWidth = (UnitWidth) current.value;
break;
case KEY_SIGN:
if (macros.sign == null) {
macros.sign = (SignDisplay) current.value;
}
macros.sign = (SignDisplay) current.value;
break;
case KEY_DECIMAL:
if (macros.decimal == null) {
macros.decimal = (DecimalSeparatorDisplay) current.value;
}
macros.decimal = (DecimalSeparatorDisplay) current.value;
break;
case KEY_SCALE:
if (macros.scale == null) {
macros.scale = (Scale) current.value;
}
macros.scale = (Scale) current.value;
break;
case KEY_THRESHOLD:
if (macros.threshold == null) {
macros.threshold = (Long) current.value;
}
macros.threshold = (Long) current.value;
break;
case KEY_PER_UNIT:
if (macros.perUnit == null) {
macros.perUnit = (MeasureUnit) current.value;
}
macros.perUnit = (MeasureUnit) current.value;
break;
case KEY_USAGE:
if(macros.usage == null) {
macros.usage = (String) current.value;
}
macros.usage = (String) current.value;
break;
default:
throw new AssertionError("Unknown key: " + current.key);

9
icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
View file

@ -756,6 +756,15 @@ public class NumberFormatterApiTest extends TestFmwk {
new ULocale("de-DE"),
-1.24,
"-1 Std., 14 Min. und 24 Sek.");
assertFormatSingle(
"Zero out the unit field",
"",
"",
NumberFormatter.with().unit(MeasureUnit.KELVIN).unit(NoUnit.BASE),
new ULocale("en"),
100,
"100");
}
@Test