Changeset 19056 in josm for trunk/test/functional

Timestamp:

2024-04-24T20:02:57+02:00 (5 months ago)

Author:

taylor.smock

Message:

Fix last failing test in Java 21

• Generate Java 21 image files (probably from r19043: Drop COMPAT locale provider).
• Replace most deprecated function calls and classes in tests with non-deprecated functions.

File:

• trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java (modified) (2 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java

@@ -41 +41 @@
 import org.openstreetmap.josm.testutils.annotations.Projection;
 import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -354 +355 @@
             // Sometimes Java changes how things are rendered. When that happens, use separate reference files. It is
             // usually "reference" + javaSuffix + ".png".
+            final File customReferenceFile = new File(getTestDirectory() + "/reference-java" + Utils.getJavaVersion() + ".png");
+            if (customReferenceFile.isFile()) {
+                return customReferenceFile;
+            }
             return new File(getTestDirectory() + "/reference.png");
         }