Changeset 19082 in josm for trunk

Timestamp:

2024-05-14T23:54:51+02:00 (6 months ago)

Author:

taylor.smock

Message:

Fix intermittent test failures

This fixes at least one cause of the intermittent test failures.
The root cause is a thread creating an ImageViewerDialog instance after the
teardown method was called.

File:

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

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java

@@ -12 +12 @@
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.testutils.annotations.Main;
+import org.openstreetmap.josm.testutils.annotations.ThreadSync;
 
 /**
@@ -22 +23 @@
     @AfterEach
     void tearDown() {
+        // We need to ensure that all threads are "done" before continuing.
+        // Otherwise, other tests may have an ImageViewerDialog that causes issues...
+        // Note: we cannot (currently) use the ThreadSync annotation since it runs
+        // *after* local AfterEach and AfterAll methods.
+        new ThreadSync.ThreadSyncExtension().threadSync();
         if (ImageViewerDialog.hasInstance()) {
             ImageViewerDialog.getInstance().destroy();