ICU-23088 convert CLDR unitIdComponents; fix superseded unit APIs, update MeasureUnitGeneratorTest

Author: pedberg-icu

icu4c/source/data/misc/units.txt

@@ -812,6 +812,58 @@ units:table(nofallback){
         speed_of_light_meters_per_second{"299792458"}
         tsubo_to_m2{"400/121"}
     }
+    unitIdComponents{
+        and{"and"}
+        per{"per"}
+        power{
+            "square",
+            "cubic",
+            "pow2",
+            "pow3",
+            "pow4",
+            "pow5",
+            "pow6",
+            "pow7",
+            "pow8",
+            "pow9",
+            "pow10",
+            "pow11",
+            "pow12",
+            "pow13",
+            "pow14",
+            "pow15",
+        }
+        prefix{
+            "arc",
+            "british",
+            "dessert",
+            "fluid",
+            "light",
+            "nautical",
+            "xxx",
+            "x",
+            "curr",
+        }
+        suffix{
+            "force",
+            "imperial",
+            "luminosity",
+            "mass",
+            "metric",
+            "person",
+            "radius",
+            "scandinavian",
+            "troy",
+            "unit",
+            "it",
+            "us",
+            "energy",
+            "density",
+            "cloth",
+            "length",
+            "jp",
+        }
+    }
     unitPreferenceData{
         "area"{
             "default"{

icu4c/source/i18n/measunit.cpp

@@ -41,27 +41,27 @@ static const int32_t gOffsets[] = {
     2,
     8,
     21,
-    35,
-    39,
-    341,
-    352,
-    371,
-    379,
-    393,
-    397,
-    401,
-    409,
-    440,
-    444,
-    446,
+    34,
+    38,
+    340,
+    351,
+    370,
+    378,
+    392,
+    396,
+    400,
+    408,
+    439,
+    443,
+    445,
+    462,
     463,
-    464,
-    470,
-    482,
-    488,
-    493,
-    495,
-    539
+    469,
+    481,
+    487,
+    492,
+    494,
+    538
 };
 
 static const int32_t kCurrencyOffset = 5;
@@ -121,7 +121,6 @@ static const char * const gSubTypes[] = {
     "karat",
     "katal",
     "milligram-ofglucose-per-deciliter",
-    "milligram-per-deciliter",
     "millimole-per-liter",
     "mole",
     "ofglucose",
@@ -842,91 +841,91 @@ MeasureUnit MeasureUnit::getMilligramOfglucosePerDeciliter() {
 }
 
 MeasureUnit *MeasureUnit::createMilligramPerDeciliter(UErrorCode &status) {
-    return MeasureUnit::create(3, 4, status);
+    return MeasureUnit::create(3, 3, status);
 }
 
 MeasureUnit MeasureUnit::getMilligramPerDeciliter() {
-    return MeasureUnit(3, 4);
+    return MeasureUnit(3, 3);
 }
 
 MeasureUnit *MeasureUnit::createMillimolePerLiter(UErrorCode &status) {
-    return MeasureUnit::create(3, 5, status);
+    return MeasureUnit::create(3, 4, status);
 }
 
 MeasureUnit MeasureUnit::getMillimolePerLiter() {
-    return MeasureUnit(3, 5);
+    return MeasureUnit(3, 4);
 }
 
 MeasureUnit *MeasureUnit::createMole(UErrorCode &status) {
-    return MeasureUnit::create(3, 6, status);
+    return MeasureUnit::create(3, 5, status);
 }
 
 MeasureUnit MeasureUnit::getMole() {
-    return MeasureUnit(3, 6);
+    return MeasureUnit(3, 5);
 }
 
 MeasureUnit *MeasureUnit::createOfglucose(UErrorCode &status) {
-    return MeasureUnit::create(3, 7, status);
+    return MeasureUnit::create(3, 6, status);
 }
 
 MeasureUnit MeasureUnit::getOfglucose() {
-    return MeasureUnit(3, 7);
+    return MeasureUnit(3, 6);
 }
 
 MeasureUnit *MeasureUnit::createPart(UErrorCode &status) {
-    return MeasureUnit::create(3, 8, status);
+    return MeasureUnit::create(3, 7, status);
 }
 
 MeasureUnit MeasureUnit::getPart() {
-    return MeasureUnit(3, 8);
+    return MeasureUnit(3, 7);
 }
 
 MeasureUnit *MeasureUnit::createPartPer1E6(UErrorCode &status) {
-    return MeasureUnit::create(3, 9, status);
+    return MeasureUnit::create(3, 8, status);
 }
 
 MeasureUnit MeasureUnit::getPartPer1E6() {
-    return MeasureUnit(3, 9);
+    return MeasureUnit(3, 8);
+}
+
+MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) {
+    return MeasureUnit::create(3, 8, status);
+}
+
+MeasureUnit MeasureUnit::getPartPerMillion() {
+    return MeasureUnit(3, 8);
 }
 
 MeasureUnit *MeasureUnit::createPartPer1E9(UErrorCode &status) {
-    return MeasureUnit::create(3, 10, status);
+    return MeasureUnit::create(3, 9, status);
 }
 
 MeasureUnit MeasureUnit::getPartPer1E9() {
-    return MeasureUnit(3, 10);
+    return MeasureUnit(3, 9);
 }
 
 MeasureUnit *MeasureUnit::createPercent(UErrorCode &status) {
-    return MeasureUnit::create(3, 11, status);
+    return MeasureUnit::create(3, 10, status);
 }
 
 MeasureUnit MeasureUnit::getPercent() {
-    return MeasureUnit(3, 11);
+    return MeasureUnit(3, 10);
 }
 
 MeasureUnit *MeasureUnit::createPermille(UErrorCode &status) {
-    return MeasureUnit::create(3, 12, status);
+    return MeasureUnit::create(3, 11, status);
 }
 
 MeasureUnit MeasureUnit::getPermille() {
-    return MeasureUnit(3, 12);
-}
-
-MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) {
-    return MeasureUnit::create(3, 9, status);
-}
-
-MeasureUnit MeasureUnit::getPartPerMillion() {
-    return MeasureUnit(3, 9);
+    return MeasureUnit(3, 11);
 }
 
 MeasureUnit *MeasureUnit::createPermyriad(UErrorCode &status) {
-    return MeasureUnit::create(3, 13, status);
+    return MeasureUnit::create(3, 12, status);
 }
 
 MeasureUnit MeasureUnit::getPermyriad() {
-    return MeasureUnit(3, 13);
+    return MeasureUnit(3, 12);
 }
 
 MeasureUnit *MeasureUnit::createLiterPer100Kilometers(UErrorCode &status) {

icu4c/source/i18n/unicode/measunit.h

@@ -1175,7 +1175,9 @@ class U_I18N_API MeasureUnit: public UObject {
 
     /**
      * Returns by pointer, unit of concentr: milligram-per-deciliter.
+     * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69).
      * Caller owns returned value and must free it.
+     * Also see {@link #createMilligramOfglucosePerDeciliter()}.
      * Also see {@link #getMilligramPerDeciliter()}.
      * @param status ICU error code.
      * @stable ICU 57
@@ -1184,6 +1186,8 @@ class U_I18N_API MeasureUnit: public UObject {
 
     /**
      * Returns by value, unit of concentr: milligram-per-deciliter.
+     * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69).
+     * Also see {@link #getMilligramOfglucosePerDeciliter()}.
      * Also see {@link #createMilligramPerDeciliter()}.
      * @stable ICU 64
      */
@@ -1275,6 +1279,26 @@ class U_I18N_API MeasureUnit: public UObject {
     static MeasureUnit getPartPer1E6();
 #endif /* U_HIDE_DRAFT_API */
 
+    /**
+     * Returns by pointer, unit of concentr: part-per-million.
+     * (renamed to part-per-1e6 in CLDR 48 / ICU 78).
+     * Caller owns returned value and must free it.
+     * Also see {@link #createPartPer1E6()}.
+     * Also see {@link #getPartPerMillion()}.
+     * @param status ICU error code.
+     * @stable ICU 57
+     */
+    static MeasureUnit *createPartPerMillion(UErrorCode &status);
+
+    /**
+     * Returns by value, unit of concentr: part-per-million.
+     * (renamed to part-per-1e6 in CLDR 48 / ICU 78).
+     * Also see {@link #getPartPer1E6()}.
+     * Also see {@link #createPartPerMillion()}.
+     * @stable ICU 64
+     */
+    static MeasureUnit getPartPerMillion();
+
 #ifndef U_HIDE_DRAFT_API
     /**
      * Returns by pointer, unit of concentr: part-per-1e9.
@@ -1325,26 +1349,6 @@ class U_I18N_API MeasureUnit: public UObject {
      */
     static MeasureUnit getPermille();
 
-    /**
-     * Returns by pointer, unit of concentr: permillion.
-     * (renamed to part-per-1e6 in CLDR 48 / ICU 78).
-     * Caller owns returned value and must free it.
-     * Also see {@link #createPartPer1E6()}.
-     * Also see {@link #getPartPerMillion()}.
-     * @param status ICU error code.
-     * @stable ICU 57
-     */
-    static MeasureUnit *createPartPerMillion(UErrorCode &status);
-
-    /**
-     * Returns by value, unit of concentr: permillion.
-     * (renamed to part-per-1e6 in CLDR 48 / ICU 78).
-     * Also see {@link #getPartPer1E6()}.
-     * Also see {@link #createPartPerMillion()}.
-     * @stable ICU 64
-     */
-    static MeasureUnit getPartPerMillion();
-
     /**
      * Returns by pointer, unit of concentr: permyriad.
      * Caller owns returned value and must free it.

icu4c/source/test/intltest/measfmttest.cpp

@@ -4683,8 +4683,8 @@ void MeasureFormatTest::TestCompatible78() {
     measureUnitValue = MeasureUnit::getKatal();
     measureUnit.adoptInstead(MeasureUnit::createMilligramOfglucosePerDeciliter(status));
     measureUnitValue = MeasureUnit::getMilligramOfglucosePerDeciliter();
-    measureUnit.adoptInstead(MeasureUnit::createMilligramPerDeciliter(status));
-    measureUnitValue = MeasureUnit::getMilligramPerDeciliter();
+    measureUnit.adoptInstead(MeasureUnit::createMilligramPerDeciliter(status)); // backward compatibility API
+    measureUnitValue = MeasureUnit::getMilligramPerDeciliter(); // backward compatibility API
     measureUnit.adoptInstead(MeasureUnit::createMillimolePerLiter(status));
     measureUnitValue = MeasureUnit::getMillimolePerLiter();
     measureUnit.adoptInstead(MeasureUnit::createMole(status));
@@ -4695,14 +4695,14 @@ void MeasureFormatTest::TestCompatible78() {
     measureUnitValue = MeasureUnit::getPart();
     measureUnit.adoptInstead(MeasureUnit::createPartPer1E6(status));
     measureUnitValue = MeasureUnit::getPartPer1E6();
+    measureUnit.adoptInstead(MeasureUnit::createPartPerMillion(status)); // backward compatibility API
+    measureUnitValue = MeasureUnit::getPartPerMillion(); // backward compatibility API
     measureUnit.adoptInstead(MeasureUnit::createPartPer1E9(status));
     measureUnitValue = MeasureUnit::getPartPer1E9();
     measureUnit.adoptInstead(MeasureUnit::createPercent(status));
     measureUnitValue = MeasureUnit::getPercent();
     measureUnit.adoptInstead(MeasureUnit::createPermille(status));
     measureUnitValue = MeasureUnit::getPermille();
-    measureUnit.adoptInstead(MeasureUnit::createPartPerMillion(status));
-    measureUnitValue = MeasureUnit::getPartPerMillion();
     measureUnit.adoptInstead(MeasureUnit::createPermyriad(status));
     measureUnitValue = MeasureUnit::getPermyriad();
     measureUnit.adoptInstead(MeasureUnit::createLiterPer100Kilometers(status));
@@ -4957,6 +4957,8 @@ void MeasureFormatTest::TestCompatible78() {
     measureUnitValue = MeasureUnit::getTon();
     measureUnit.adoptInstead(MeasureUnit::createTonne(status));
     measureUnitValue = MeasureUnit::getTonne();
+    measureUnit.adoptInstead(MeasureUnit::createMetricTon(status)); // backward compatibility API
+    measureUnitValue = MeasureUnit::getMetricTon(); // backward compatibility API
     measureUnit.adoptInstead(MeasureUnit::createGigawatt(status));
     measureUnitValue = MeasureUnit::getGigawatt();
     measureUnit.adoptInstead(MeasureUnit::createHorsepower(status));
@@ -6727,7 +6729,6 @@ void MeasureFormatTest::TestParseToBuiltIn() {
         {"centimeter-centimeter", MeasureUnit::getSquareCentimeter()},
         {"square-foot", MeasureUnit::getSquareFoot()},
         {"pow2-inch", MeasureUnit::getSquareInch()},
-        {"milligram-per-deciliter", MeasureUnit::getMilligramPerDeciliter()},
         {"pound-force-per-pow2-inch", MeasureUnit::getPoundPerSquareInch()},
         {"yard-pow2-yard", MeasureUnit::getCubicYard()},
         {"square-yard-yard", MeasureUnit::getCubicYard()},

icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitCompatibilityTest.java

@@ -2986,13 +2986,13 @@ public void TestCompatible78() {
                 MeasureUnit.KARAT,
                 MeasureUnit.KATAL,
                 MeasureUnit.MILLIGRAM_OFGLUCOSE_PER_DECILITER,
-                MeasureUnit.MILLIGRAM_PER_DECILITER,
+                MeasureUnit.MILLIGRAM_PER_DECILITER, // backward compatibility API
                 MeasureUnit.MILLIMOLE_PER_LITER,
                 MeasureUnit.MOLE,
                 MeasureUnit.OFGLUCOSE,
                 MeasureUnit.PART,
                 MeasureUnit.PART_PER_1E6,
-                MeasureUnit.PART_PER_MILLION,
+                MeasureUnit.PART_PER_MILLION, // backward compatibility API
                 MeasureUnit.PART_PER_1E9,
                 MeasureUnit.PERCENT,
                 MeasureUnit.PERMILLE,
@@ -3123,6 +3123,7 @@ public void TestCompatible78() {
                 MeasureUnit.STONE,
                 MeasureUnit.TON,
                 MeasureUnit.TONNE,
+                MeasureUnit.METRIC_TON, // backward compatibility API
                 MeasureUnit.GIGAWATT,
                 MeasureUnit.HORSEPOWER,
                 MeasureUnit.KILOWATT,
@@ -3199,7 +3200,7 @@ public void TestCompatible78() {
                 MeasureUnit.TEASPOON,
                 MeasureUnit.TO_JP,
         };
-        assertEquals("",  237, units.length);
+        assertEquals("",  238, units.length);
     }
 
    /*