Changeset 18799 in josm for trunk/test/unit/org/openstreetmap/josm/plugins

Timestamp:

2023-08-08T21:24:36+02:00 (2 years ago)

Author:

taylor.smock

Message:

See r18798: Actually use the @Territories annotation

This also fixes some tests that fail with specific options, but were passing due
to run order.

File:

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

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

@@ -20 +20 @@
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.logging.Handler;
@@ -27 +28 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -40 +42 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.Main;
+import org.openstreetmap.josm.testutils.annotations.Projection;
+import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.Logging;
@@ -49 +55 @@
  * Integration tests of {@link PluginHandler} class.
  */
+@BasicPreferences
+@Main
+@Projection
+@Territories
+@Timeout(value = 10, unit = TimeUnit.MINUTES)
 public class PluginHandlerTestIT {
 
@@ -57 +68 @@
     @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public static JOSMTestRules test = new JOSMTestRules().main().projection().preferences().https()
-            .territories().timeout(10 * 60 * 1000);
+    public static JOSMTestRules test = new JOSMTestRules().https();
 
     /**