Changeset 19351 in josm for trunk/test

Timestamp:

2025-03-21T17:29:04+01:00 (4 days ago)

Author:

stoecker

Message:

readd the country code TLDs in the correct section

File:

• trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java

@@ -110 +110 @@
             Map<String, String> missingTLD = new TreeMap<>(); // stores entry and comments as String[]
             Map<String, String> missingCC = new TreeMap<>();
+            Map<String, String> allTLD = new TreeMap<>(); // stores entry and comments as String[]
+            Map<String, String> allCC = new TreeMap<>(); // stores entry and comments as String[]
             while ((line = br.readLine()) != null) {
                 if (!line.startsWith("#")) {
@@ -121 +123 @@
                     if (!dv.isValidTld(asciiTld)) {
                         String[] info = htmlInfo.get(asciiTld);
+                        String type = info[0];
+                        String comment = info[1];
+                        if ("country-code".equals(type)) { // Which list to use?
+                            allCC.put(asciiTld, unicodeTld + " " + comment);
+                            if (generateUnicodeTlds) {
+                                allCC.put(unicodeTld, asciiTld + " " + comment);
+                            }
+                        } else {
+                            allTLD.put(asciiTld, unicodeTld + " " + comment);
+                            if (generateUnicodeTlds) {
+                                allTLD.put(unicodeTld, asciiTld + " " + comment);
+                            }
+                        }
                         if (info != null) {
-                            String type = info[0];
-                            String comment = info[1];
                             if ("country-code".equals(type)) { // Which list to use?
                                 missingCC.put(asciiTld, unicodeTld + " " + comment);
@@ -158 +171 @@
                 }
             }
+            printMap(header, allTLD, "allTLD");
+            printMap(header, allCC, "allCC");
             if (!missingTLD.isEmpty()) {
                 printMap(header, missingTLD, "TLD");