Changeset 14778 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2019-02-10T15:35:17+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16912 - filter plugins requiring JavaFX on Java < 11 and headless mode

File:

• trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java (modified) (3 diffs)

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

@@ -7 +7 @@
 
 import java.awt.GraphicsEnvironment;
-import java.awt.HeadlessException;
 import java.util.Arrays;
 import java.util.Collection;
@@ -116 +115 @@
         }
 
-        // On Java 9/10 and headless mode, filter plugins requiring JavaFX as Monocle is not available
+        // On Java < 11 and headless mode, filter plugins requiring JavaFX as Monocle is not available
         int javaVersion = Utils.getJavaVersion();
-        if (GraphicsEnvironment.isHeadless() && javaVersion >= 9 && javaVersion <= 10) {
+        if (GraphicsEnvironment.isHeadless() && javaVersion < 11) {
             for (Iterator<PluginInformation> it = plugins.iterator(); it.hasNext();) {
                 PluginInformation pi = it.next();
                 if (pi.getRequiredPlugins().contains("openjfx")) {
-                    System.out.println("Ignoring " + pi.name + " (requiring JavaFX and we're using Java 9/10 in headless mode)");
+                    System.out.println("Ignoring " + pi.name + " (requiring JavaFX and we're using Java < 11 in headless mode)");
                     it.remove();
                 }
@@ -147 +146 @@
             Throwable root = ExceptionUtils.getRootCause(t);
             root.printStackTrace();
-            // Ignore HeadlessException with JavaFX components. Issue hard to solve and we're not interested by that
-            if (!(root instanceof HeadlessException)) {
-                layerExceptions.put(findFaultyPlugin(loadedPlugins, root), root);
-            }
+            layerExceptions.put(findFaultyPlugin(loadedPlugins, root), root);
         }
     }