Changeset 18892 in josm

Timestamp:

2023-10-31T21:27:34+01:00 (8 months ago)

Author:

taylor.smock

Message:

Fix #23257: MVTTileTest has an infrequently hit race condition (patch by marcello, modified)

The race condition is dependent upon calculation speed; if the layers get loaded
prior to the image loading, it is possible for us to get to the point where
we expect the image to be loaded, but it isn't yet.

Modifications are as follows:

• Reinitialize tileSource and loader before each test, but initialize the cache once and clear that between tests.

File:

• trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MVTTileTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MVTTileTest.java

@@ -9 +9 @@
 import java.util.stream.Stream;
 
+import org.apache.commons.jcs3.access.behavior.ICacheAccess;
 import org.awaitility.Awaitility;
 import org.awaitility.Durations;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -18 +21 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.cache.JCSCacheManager;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -26 +30 @@
  */
 class MVTTileTest {
+    private static ICacheAccess<String, BufferedImageCacheEntry> cache;
     private MapboxVectorTileSource tileSource;
     private MapboxVectorCachedTileLoader loader;
+
+    @BeforeAll
+    static void classSetup() {
+        cache = JCSCacheManager.getCache("testMapillaryCache");
+    }
+
+    @AfterAll
+    static void classTearDown() {
+        cache.clear();
+        cache = null;
+    }
+
     @BeforeEach
     void setup() {
+        cache.clear();
         tileSource = new MapboxVectorTileSource(new ImageryInfo("Test Mapillary", "file:/" + TestUtils.getTestDataRoot()
           + "pbf/mapillary/{z}/{x}/{y}.mvt"));
-        loader = new MapboxVectorCachedTileLoader(null,
-          JCSCacheManager.getCache("testMapillaryCache"), new TileJobOptions(1, 1, Collections
-          .emptyMap(), 3600));
+        final TileJobOptions options = new TileJobOptions(1, 1, Collections.emptyMap(), 3600);
+        loader = new MapboxVectorCachedTileLoader(null, cache, options);
     }
 
@@ -58 +75 @@
 
         TileJob job = loader.createTileLoaderJob(tile);
-        job.submit();
+        // Ensure that we are not getting a cached tile
+        job.submit(true);
         Awaitility.await().atMost(Durations.ONE_SECOND).until(tile::isLoaded);
         if (isLoaded) {
-            Awaitility.await().atMost(Durations.ONE_SECOND).until(() -> tile.getLayers() != null && tile.getLayers().size() > 1);
+            Awaitility.await().atMost(Durations.ONE_SECOND).until(() -> tile.getImage() == MVTTile.CLEAR_LOADED);
             assertEquals(2, tile.getLayers().size());
             assertEquals(4096, tile.getExtent());