Skip to content

Commit 3925cbe

Browse files
authored
CLDR-18490 v48 final round of known issue updates for Aug 2025 (#4929)
1 parent b6ab14d commit 3925cbe

File tree

3 files changed

+35
-24
lines changed

3 files changed

+35
-24
lines changed

tools/cldr-code/src/main/java/org/unicode/cldr/icu/dev/test/TestFmwk.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,15 @@ public void msg(String message, int level, boolean incCount, boolean newln) {
847847
* Log the known issue. This method returns true unless -prop:logKnownIssue=no is specified in
848848
* the argument list.
849849
*
850+
* <p>Note, the caller must check the return value from logKnownIssue(). If the return value is
851+
* true, the test may be skipped (or print a warning.). If the return value is false, the test
852+
* ought to run and should fail if there is an error.
853+
*
850854
* @param ticket A ticket number string. For an ICU ticket, use "ICU-10245". For a CLDR ticket,
851855
* use "CLDR-12345". For compatibility, "1234" -> ICU-1234 and "cldrbug:456" -> CLDR-456
852856
* @param comment Additional comment, or null
853-
* @return true unless -prop:logKnownIssue=no is specified in the test command line argument.
857+
* @return true (meaning to skip) unless -prop:logKnownIssue=no is specified in the test command
858+
* line argument. If false is returned. the test ought to fail.
854859
*/
855860
public boolean logKnownIssue(String ticket, String comment) {
856861
if (params.hasLogKnownIssue()) {

tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -320,28 +320,32 @@ private void checkEmpty(
320320
break;
321321
}
322322
if (!valueAttributes.isEmpty()) {
323+
boolean skip = false;
323324
switch (element.getName()) {
324325
case "ruleset":
325-
logKnownIssue(
326-
"CLDR-18865", "Need exception for DTD test for migration");
326+
skip =
327+
logKnownIssue(
328+
"CLDR-18865",
329+
"Need exception for DTD test for migration");
327330
break;
328331
case "key":
329332
case "territory":
330333
case "transform":
331-
logKnownIssue("cldrbug:9982", "Lower priority fixes to bad xml");
334+
skip = logKnownIssue("cldrbug:9982", "Lower priority fixes to bad xml");
332335
break;
333336
default:
334-
m.put(
335-
"error",
336-
"\t||"
337-
+ showPath(parents)
338-
+ "||DTD has both children AND value attributes: tr35.md#XML_Format"
339-
+ "||"
340-
+ valueAttributes
341-
+ "||"
342-
+ children
343-
+ "||");
344-
break;
337+
}
338+
if (!skip) {
339+
m.put(
340+
"error",
341+
"\t||"
342+
+ showPath(parents)
343+
+ "||DTD has both children AND value attributes: tr35.md#XML_Format"
344+
+ "||"
345+
+ valueAttributes
346+
+ "||"
347+
+ children
348+
+ "||");
345349
}
346350
}
347351
for (Element child : children) {

tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,17 +2080,19 @@ public VoterInfo getVoterInfo() {
20802080
// show all the skipped items, and logKnownIssue items
20812081

20822082
for (Entry<String, Collection<String>> entry : skipped.asMap().entrySet()) {
2083-
final String ticketComment = entry.getKey();
2083+
final String entryComment = entry.getKey();
20842084
final String paths = CR_TAB2_JOINER.join(entry.getValue());
2085-
if (ticketComment.equals(SKIP)) {
2086-
logln(ticketComment + ";\n\t\t" + paths);
2085+
if (entryComment.equals(SKIP)) {
2086+
logln(entryComment + ";\n\t\t" + paths);
20872087
} else {
2088-
int spacePos = ticketComment.indexOf(' ');
2089-
logKnownIssue(
2090-
ticketComment.substring(0, spacePos),
2091-
ticketComment.substring(spacePos + 1)
2092-
+ ")\n\t\t(For the following paths:\n\t\t"
2093-
+ paths);
2088+
int spacePos = entryComment.indexOf(' ');
2089+
String ticketId = entryComment.substring(0, spacePos);
2090+
String ticketMessage = entryComment.substring(spacePos + 1);
2091+
String message =
2092+
ticketMessage + ")\n\t\t(For the following paths:\n\t\t" + paths;
2093+
if (!logKnownIssue(ticketId, message)) {
2094+
errln(message + " (known issue " + ticketId + ")");
2095+
}
20942096
}
20952097
}
20962098

0 commit comments

Comments
 (0)