Changeset 19055 in josm for trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java

Timestamp:

2024-04-23T18:41:05+02:00 (6 weeks ago)

Author:

taylor.smock

Message:

Fix tests in Java 21

• Regenerate Java 21 image files (probably from r19043: Drop COMPAT locale provider).
• Remove Java 8 image files, since we no longer support Java 8.
• Fix an issue where Java 21 uses a non-breaking space between time and AM/PM.

File:

• trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java (modified) (1 diff)

trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java

@@ -189 +189 @@
 
     private static File getReferenceFile(String reference) {
-        // Java 8 and Java 21 render SVG images differently, thus, use separate reference files
-        final String javaSuffix;
-        switch (Utils.getJavaVersion()) {
-            case 8: javaSuffix = "-java8";
-            break;
-            case 21: javaSuffix = "-java21";
-            break;
-            default: javaSuffix = "";
-        }
+        // Java 11-17 and Java 21 render SVG images differently, thus, use separate reference files
+        final String javaSuffix = Utils.getJavaVersion() == 21 ? "-java21" : "";
         return new File(TestUtils.getTestDataRoot() + "/" + ImageProviderTest.class.getSimpleName() + javaSuffix + "/" + reference + ".png");
     }