Changeset 18551 in josm for trunk/test

Timestamp:

2022-09-08T01:44:00+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix test failures due to StackOverflowError

This occurs due to JMockit not cleaning up mocks in JUnit4 vintage.
This means that EDTAssertionMocker, WindowlessMapViewStateMocker, and
WindowlessNavigatableComponentMocker are all present after a JUnit4
test is run.

File:

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

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

@@ -27 +27 @@
 import java.util.logging.Level;
 
+import mockit.internal.state.SavePoint;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.extension.AfterAllCallback;
@@ -729 +730 @@
         @Override
         public void evaluate() throws Throwable {
+            // Needed since JMockit doesn't clean up JUnit4 vintage tests. We really shouldn't have to touch JMockit internal classes. :(
+            SavePoint savePoint = new SavePoint();
             before();
             try {
@@ -735 +738 @@
                 if (!junit5) {
                     after();
+                    savePoint.rollback();
                 }
             }