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

Timestamp:

2020-06-16T18:58:48+02:00 (4 years ago)

Author:

simon04

Message:

see #16567 - JUnit 5: call JOSMTestRules.after (patch by taylor.smock)

File:

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

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

@@ -104 +104 @@
     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;
 
     /**
@@ -438 +444 @@
     @Override
     public void beforeEach(ExtensionContext context) throws Exception {
+        this.junit5 = true;
         Statement temporaryStatement = new Statement() {
             @Override
@@ -455 +462 @@
     @Override
     public void afterEach(ExtensionContext context) throws Exception {
-        // do nothing for now
+        after();
     }
 
@@ -690 +697 @@
                 base.evaluate();
             } finally {
-                after();
+                if (!junit5) {
+                    after();
+                }
             }
         }