Ticket #16567: 16567.fixup1.1.patch

build.xml

@@ -462 +462 @@
                             <jvmarg value="${jacocoagent@{testfamily}@{testITsuffix}}" if:set="jacocoagent@{testfamily}@{testITsuffix}" />
                             <jvmarg value="-Dfile.encoding=UTF-8"/>
                             <jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>
+                        <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>
                             <jvmarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
                             <jvmarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
                             <jvmarg value="--add-exports" if:set="isJava9" unless:set="noJavaFX" />

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

@@ -103 +103 @@
     private boolean territories;
     private boolean metric;
     private boolean main;
+    /**
+     * This boolean is only used to indicate if JUnit5 is used in a test. If it is,
+     * we must not call after in {@link JOSMTestRules.CreateJosmEnvironment#evaluate}.
+     * TODO: Remove JUnit4 as a whole sometime after 2021-01-01 (~6 month lead time for plugins)
+     */
+    private boolean junit5;
 
     /**
      * Disable the default timeout for this test. Use with care.
@@ -437 +443 @@
 
     @Override
     public void beforeEach(ExtensionContext context) throws Exception {
+        this.junit5 = true;
         Statement temporaryStatement = new Statement() {
             @Override
             public void evaluate() throws Throwable {
@@ -454 +461 @@
 
     @Override
     public void afterEach(ExtensionContext context) throws Exception {
-        // do nothing for now
+        after();
     }
 
     /**
@@ -689 +696 @@
             try {
                 base.evaluate();
             } finally {
-                after();
+                if (!junit5) {
+                    after();
+                }
             }
         }
     }