Ticket #16700: v1-0001-JOSMTestRules-give-JOSMTestRules-a-mechanism-to-a.patch

test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -7 +7 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.text.MessageFormat;
@@ -367 +372 @@
 
     @Override
     public Statement apply(Statement base, Description description) {
+        // First process any Override* annotations for per-test overrides.
+        // The following only work because "option" methods modify JOSMTestRules in-place
+        final OverrideAssumeRevision overrideAssumeRevision = description.getAnnotation(OverrideAssumeRevision.class);
+        if (overrideAssumeRevision != null) {
+            this.assumeRevision(overrideAssumeRevision.value());
+        }
+        final OverrideTimeout overrideTimeout = description.getAnnotation(OverrideTimeout.class);
+        if (overrideTimeout != null) {
+            this.timeout(overrideTimeout.value());
+        }
+
         Statement statement = base;
         // counter-intuitively, Statements which need to have their setup routines performed *after* another one need to
         // be added into the chain *before* that one, so that it ends up on the "inside".
@@ -694 +710 @@
         return java.lang.management.ManagementFactory.getRuntimeMXBean().
                 getInputArguments().toString().indexOf("-agentlib:jdwp") > 0;
     }
+
+    @Documented
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface OverrideAssumeRevision {
+        String value();
+    }
+
+    @Documented
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface OverrideTimeout {
+        int value();
+    }
 }