Changeset 18669 in josm for trunk

Timestamp:

2023-02-20T14:42:48+01:00 (14 months ago)

Author:

taylor.smock

Message:

See #22753: Fix GitHub Actions

This drops the sync call in the test itself and makes it part of the worker
thread call.

File:

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

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

@@ -137 +137 @@
                         })),
                 Arguments.of("GuiHelper::runInEDTAndWait", (Consumer<Runnable>) GuiHelper::runInEDTAndWait),
-                Arguments.of("MainApplication.worker", (Consumer<Runnable>) runnable ->
-                        assertDoesNotThrow(() -> MainApplication.worker.submit(runnable).get(1, TimeUnit.SECONDS)))
+                Arguments.of("MainApplication.worker", (Consumer<Runnable>) runnable -> {
+                    MainApplication.worker.execute(runnable);
+                    assertDoesNotThrow(() -> MainApplication.worker.submit(() -> { /* Sync thread */}).get(1, TimeUnit.SECONDS));
+                })
         );
     }
@@ -154 +156 @@
             Logging.trace(e);
         }
-        // Ensure that the threads are synced
-        assertDoesNotThrow(() -> worker.accept(() -> { /* sync */ }));
         // Now throw an exception
         BugReport bugReport = new BugReport(BugReport.intercept(new IOException("testSuppressedExceptions")));