ICU-23265 Fixed parseMeasureUnitOption() so that it correctly handles measurement unit alises.

Author: richgillam

icu4c/source/i18n/number_skeletons.cpp

@@ -1076,8 +1076,15 @@ void blueprint_helpers::parseMeasureUnitOption(const StringSegment& segment, Mac
     if (MeasureUnit::validateAndGet(type.toStringPiece(), subType.toStringPiece(), unit)) {
         macros.unit = unit;
         return;
-    } 
+    }
 
+    UErrorCode localStatus = U_ZERO_ERROR;
+    unit = MeasureUnit::forIdentifier(subType.data(), localStatus);
+    if (U_SUCCESS(localStatus) && uprv_strcmp(type.data(), unit.getType()) == 0) {
+        macros.unit = unit;
+        return;
+    }
+
     status = U_NUMBER_SKELETON_SYNTAX_ERROR;
 }
 

icu4c/source/test/intltest/numbertest.h

@@ -306,6 +306,7 @@ class NumberSkeletonTest : public IntlTest {
     void perUnitToSkeleton();
     void measurementSystemOverride();
     void longSkeletonCrash();
+    void unitAliases();
 
     void runIndexedTest(int32_t index, UBool exec, const char*& name, char* par = nullptr) override;
 

icu4c/source/test/intltest/numbertest_skeletons.cpp

@@ -36,6 +36,7 @@ void NumberSkeletonTest::runIndexedTest(int32_t index, UBool exec, const char*&
         TESTCASE_AUTO(perUnitToSkeleton);
         TESTCASE_AUTO(measurementSystemOverride);
         TESTCASE_AUTO(longSkeletonCrash);
+        TESTCASE_AUTO(unitAliases);
     TESTCASE_AUTO_END;
 }
 
@@ -581,4 +582,31 @@ void NumberSkeletonTest::longSkeletonCrash() {
     UnlocalizedNumberFormatter nf = NumberFormatter::forSkeleton(skeleton, err);
 }
 
+void NumberSkeletonTest::unitAliases() {
+    IcuTestErrorCode status(*this, "unitAliases");
+
+    struct TestCase {
+        const char16_t* skeleton;
+        const char16_t* expectedResult;
+    } testCases[] = {
+        { u"measure-unit/concentr-part-per-1e6", u"3.14 ppm" },
+        { u"measure-unit/concentr-part-per-million", u"3.14 ppm" },
+        { u"measure-unit/concentr-permillion", u"3.14 ppm" },
+        { u"measure-unit/concentr-milligram-ofglucose-per-deciliter", u"3.14 mg/dL" },
+        { u"measure-unit/concentr-milligram-per-deciliter", u"3.14 mg/dL" },
+        { u"measure-unit/mass-tonne", u"3.14 t" },
+        { u"measure-unit/mass-metric-ton", u"3.14 t" },
+    };
+    
+    for (const auto& testCase : testCases) {
+        LocalizedNumberFormatter nf = NumberFormatter::forSkeleton(testCase.skeleton, status).locale(Locale::getUS());
+        UnicodeString actualResult = nf.formatDouble(3.14, status).toString(status);
+        
+        status.setScope(testCase.skeleton);
+        if (!status.errIfFailureAndReset()) {
+            assertEquals(testCase.skeleton, testCase.expectedResult, actualResult);
+        }
+    }
+}
+
 #endif /* #if !UCONFIG_NO_FORMATTING */

icu4j/main/core/src/main/java/com/ibm/icu/number/NumberSkeletonImpl.java

@@ -1099,6 +1099,16 @@ private static void parseMeasureUnitOption(StringSegment segment, MacroProps mac
                 macros.unit = unit;
                 return;
             }
+            try {
+                unit = MeasureUnit.forIdentifier(subType);
+                if (unit.getType().equals(type)) {
+                    macros.unit = unit;
+                    return;
+                }
+            } catch (IllegalArgumentException e) {
+                // handled below
+            }
+
             throw new SkeletonSyntaxException("Unknown measure unit", segment);
         }
 

icu4j/main/core/src/test/java/com/ibm/icu/dev/test/number/NumberSkeletonTest.java

@@ -549,4 +549,36 @@ public void measurementSystemOverride() {
                     "Wrong result: " + languageTag + ":" + skeleton, expectedResult, actualResult);
         }
     }
+
+    @Test
+    public void unitAliases() {
+        class TestCase {
+            String skeleton;
+            String expectedResult;
+            TestCase(String skeleton, String expectedResult) {
+                this.skeleton = skeleton;
+                this.expectedResult = expectedResult;
+            }
+        }
+        TestCase[] testCases = new TestCase[] {
+            new TestCase("measure-unit/concentr-part-per-1e6", "3.14 ppm"),
+            new TestCase("measure-unit/concentr-part-per-million", "3.14 ppm"),
+            new TestCase("measure-unit/concentr-permillion", "3.14 ppm"),
+            new TestCase("measure-unit/concentr-milligram-ofglucose-per-deciliter", "3.14 mg/dL"),
+            new TestCase("measure-unit/concentr-milligram-per-deciliter", "3.14 mg/dL"),
+            new TestCase("measure-unit/mass-tonne", "3.14 t"),
+            new TestCase("measure-unit/mass-metric-ton", "3.14 t"),
+        };
+
+        for (TestCase testCase : testCases) {
+            try {
+                LocalizedNumberFormatter nf = NumberFormatter.forSkeleton(testCase.skeleton).locale(Locale.US);
+                String actualResult = nf.format(3.14).toString();
+
+                assertEquals("Wrong result for " + testCase.skeleton + ":", testCase.expectedResult, actualResult);
+            } catch (SkeletonSyntaxException e) {
+                fail(testCase.skeleton);
+            }
+        }
+    }
 }