Ticket #23257: 23257.patch

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

@@ -10 +10 @@
 
 import org.awaitility.Awaitility;
 import org.awaitility.Durations;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -25 +24 @@
  * Test class for {@link MVTTile}
  */
 class MVTTileTest {
-    private MapboxVectorTileSource tileSource;
-    private MapboxVectorCachedTileLoader loader;
-    @BeforeEach
-    void setup() {
-        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));
-    }
+    private MapboxVectorCachedTileLoader loader = new MapboxVectorCachedTileLoader(
+            null, JCSCacheManager.getCache("testMapillaryCache"), new TileJobOptions(1, 1, Collections.emptyMap(), 3600));
+    private MapboxVectorTileSource tileSource = new MapboxVectorTileSource(
+            new ImageryInfo("Test Mapillary", "file:/" + TestUtils.getTestDataRoot() + "pbf/mapillary/{z}/{x}/{y}.mvt"));
 
     /**
      * Provide arguments for {@link #testMVTTile(BufferedImage, Boolean)}
@@ -57 +50 @@
         assertEquals(image, tile.getImage());
 
         TileJob job = loader.createTileLoaderJob(tile);
-        job.submit();
+        // we can't use the cache, because we request the same tile many times over
+        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());
             // Ensure that we have the clear image set, such that the tile doesn't add to the dataset again