Changeset 19109 in josm for trunk/test

Timestamp:

2024-06-17T21:36:37+02:00 (5 months ago)

Author:

taylor.smock

Message:

See #17858: Remove old workarounds for javabugs and update Utils#getLatestVersion

• JDK-8180379: Fixed in Java 9+
• JDK-8251377: Fixed in Java 11.0.14 (2021-09-02)
• JDK-8262085: Fixed in Java 11.0.17 (2022-07-19)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (1 diff)
• plugins/PluginHandlerTestIT.java (modified) (1 diff)
• testutils/JOSMTestRules.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -496 +496 @@
         // See https://github.com/raphw/byte-buddy/blob/master/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
         // for currently supported Java versions.
-        if (Utils.getJavaVersion() >= 19) {
+        if (Utils.getJavaVersion() >= 22) {
             // Byte Buddy often supports new class file versions for current EA releases if its experimental flag is set to true
             System.setProperty("net.bytebuddy.experimental", "true");

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java

@@ -247 +247 @@
         }
 
-        // On Java < 11 and headless mode, filter plugins requiring JavaFX as Monocle is not available
-        int javaVersion = Utils.getJavaVersion();
-        if (GraphicsEnvironment.isHeadless() && javaVersion < 11) {
-            for (Iterator<PluginInformation> it = plugins.iterator(); it.hasNext();) {
-                PluginInformation pi = it.next();
-                if (pi.getRequiredPlugins().contains("javafx")) {
-                    System.out.println("Ignoring " + pi.name + " (requiring JavaFX and we're using Java < 11 in headless mode)");
-                    it.remove();
-                }
-            }
-        }
-
         // Skip unofficial plugins in headless mode, too much work for us for little added-value
         if (GraphicsEnvironment.isHeadless()) {

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -3 +3 @@
 
 import java.awt.Color;
-import java.awt.GraphicsEnvironment;
-import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.WindowEvent;
@@ -17 +15 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
@@ -26 +23 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Handler;
-import java.util.logging.Level;
 
 import org.awaitility.Awaitility;
@@ -78 +74 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManagerTest;
-import org.openstreetmap.josm.tools.PlatformManager;
-import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.bugreport.ReportedException;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -646 +640 @@
                 }
 
-                workaroundJdkBug8159956();
                 new MainApplication();
                 JOSMFixture.initContentPane();
@@ -653 +646 @@
                 JOSMFixture.initMainMenu();
             }
-        }
-    }
-
-    private void workaroundJdkBug8159956() {
-        // Note: This has been backported to Java 8u381 (2023-07-18)
-        try {
-            if (PlatformManager.isPlatformWindows() && Utils.getJavaVersion() == 8 && GraphicsEnvironment.isHeadless()) {
-                // https://bugs.openjdk.java.net/browse/JDK-8159956
-                Method initIDs = Toolkit.class.getDeclaredMethod("initIDs");
-                initIDs.setAccessible(true);
-                initIDs.invoke(Toolkit.getDefaultToolkit());
-            }
-        } catch (Exception e) {
-            Logging.log(Level.WARNING, "Failed to Toolkit.initIDs", e);
         }
     }