ICU-21349 calling .usage("") should unset the existing usage
See #1614diff --git a/icu4c/source/test/intltest/numbertest_api.cpp b/icu4c/source/test/intltest/numbertest_api.cpp
index 2540a1a..0da4d2d 100644
--- a/icu4c/source/test/intltest/numbertest_api.cpp
+++ b/icu4c/source/test/intltest/numbertest_api.cpp
@@ -1719,6 +1719,43 @@
30500,
u"350 m");
+ // Test calling `.usage("")` should unset the existing usage.
+ // First: without usage
+ assertFormatSingle(u"Rounding Mode propagates: rounding up",
+ u"measure-unit/length-centimeter rounding-mode-ceiling",
+ u"unit/centimeter rounding-mode-ceiling",
+ NumberFormatter::with()
+ .unit(MeasureUnit::forIdentifier("centimeter", status))
+ .roundingMode(UNUM_ROUND_CEILING),
+ Locale("en-US"), //
+ 3048, //
+ u"3,048 cm");
+
+ // Second: with "road" usage
+ assertFormatSingle(u"Rounding Mode propagates: rounding up",
+ u"usage/road measure-unit/length-centimeter rounding-mode-ceiling",
+ u"usage/road unit/centimeter rounding-mode-ceiling",
+ NumberFormatter::with()
+ .unit(MeasureUnit::forIdentifier("centimeter", status))
+ .usage("road")
+ .roundingMode(UNUM_ROUND_CEILING),
+ Locale("en-US"), //
+ 3048, //
+ u"100 ft");
+
+ // Third: with "road" usage, then the usage unsetted by calling .usage("")
+ assertFormatSingle(u"Rounding Mode propagates: rounding up",
+ u"measure-unit/length-centimeter rounding-mode-ceiling",
+ u"unit/centimeter rounding-mode-ceiling",
+ NumberFormatter::with()
+ .unit(MeasureUnit::forIdentifier("centimeter", status))
+ .usage("road")
+ .roundingMode(UNUM_ROUND_CEILING)
+ .usage(""), // unset
+ Locale("en-US"), //
+ 3048, //
+ u"3,048 cm");
+
// TODO(icu-units#38): improve unit testing coverage. E.g. add vehicle-fuel
// triggering inversion conversion code. Test with 0 too, to see
// divide-by-zero behaviour.
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
index 40ba691..5549bb4 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberFormatterSettings.java
@@ -545,6 +545,10 @@
* @draft ICU 68
*/
public T usage(String usage) {
+ if (usage != null && usage.isEmpty()) {
+ return create(KEY_USAGE, null);
+ }
+
return create(KEY_USAGE, usage);
}
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
index a50c282..85670b2 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberFormatterApiTest.java
@@ -1653,6 +1653,57 @@
30500,
"350 m");
+ // Test calling .usage("") or .usage(null) should unset the existing usage.
+ // First: without usage
+ assertFormatSingle("Rounding Mode propagates: rounding up",
+ "measure-unit/length-centimeter rounding-mode-ceiling",
+ "unit/centimeter rounding-mode-ceiling",
+ NumberFormatter.with()
+ .unit(MeasureUnit.forIdentifier("centimeter"))
+ .roundingMode(RoundingMode.CEILING),
+ new ULocale("en-US"),
+ 3048,
+ "3,048 cm");
+
+ // Second: with "road" usage
+ assertFormatSingle("Rounding Mode propagates: rounding up",
+ "usage/road measure-unit/length-centimeter rounding-mode-ceiling",
+ "usage/road unit/centimeter rounding-mode-ceiling",
+ NumberFormatter.with()
+ .unit(MeasureUnit.forIdentifier("centimeter"))
+ .usage("road")
+ .roundingMode(RoundingMode.CEILING),
+ new ULocale("en-US"),
+ 3048,
+ "100 ft");
+
+ // Third: with "road" usage, then the usage unsetted by calling .usage("")
+ assertFormatSingle("Rounding Mode propagates: rounding up",
+ "measure-unit/length-centimeter rounding-mode-ceiling",
+ "unit/centimeter rounding-mode-ceiling",
+ NumberFormatter.with()
+ .unit(MeasureUnit.forIdentifier("centimeter"))
+ .usage("road")
+ .roundingMode(RoundingMode.CEILING)
+ .usage(""), // unset
+ new ULocale("en-US"),
+ 3048,
+ "3,048 cm");
+
+ // Fourth: with "road" usage, then the usage unsetted by calling .usage(nul)
+ assertFormatSingle("Rounding Mode propagates: rounding up",
+ "measure-unit/length-centimeter rounding-mode-ceiling",
+ "unit/centimeter rounding-mode-ceiling",
+ NumberFormatter.with()
+ .unit(MeasureUnit.forIdentifier("centimeter"))
+ .usage("road")
+ .roundingMode(RoundingMode.CEILING)
+ .usage(null), // unset
+ new ULocale("en-US"),
+ 3048,
+ "3,048 cm");
+
+
// TODO(icu-units#38): improve unit testing coverage. E.g. add
// vehicle-fuel triggering inversion conversion code. Test with 0 too,
// to see divide-by-zero behaviour.
