Skip to content

Commit 59c70da

Browse files
youniesyounies
committed
ICU-23045 Remove known issue logging for unit identifiers related
# Description: This issue has been fixed in this PR: , and introducing the following issue:
1 parent 5a4e960 commit 59c70da

File tree

3 files changed

+16
-50
lines changed

3 files changed

+16
-50
lines changed

‎icu4c/source/test/intltest/measfmttest.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6602,15 +6602,10 @@ void MeasureFormatTest::TestInvalidIdentifiers() {
66026602
"meter-per-1000-1000",
66036603
"meter-per-1000-second-1000-kilometer",
66046604
"per-1000-and-per-1000",
6605-
"meter-per-100-100-kilometer", // Failing ICU-23045
6605+
"meter-per-100-100-kilometer",
66066606
};
66076607

66086608
for (const auto& input : inputs) {
6609-
if (uprv_strcmp(input, "meter-per-100-100-kilometer") == 0) {
6610-
logKnownIssue("ICU-23045", "Incorrect constant denominator for certain unit identifiers "
6611-
"leads to incorrect unit identifiers.");
6612-
continue;
6613-
}
66146609
status.setScope(input);
66156610
MeasureUnit::forIdentifier(input, status);
66166611
status.expectErrorAndReset(U_ILLEGAL_ARGUMENT_ERROR);

‎icu4c/source/test/intltest/units_test.cpp‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ void UnitsTest::testUnitsConstantsDenomenator() {
11921192
} testCases[]{
11931193
{"meter-per-1000", 1000},
11941194
{"liter-per-1000-kiloliter", 1000},
1195-
{"meter-per-100-kilometer", 100}, // Failing: ICU-23045
1195+
{"meter-per-100-kilometer", 100},
11961196
{"liter-per-kilometer", 0},
11971197
{"second-per-1000-minute", 1000},
11981198
{"gram-per-1000-kilogram", 1000},
@@ -1213,10 +1213,10 @@ void UnitsTest::testUnitsConstantsDenomenator() {
12131213
{"part-per-1000", 1000},
12141214
{"part-per-10000", 10000},
12151215
{"part-per-100000", 100000},
1216-
{"part-per-1000000", 1000000}, // Failing: ICU-23045
1216+
{"part-per-1000000", 1000000},
12171217
{"part-per-10000000", 10000000},
12181218
{"part-per-100000000", 100000000},
1219-
{"part-per-1000000000", 1000000000}, // Failing: ICU-23045
1219+
{"part-per-1000000000", 1000000000},
12201220
{"part-per-10000000000", 10000000000},
12211221
{"part-per-100000000000", 100000000000},
12221222
{"part-per-1000000000000", 1000000000000},
@@ -1240,10 +1240,10 @@ void UnitsTest::testUnitsConstantsDenomenator() {
12401240
{"part-per-1E4", 10000},
12411241
{"part-per-1e5", 100000},
12421242
{"part-per-1E5", 100000},
1243-
{"part-per-1e6", 1000000}, // Failing: ICU-23045
1244-
{"part-per-1E6", 1000000}, // Failing: ICU-23045
1245-
{"part-per-1e9", 1000000000}, // Failing: ICU-23045
1246-
{"part-per-1E9", 1000000000}, // Failing: ICU-23045
1243+
{"part-per-1e6", 1000000},
1244+
{"part-per-1E6", 1000000},
1245+
{"part-per-1e9", 1000000000},
1246+
{"part-per-1E9", 1000000000},
12471247
{"part-per-1e10", 10000000000},
12481248
{"part-per-1E10", 10000000000},
12491249
{"part-per-1e18", 1000000000000000000},
@@ -1261,17 +1261,6 @@ void UnitsTest::testUnitsConstantsDenomenator() {
12611261
};
12621262

12631263
for (const auto &testCase : testCases) {
1264-
if (uprv_strcmp(testCase.source, "part-per-1000000") == 0 ||
1265-
uprv_strcmp(testCase.source, "part-per-1000000000") == 0 ||
1266-
uprv_strcmp(testCase.source, "part-per-1e6") == 0 ||
1267-
uprv_strcmp(testCase.source, "part-per-1E6") == 0 ||
1268-
uprv_strcmp(testCase.source, "part-per-1e9") == 0 ||
1269-
uprv_strcmp(testCase.source, "part-per-1E9") == 0 ||
1270-
uprv_strcmp(testCase.source, "meter-per-100-kilometer") == 0) {
1271-
logKnownIssue("ICU-23045", "Incorrect constant denominator for certain unit identifiers");
1272-
continue;
1273-
}
1274-
12751264
MeasureUnit unit = MeasureUnit::forIdentifier(testCase.source, status);
12761265
if (status.errIfFailureAndReset("forIdentifier(\"%s\")", testCase.source)) {
12771266
continue;

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

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,7 @@ class ConstantDenominatorTestCase {
13421342
List<ConstantDenominatorTestCase> testCases = Arrays.asList(
13431343
new ConstantDenominatorTestCase("meter-per-1000", 1000),
13441344
new ConstantDenominatorTestCase("liter-per-1000-kiloliter", 1000),
1345-
new ConstantDenominatorTestCase("meter-per-100-kilometer", 100), // Failing ICU-23045
1345+
new ConstantDenominatorTestCase("meter-per-100-kilometer", 100),
13461346
new ConstantDenominatorTestCase("liter-per-kilometer", 0),
13471347
new ConstantDenominatorTestCase("second-per-1000-minute", 1000),
13481348
new ConstantDenominatorTestCase("gram-per-1000-kilogram", 1000),
@@ -1363,10 +1363,10 @@ class ConstantDenominatorTestCase {
13631363
new ConstantDenominatorTestCase("part-per-1000", 1000),
13641364
new ConstantDenominatorTestCase("part-per-10000", 10000),
13651365
new ConstantDenominatorTestCase("part-per-100000", 100000),
1366-
new ConstantDenominatorTestCase("part-per-1000000", 1000000), // Failing ICU-23045
1366+
new ConstantDenominatorTestCase("part-per-1000000", 1000000),
13671367
new ConstantDenominatorTestCase("part-per-10000000", 10000000),
13681368
new ConstantDenominatorTestCase("part-per-100000000", 100000000),
1369-
new ConstantDenominatorTestCase("part-per-1000000000", 1000000000), // Failing ICU-23045
1369+
new ConstantDenominatorTestCase("part-per-1000000000", 1000000000),
13701370
new ConstantDenominatorTestCase("part-per-10000000000", 10000000000L),
13711371
new ConstantDenominatorTestCase("part-per-100000000000", 100000000000L),
13721372
new ConstantDenominatorTestCase("part-per-1000000000000", 1000000000000L),
@@ -1389,10 +1389,10 @@ class ConstantDenominatorTestCase {
13891389
new ConstantDenominatorTestCase("part-per-1E4", 10000),
13901390
new ConstantDenominatorTestCase("part-per-1e5", 100000),
13911391
new ConstantDenominatorTestCase("part-per-1E5", 100000),
1392-
new ConstantDenominatorTestCase("part-per-1e6", 1000000), // Failing ICU-23045
1393-
new ConstantDenominatorTestCase("part-per-1E6", 1000000), // Failing ICU-23045
1394-
new ConstantDenominatorTestCase("part-per-1e9", 1000000000), // Failing ICU-23045
1395-
new ConstantDenominatorTestCase("part-per-1E9", 1000000000), // Failing ICU-23045
1392+
new ConstantDenominatorTestCase("part-per-1e6", 1000000),
1393+
new ConstantDenominatorTestCase("part-per-1E6", 1000000),
1394+
new ConstantDenominatorTestCase("part-per-1e9", 1000000000),
1395+
new ConstantDenominatorTestCase("part-per-1E9", 1000000000),
13961396
new ConstantDenominatorTestCase("part-per-1e10", 10000000000L),
13971397
new ConstantDenominatorTestCase("part-per-1E10", 10000000000L),
13981398
new ConstantDenominatorTestCase("part-per-1e18", 1000000000000000000L),
@@ -1409,18 +1409,6 @@ class ConstantDenominatorTestCase {
14091409
new ConstantDenominatorTestCase("meter-per-square-second", 0));
14101410

14111411
for (ConstantDenominatorTestCase testCase : testCases) {
1412-
switch (testCase.identifier) {
1413-
case "part-per-1000000":
1414-
case "part-per-1000000000":
1415-
case "part-per-1e6":
1416-
case "part-per-1E6":
1417-
case "part-per-1e9":
1418-
case "part-per-1E9":
1419-
case "meter-per-100-kilometer":
1420-
logKnownIssue("ICU-23045", "Incorrect constant denominator for certain unit identifiers");
1421-
continue;
1422-
}
1423-
14241412
MeasureUnit unit = MeasureUnit.forIdentifier(testCase.identifier);
14251413
assertEquals("Constant denominator for " + testCase.identifier, testCase.expectedConstantDenominator,
14261414
unit.getConstantDenominator());
@@ -1480,16 +1468,10 @@ public void TestInvalidIdentifiers() {
14801468
"meter-per-1000-second-1000-kilometer",
14811469
"per-1000-and-per-1000",
14821470
"liter-per-kilometer-100",
1483-
"meter-per-100-100-kilometer", // Failing ICU-23045
1471+
"meter-per-100-100-kilometer",
14841472
};
14851473

14861474
for (String input : inputs) {
1487-
if (input.equals("meter-per-100-100-kilometer")) {
1488-
logKnownIssue("ICU-23045", "Incorrect constant denominator for certain unit identifiers " +
1489-
"leads to incorrect unit identifiers.");
1490-
continue;
1491-
}
1492-
14931475
try {
14941476
MeasureUnit.forIdentifier(input);
14951477
Assert.fail("An IllegalArgumentException must be thrown");

0 commit comments

Comments
 (0)