Changeset 19221 in josm for trunk/test/unit

Timestamp:

2024-09-12T12:37:19+02:00 (8 months ago)

Author:

taylor.smock

Message:

Fix failing build due to putting unit test for renderer in unit instead of functional

This was done by fixing a TODO comment ("move to separate class ImageTestUtils")
in the MapCSSRendererTest.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledTiledMapRendererTest.java (modified) (4 diffs)
• testutils/ImageTestUtils.java (added)
• testutils/annotations/Plugins.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/paint/StyledTiledMapRendererTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm.visitor.paint;
 
-import static org.openstreetmap.josm.gui.mappaint.MapCSSRendererTest.assertImageEquals;
+import static org.openstreetmap.josm.testutils.ImageTestUtils.assertImageEquals;
+import static org.openstreetmap.josm.testutils.ImageTestUtils.writeDebugImages;
 
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -20 +17 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-
-import javax.imageio.ImageIO;
 
 import org.apache.commons.jcs3.access.CacheAccess;
@@ -73 +68 @@
     }
 
-    @ParameterizedTest(name = "{0} - {2}")
+    @ParameterizedTest(name = "{2} - {0}")
     @MethodSource
     void testRender(String testIdentifier, final Supplier<DataSet> dataSetSupplier, final TileZXY tile)
@@ -118 +113 @@
         }).collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().image()));
         try {
-            assertImageEquals(testIdentifier, oldRenderStyle, newRenderStyle, 0, 0, diff -> {
-                try {
-                    if (!Files.isDirectory(Paths.get(TestUtils.getTestDataRoot(), "output"))) {
-                        Files.createDirectories(Paths.get(TestUtils.getTestDataRoot(), "output"));
-                    }
-                    final String basename = TestUtils.getTestDataRoot() + "output/" +
-                            testIdentifier + ' ' + tile.zoom() + '-' + tile.x() + '-' + tile.y();
-                    ImageIO.write(diff, "png", new File(basename + "-diff.png"));
-                    ImageIO.write(newRenderStyle, "png", new File(basename + "-new.png"));
-                    ImageIO.write(oldRenderStyle, "png", new File(basename + "-old.png"));
-                } catch (IOException e) {
-                    throw new UncheckedIOException(e);
-                }
-            });
+            assertImageEquals(testIdentifier, oldRenderStyle, newRenderStyle, 0, 0, diff ->
+                writeDebugImages(Paths.get(TestUtils.getTestDataRoot(), "output"),
+                        testIdentifier + ' ' + tile.zoom() + '-' + tile.x() + '-' + tile.y(), diff, oldRenderStyle, newRenderStyle)
+            );
         } finally {
             cache.clear();

trunk/test/unit/org/openstreetmap/josm/testutils/annotations/Plugins.java

@@ -34 +34 @@
     class PluginExtension implements AfterEachCallback {
 
+        @SuppressWarnings("unchecked")
         @Override
         public void afterEach(ExtensionContext context) throws Exception {