Changeset 19209 in josm for trunk

Timestamp:

2024-09-05T18:38:11+02:00 (4 months ago)

Author:

taylor.smock

Message:

Add @Plugins annotation to clean up after plugins have been loaded in tests

This should help reduce the issues related to plugins not being unloaded after
PluginHandlerTestIT when tests are run locally with a UI -- the primary cause
of problems is the SDS plugin though.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/MainApplicationTest.java (modified) (2 diffs)
• plugins/PluginHandlerTestIT.java (modified) (2 diffs)
• testutils/annotations/Plugins.java (added)

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

@@ -58 +58 @@
 import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.annotations.OsmApi;
+import org.openstreetmap.josm.testutils.annotations.Plugins;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 import org.openstreetmap.josm.tools.Logging;
@@ -171 +172 @@
      * @throws PluginListParseException if an error occurs
      */
+    @Plugins
     @Test
     void testUpdateAndLoadPlugins() throws PluginListParseException {

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

@@ -43 +43 @@
 import org.openstreetmap.josm.testutils.annotations.HTTPS;
 import org.openstreetmap.josm.testutils.annotations.Main;
+import org.openstreetmap.josm.testutils.annotations.Plugins;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 import org.openstreetmap.josm.testutils.annotations.Territories;
+import org.openstreetmap.josm.testutils.annotations.ThreadSync;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.Logging;
@@ -58 +60 @@
 @Territories
 @Timeout(value = 10, unit = TimeUnit.MINUTES)
+@ThreadSync
+@Plugins
 public class PluginHandlerTestIT {