Changeset 14207 in josm for trunk/test/unit/org

Timestamp:

2018-08-31T03:00:20+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16700 - JOSMTestRules: give JOSMTestRules a mechanism to allow per-method overrides of rule options (patch by ris)

The caveats here are that it will only ever be possible to "add" additional options to the rule in the same way options can be appended to a call chain already (because they're processed using the same mechanism). Annotations can also only ever take primitive types as arguments (so no specifying new .fakeImagery(TileSourceRule ...) arguments)

File:

• trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (7 diffs)

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

@@ -8 +8 @@
 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;
@@ -148 +153 @@
 
     /**
-     * Enable {@link Main#platform} global variable.
+     * Enable {@code Main#platform} global variable.
      * @return this instance, for easy chaining
      * @deprecated Not needed anymore
@@ -214 +219 @@
 
     /**
-     * Allow the execution of commands using {@link Main#undoRedo}
+     * Allow the execution of commands using {@code UndoRedoHandler}
      * @return this instance, for easy chaining
      */
@@ -325 +330 @@
 
     /**
-     * Use the {@link Main#main}, {@code Main.contentPanePrivate}, {@code Main.mainPanel},
+     * Use the {@code Main#main}, {@code Main.contentPanePrivate}, {@code Main.mainPanel},
      *         global variables in this test.
      * @return this instance, for easy chaining
@@ -338 +343 @@
 
     /**
-     * Use the {@link Main#main}, {@code Main.contentPanePrivate}, {@code Main.mainPanel},
+     * Use the {@code Main#main}, {@code Main.contentPanePrivate}, {@code Main.mainPanel},
      *         global variables in this test.
      * @param mapViewStateMockingRunnable Runnable to use for mocking out any required parts of
@@ -368 +373 @@
     @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
@@ -695 +710 @@
                 getInputArguments().toString().indexOf("-agentlib:jdwp") > 0;
     }
+
+    /**
+     * Override this test's assumed JOSM version (as reported by {@link Version}).
+     * @see JOSMTestRules#assumeRevision(String)
+     */
+    @Documented
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface OverrideAssumeRevision {
+        /**
+         * Returns overriden assumed JOSM version.
+         * @return overriden assumed JOSM version
+         */
+        String value();
+    }
+
+    /**
+     * Override this test's timeout.
+     * @see JOSMTestRules#timeout(int)
+     */
+    @Documented
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface OverrideTimeout {
+        /**
+         * Returns overriden timeout value.
+         * @return overriden timeout value
+         */
+        int value();
+    }
 }