Changeset 18602 in josm

Timestamp:

2022-11-22T14:01:54+01:00 (2 years ago)

Author:

taylor.smock

Message:

See r18598, fix tests under Java 18/19

This was caused by a race condition where the bug report thread finished prior
to the not null check in Java 8, but almost always does not under Java 18/19.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/MainApplicationTest.java

@@ -36 +36 @@
 import mockit.Mock;
 import mockit.MockUp;
+import org.awaitility.Awaitility;
+import org.awaitility.Durations;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -222 +224 @@
             assertDoesNotThrow(MainApplication::setupUIManager);
 
+            /* We cannot sync on the worker or EDT threads since the bug report handler makes a new thread */
+            Awaitility.await().atMost(Durations.ONE_HUNDRED_MILLISECONDS)
+                    .pollDelay(Durations.ONE_MILLISECOND)
+                    .until(() -> !BugReportQueue.getInstance().exceptionHandlingInProgress());
             assertNotNull(exceptionAtomicReference.get());
             assertTrue(exceptionAtomicReference.get() instanceof UnsupportedOperationException);