Changeset 18668 in josm for trunk

Timestamp:

2023-02-20T14:38:35+01:00 (14 months ago)

Author:

taylor.smock

Message:

See #22753: Fix GitHub Actions

This *should* fix the failing Java 8 and Java 17 tests on Windows by forcing
the worker thread to finish instead of sending an empty call to the method,
under the assumption that the thread will sync (this works for only some test
threads).

File:

• trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/bugreport/BugReportTest.java

@@ -13 +13 @@
 import java.io.StringWriter;
 import java.lang.reflect.Field;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.logging.Handler;
@@ -136 +137 @@
                         })),
                 Arguments.of("GuiHelper::runInEDTAndWait", (Consumer<Runnable>) GuiHelper::runInEDTAndWait),
-                Arguments.of("MainApplication.worker", (Consumer<Runnable>) MainApplication.worker::execute)
+                Arguments.of("MainApplication.worker", (Consumer<Runnable>) runnable ->
+                        assertDoesNotThrow(() -> MainApplication.worker.submit(runnable).get(1, TimeUnit.SECONDS)))
         );
     }