Changeset 17360 in josm for trunk

Timestamp:

2020-11-25T13:40:57+01:00 (4 years ago)

Author:

Don-vip

Message:

see #16567 - print parameterized tests display name in failure messages

• https://josm.openstreetmap.de/ticket/16567#comment:53
• ​https://bz.apache.org/bugzilla/show_bug.cgi?id=64564
• ​https://github.com/apache/ant/pull/121

Location:

trunk/test/unit/org/openstreetmap/josm/gui/preferences

Files:

• imagery/ImageryPreferenceTestIT.java (modified) (2 diffs)
• map/MapPaintPreferenceTestIT.java (modified) (1 diff)
• map/TaggingPresetPreferenceTestIT.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -384 +384 @@
     }
 
-    private static String format(Map<String, Map<ImageryInfo, List<String>>> map) {
-        return map.toString().replaceAll("\\}, ", "\n\\}, ").replaceAll(", ImageryInfo\\{", "\n      ,ImageryInfo\\{");
+    private static String format(String id, Map<String, Map<ImageryInfo, List<String>>> map) {
+        // #16567 - Shouldn't be necessary to print id if Ant worked properly
+        // See https://josm.openstreetmap.de/ticket/16567#comment:53
+        // See https://bz.apache.org/bugzilla/show_bug.cgi?id=64564
+        // See https://github.com/apache/ant/pull/121
+        return id + " => " + map.toString().replaceAll("\\}, ", "\n\\}, ").replaceAll(", ImageryInfo\\{", "\n      ,ImageryInfo\\{");
     }
 
@@ -398 +402 @@
     void testImageryEntryValidity(String id, ImageryInfo info) {
         checkEntry(info);
-        assertTrue(errors.isEmpty(), format(errors));
+        assertTrue(errors.isEmpty(), format(id, errors));
         assertFalse(workingURLs.isEmpty());
-        assumeTrue(ignoredErrors.isEmpty(), format(ignoredErrors));
+        assumeTrue(ignoredErrors.isEmpty(), format(id, ignoredErrors));
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java

@@ -99 +99 @@
         warnings.removeAll(ignoredErrors);
 
-        assertTrue(errors.isEmpty() && warnings.isEmpty(), errors.toString() + '\n' + warnings.toString());
+        // #16567 - Shouldn't be necessary to print displayName if Ant worked properly
+        // See https://josm.openstreetmap.de/ticket/16567#comment:53
+        // See https://bz.apache.org/bugzilla/show_bug.cgi?id=64564
+        // See https://github.com/apache/ant/pull/121
+        assertTrue(errors.isEmpty() && warnings.isEmpty(), displayName + " => " + errors + '\n' + warnings);
         assumeTrue(ignoredErrors.toString(), ignoredErrors.isEmpty());
     }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

@@ -98 +98 @@
             handleException(source, e, errors, ignoredErrors);
         }
-        assertTrue(errors.isEmpty(), errors::toString);
+        // #16567 - Shouldn't be necessary to print displayName if Ant worked properly
+        // See https://josm.openstreetmap.de/ticket/16567#comment:53
+        // See https://bz.apache.org/bugzilla/show_bug.cgi?id=64564
+        // See https://github.com/apache/ant/pull/121
+        assertTrue(errors.isEmpty(), displayName + " => " + errors);
         assumeTrue(ignoredErrors.toString(), ignoredErrors.isEmpty());
     }