From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com>
Date: Mon, 30 Mar 2020 12:14:02 +0000 (+0200)
Subject: Fix comments: remove a WIP, fix expectations in disabled/failing test.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51b6cb5e963466103651f2b610ab467bde666ba8;p=icu

Fix comments: remove a WIP, fix expectations in disabled/failing test.
---

diff --git a/icu4c/source/i18n/unitsdata.cpp b/icu4c/source/i18n/unitsdata.cpp
index b26f6f55799..5daf170cf2d 100644
--- a/icu4c/source/i18n/unitsdata.cpp
+++ b/icu4c/source/i18n/unitsdata.cpp
@@ -343,7 +343,6 @@ MaybeStackVector<ConversionRateInfo> getConversionRatesInfo(const MeasureUnit so
         MeasureUnit baseUnit;
         processSingleUnit(targetUnits[i], convertUnitsBundle.getAlias(), convertSink, &baseUnit, status);
         if (target.getComplexity(status) == UMEASURE_UNIT_SEQUENCE) {
-            // WIP/TODO(hugovdm): add consistency checks.
             if (baseUnit != sourceBaseUnit) {
                 status = U_ILLEGAL_ARGUMENT_ERROR;
                 return result;
@@ -364,6 +363,8 @@ MaybeStackVector<ConversionRateInfo> getConversionRatesInfo(const MeasureUnit so
             // fprintf(stderr, "<%s> x <%s> => ",
             //         targetBaseUnit.getIdentifier(),
             //         baseUnit.getIdentifier());
+            //
+            // Expected: <kilogram-square-meter-per-meter-square-second>
             targetBaseUnit = targetBaseUnit.product(baseUnit, status);
             // fprintf(stderr, "<%s> - Status: %s\n",
             //         targetBaseUnit.getIdentifier(), u_errorName(status));
diff --git a/icu4c/source/test/intltest/unitsdatatest.cpp b/icu4c/source/test/intltest/unitsdatatest.cpp
index e5c51016009..32fa616f8fd 100644
--- a/icu4c/source/test/intltest/unitsdatatest.cpp
+++ b/icu4c/source/test/intltest/unitsdatatest.cpp
@@ -70,7 +70,7 @@ void UnitsDataTest::testGetConversionRateInfo() {
         // {"therm-us-per-meter",
         //  "joule-per-meter",
         //  {"therm-us", "joule", "meter", NULL, NULL},
-        //  "kilogram-meter-per-square-second"},
+        //  "kilogram-square-meter-per-square-second"},
 
         // TODO: include capacitance test case with base unit:
         // pow4-second-square-ampere-per-kilogram-square-meter;