Skip to content

Commit d10d79c

Browse files
sven-olysven-oly
committed
ICU-23056 ICU 78 scrub issues
See #3697
1 parent a9e63a8 commit d10d79c

File tree

10 files changed

+2
-81
lines changed

10 files changed

+2
-81
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,6 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, const Locale &origLocale, UB
296296
return;
297297
}
298298
//logln(UnicodeString("Min date is ") + fullFormat(minDate) + " for " + origLocale.getName());
299-
if (uprv_strncmp(origLocale.getBaseName(),"scn",3) == 0) {
300-
logKnownIssue("CLDR-18923", "Quoting in scn atTime/relative dateTimeFormats causes format/parse issues");
301-
return;
302-
}
303299

304300
pat = dynamic_cast<SimpleDateFormat*>(fmt)->toPattern(pat);
305301

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2467,10 +2467,6 @@ void DateIntervalFormatTest::testTicket20710_IntervalIdentity() {
24672467

24682468
for (int32_t i = 0; i < count; i++) {
24692469
const Locale locale = locales[i];
2470-
if (uprv_strncmp(locale.getBaseName(),"scn",3) == 0) {
2471-
logKnownIssue("CLDR-18923", "Quoting in scn atTime/relative dateTimeFormats causes format/parse issues");
2472-
continue;
2473-
}
24742470
LocalPointer<DateTimePatternGenerator> gen(DateTimePatternGenerator::createInstance(locale, status));
24752471
LocalPointer<Calendar> calendar(Calendar::createInstance(TimeZone::createTimeZone(timeZone), status));
24762472
calendar->setTime(static_cast<UDate>(1563235200000), status);

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6233,10 +6233,6 @@ void NumberFormatterApiTest::TestPortionFormat() {
62336233
};
62346234

62356235
for (auto testCase : testCases) {
6236-
//if (uprv_strcmp(testCase.unitIdentifier, "portion-per-1e9") != 0) {
6237-
// logKnownIssue("CLDR-18274", "The data for portion-per-XYZ is not determined yet.");
6238-
// continue;
6239-
//}
62406236
MeasureUnit unit = MeasureUnit::forIdentifier(testCase.unitIdentifier, status);
62416237
LocalizedNumberFormatter lnf =
62426238
NumberFormatter::withLocale(Locale::forLanguageTag(testCase.locale, status))

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,6 @@ void IntlTestDateFormat::monsterTest(/*char *par*/)
289289
}
290290
for (int32_t i=0; i<count; ++i)
291291
{
292-
if (uprv_strncmp(locales[i].getBaseName(),"scn",3) == 0) {
293-
logKnownIssue("CLDR-18923", "Quoting in scn atTime/relative dateTimeFormats causes format/parse issues");
294-
continue;
295-
}
296292
UnicodeString name = UnicodeString(locales[i].getName(), "");
297293
logln(UnicodeString("Testing ") + name + "...");
298294
testLocale(/*par, */locales[i], name);

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,6 @@ TimeZoneFormatTest::TestTimeZoneRoundTrip() {
171171

172172
// Run the roundtrip test
173173
for (int32_t locidx = 0; locidx < nLocales; locidx++) {
174-
if (logKnownIssue("CLDR-18924", "Timezone round trip issues in ku, shn, sv for various zones") &&
175-
(
176-
(uprv_strcmp(LOCALES[locidx].getBaseName(),"ku") == 0) ||
177-
(uprv_strncmp(LOCALES[locidx].getBaseName(),"ku_",3) == 0) ||
178-
(uprv_strncmp(LOCALES[locidx].getBaseName(),"shn",3) == 0) ||
179-
(uprv_strcmp(LOCALES[locidx].getBaseName(),"sv") == 0) ||
180-
(uprv_strncmp(LOCALES[locidx].getBaseName(),"sv_",3) == 0)
181-
)) {
182-
continue;
183-
}
184174

185175
for (int32_t patidx = 0; patidx < UPRV_LENGTHOF(PATTERNS); patidx++) {
186176
SimpleDateFormat* sdf = new SimpleDateFormat(UnicodeString(PATTERNS[patidx]), LOCALES[locidx], status);
@@ -593,12 +583,6 @@ void TimeZoneFormatTest::RunTimeRoundTripTests(int32_t threadNumber) {
593583
timer = Calendar::getNow();
594584

595585
while ((tzid = tzids->snext(status))) {
596-
if (logKnownIssue("CLDR-18924", "Time round trip issues for Pacific/Apia in various locales and Pacific/Honolulu in Swedish" ) &&
597-
(tzid->compare(u"Pacific/Apia", -1) == 0
598-
|| (tzid->compare(u"Pacific/Honolulu", -1) == 0 && uprv_strncmp(gLocaleData->locales[locidx].getBaseName(),"sv_",3) == 0))) {
599-
continue;
600-
}
601-
602586
if (uprv_strcmp(PATTERNS[patidx], "V") == 0) {
603587
// Some zones do not have short ID assigned, such as Asia/Riyadh87.
604588
// The time roundtrip will fail for such zones with pattern "V" (short zone ID).

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -249,19 +249,13 @@ public void TestFormatPeriodEn() {
249249
mf = MeasureFormat.getInstance(ULocale.GERMAN, FormatWidth.WIDE, nf);
250250
verifyFormatPeriod("de FULL", mf, fullDataDe);
251251
mf = MeasureFormat.getInstance(ULocale.GERMAN, FormatWidth.NUMERIC, nf);
252-
if (!logKnownIssue("CLDR-18905", "German narrow change needs revisiting")) {
253-
verifyFormatPeriod("de NUMERIC", mf, numericDataDe);
254-
}
255252

256253
// Same tests, with Java Locale
257254
nf = NumberFormat.getNumberInstance(Locale.GERMAN);
258255
nf.setMaximumFractionDigits(4);
259256
mf = MeasureFormat.getInstance(Locale.GERMAN, FormatWidth.WIDE, nf);
260257
verifyFormatPeriod("de FULL(Java Locale)", mf, fullDataDe);
261258
mf = MeasureFormat.getInstance(Locale.GERMAN, FormatWidth.NUMERIC, nf);
262-
if (!logKnownIssue("CLDR-18905", "German narrow change needs revisiting")) {
263-
verifyFormatPeriod("de NUMERIC(Java Locale)", mf, numericDataDe);
264-
}
265259

266260
ULocale bengali = ULocale.forLanguageTag("bn");
267261
nf = NumberFormat.getNumberInstance(bengali);
@@ -530,8 +524,8 @@ public void testManyLocaleDurations() {
530524
}
531525
String result = mf.formatMeasures(hours, minutes);
532526
if (!result.equals(row[2])) {
533-
if (((ULocale)row[0]).equals(ULocale.GERMAN) &&
534-
((FormatWidth)row[1]).equals(FormatWidth.NARROW) &&
527+
if (((ULocale)row[0]).equals(ULocale.GERMAN) &&
528+
((FormatWidth)row[1]).equals(FormatWidth.NARROW) &&
535529
logKnownIssue("CLDR-18905", "German narrow change needs revisiting")
536530
) {
537531
continue;
@@ -1589,11 +1583,6 @@ public void TestParseBuiltIns() {
15891583
continue;
15901584
}
15911585

1592-
//if (unit.getIdentifier().equals("part-per-1e9")) {
1593-
// logKnownIssue("ICU-22781", "Handle concentr/perbillion in ICU");
1594-
// continue;
1595-
//}
1596-
15971586
// Prove that all built-in units are parseable, except "generic" temperature
15981587
// (and for now, beaufort units)
15991588
if (unit == MeasureUnit.GENERIC_TEMPERATURE) {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7195,10 +7195,6 @@ class TestCase {
71957195
};
71967196

71977197
for (TestCase testCase : testCases) {
7198-
//if (testCase.unitIdentifier.compareTo("portion-per-1e9") != 0) {
7199-
// logKnownIssue("CLDR-18274", "The data for portion-per-XYZ is not determined yet.");
7200-
// continue;
7201-
//}
72027198
MeasureUnit unit = MeasureUnit.forIdentifier(testCase.unitIdentifier);
72037199
LocalizedNumberFormatter formatter = NumberFormatter.withLocale(ULocale.forLanguageTag(testCase.locale))
72047200
.unit(unit)

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,6 @@ public void TestTimeZoneRoundTrip() {
144144

145145
// Run the roundtrip test
146146
for (int locidx = 0; locidx < LOCALES.length; locidx++) {
147-
if (logKnownIssue("CLDR-18924", "Timezone round trip issues in ku, shn, sv for various zones") &&
148-
(
149-
LOCALES[locidx].getBaseName().equals("ku") ||
150-
LOCALES[locidx].getBaseName().startsWith("ku_") ||
151-
LOCALES[locidx].getBaseName().startsWith("shn") ||
152-
LOCALES[locidx].getBaseName().equals("sv") ||
153-
LOCALES[locidx].getBaseName().startsWith("sv_")
154-
)) {
155-
continue;
156-
}
157147
logln("Locale: " + LOCALES[locidx].toString());
158148

159149
for (int patidx = 0; patidx < PATTERNS.length; patidx++) {
@@ -410,14 +400,6 @@ public void TestTimeRoundTrip() {
410400
}
411401

412402
for (String id : ids) {
413-
if (logKnownIssue("CLDR-18924", "Time round trip issues for Pacific/Apia in various locales and Pacific/Honolulu in Swedish") &&
414-
(
415-
id.equals("Pacific/Apia") ||
416-
(id.equals("Pacific/Honolulu") && LOCALES[locidx].getLanguage().equals("sv"))
417-
)) {
418-
continue;
419-
}
420-
421403
if (PATTERNS[patidx].equals("V")) {
422404
// Some zones do not have short ID assigned, such as Asia/Riyadh87.
423405
// The time roundtrip will fail for such zones with pattern "V" (short zone ID).
@@ -435,12 +417,6 @@ public void TestTimeRoundTrip() {
435417
}
436418
}
437419

438-
if ((id.equals("Pacific/Apia") || id.equals("Pacific/Midway") || id.equals("Pacific/Pago_Pago"))
439-
&& PATTERNS[patidx].equals("vvvv")
440-
&& logKnownIssue("11052", "Ambiguous zone name - Samoa Time")) {
441-
continue;
442-
}
443-
444420
BasicTimeZone btz = (BasicTimeZone)TimeZone.getTimeZone(id, TimeZone.TIMEZONE_ICU);
445421
TimeZone tz = TimeZone.getTimeZone(id);
446422
sdf.setTimeZone(tz);

‎icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2581,10 +2581,6 @@ public void testTicket20710_IntervalIdentity() {
25812581

25822582
for (int i = 0; i < locales.length; i++) {
25832583
ULocale locale = locales[i];
2584-
if (locale.getBaseName().startsWith("scn")) {
2585-
logKnownIssue("CLDR-18923", "Quoting in scn atTime/relative dateTimeFormats causes format/parse issues");
2586-
continue;
2587-
}
25882584
DateTimePatternGenerator gen = DateTimePatternGenerator.getInstance(locale);
25892585
Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone(timeZone));
25902586
calendar.setTimeInMillis(1563235200000l);

‎icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/IntlTestDateFormat.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,6 @@ public void TestRoundtrip() {
268268
long count = locales.length;
269269
if (locales != null && count != 0) {
270270
for (int i=0; i<count; ++i) {
271-
if (locales[i].getBaseName().startsWith("scn")) {
272-
logKnownIssue("CLDR-18923", "Quoting in scn atTime/relative dateTimeFormats causes format/parse issues");
273-
continue;
274-
}
275271
String name = locales[i].getDisplayName();
276272
logln("Testing " + name + "...");
277273
try {

0 commit comments

Comments
 (0)