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

Timestamp:

2021-03-16T21:56:57+01:00 (4 years ago)

Author:

simon04

Message:

fix #20563 - PluginListParser.parse amounts to 80% of allocations during startup

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/MainApplicationTest.java (modified) (2 diffs)
• plugins/PluginHandlerTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java

@@ -22 +22 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.jar.Attributes;
 
 import javax.swing.JComponent;
@@ -205 +206 @@
     private static PluginInformation newPluginInformation(String plugin) throws PluginListParseException {
         return PluginListParser.createInfo(plugin+".jar", "https://josm.openstreetmap.de/osmsvn/applications/editors/josm/dist/"+plugin+".jar",
-                "");
+                new Attributes());
     }
 

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

@@ -154 +154 @@
     void testPluginInformationAction() throws PluginException {
         TestUtils.assumeWorkingJMockit();
-        final String expectedText = "Ant-Version: Apache Ant 1.9.6\n" +
-            "Author: Don-vip\n" +
-            "Created-By: 1.7.0_91-b02 (Oracle Corporation)\n" +
-            "Manifest-Version: 1.0\n" +
-            "Plugin-Canloadatruntime: true\n" +
-            "Plugin-Class: org.openstreetmap.josm.plugins.fr.epci.EpciPlugin\n" +
-            "Plugin-Date: 2015-11-19T08:21:07.645033Z\n" +
-            "Plugin-Description: Handling of French EPCIs (boundary=local_authority)\n" +
-            "Plugin-Early: true\n" +
-            "Plugin-Link: http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/EPCI-fr\n" +
-            "Plugin-Mainversion: 7001\n" +
-            "Plugin-Version: 31772\n";
+        final String expectedText = "Manifest-Version: 1.0\n" +
+                "Ant-Version: Apache Ant 1.9.6\n" +
+                "Created-By: 1.7.0_91-b02 (Oracle Corporation)\n" +
+                "Plugin-Mainversion: 7001\n" +
+                "Plugin-Version: 31772\n" +
+                "Plugin-Class: org.openstreetmap.josm.plugins.fr.epci.EpciPlugin\n" +
+                "Plugin-Description: Handling of French EPCIs (boundary=local_authority)\n" +
+                "Plugin-Date: 2015-11-19T08:21:07.645033Z\n" +
+                "Author: Don-vip\n" +
+                "Plugin-Link: http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/EPCI-fr\n" +
+                "Plugin-Early: true\n" +
+                "Plugin-Canloadatruntime: true\n";
         final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker() {
             @Override