Changeset 18267 in josm for trunk

Timestamp:

2021-10-10T15:21:30+02:00 (3 years ago)

Author:

Don-vip

Message:

PluginHandlerTestIT: Skip unofficial plugins in headless mode, too much work for us for little added-value

Location:

trunk

Files:

• src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -348 +348 @@
             sb.append(" <a href=\"").append(link).append("\">").append(tr("More info...")).append("</a>");
         }
-        if (downloadlink != null
-                && !downloadlink.startsWith("https://josm.openstreetmap.de/osmsvn/applications/editors/josm/dist/")
-                && !downloadlink.startsWith("https://github.com/JOSM/")) {
+        if (isExternal()) {
             sb.append("<p>&nbsp;</p><p>").append(tr("<b>Plugin provided by an external source:</b> {0}", downloadlink)).append("</p>");
         }
         sb.append("</body></html>");
         return sb.toString();
+    }
+
+    /**
+     * Determines if this plugin comes from an external, non-official source.
+     * @return {@code true} if this plugin comes from an external, non-official source.
+     * @since 18267
+     */
+    public boolean isExternal() {
+        return downloadlink != null
+                && !downloadlink.startsWith("https://josm.openstreetmap.de/osmsvn/applications/editors/josm/dist/")
+                && !downloadlink.startsWith("https://github.com/JOSM/");
     }
 

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

@@ -195 +195 @@
                 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()) {
+            for (Iterator<PluginInformation> it = plugins.iterator(); it.hasNext();) {
+                PluginInformation pi = it.next();
+                if (pi.isExternal()) {
+                    System.out.println("Ignoring " + pi.name + " (unofficial plugin in headless mode)");
                     it.remove();
                 }