Ticket #15630: v1-0001-Debugging-test-commit.patch

test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java

@@ -413 +413 @@
      */
     @Test
     public void testShowDownloadedArea() throws Exception {
-        Main.pref.put("slippy_map_chooser.mapstyle", "Green Tiles");
+        Main.pref.put("slippy_map_chooser.mapstyle", "Green/white Stripes");
         Main.pref.putBoolean("slippy_map_chooser.show_downloaded_area", false);
 
         DataSet dataSet = new DataSet();
@@ -459 +459 @@
             .build();
 
         // assert downloaded areas are not drawn
-        ImagePatternMatching.rowMatch(
-            paintedSlippyMap,
-            paintedSlippyMap.getHeight()/2,
-            paletteMap,
-            "^g+bv+bg+$",
-            true
-        );
-        ImagePatternMatching.columnMatch(
-            paintedSlippyMap,
-            paintedSlippyMap.getWidth()/2,
-            paletteMap,
-            "^g+bv+bg+$",
-            true
-        );
+//         ImagePatternMatching.rowMatch(
+//             paintedSlippyMap,
+//             paintedSlippyMap.getHeight()/2,
+//             paletteMap,
+//             "^g+bv+bg+$",
+//             true
+//         );
+//         ImagePatternMatching.columnMatch(
+//             paintedSlippyMap,
+//             paintedSlippyMap.getWidth()/2,
+//             paletteMap,
+//             "^g+bv+bg+$",
+//             true
+//         );
 
         // enable "show downloaded areas"
         GuiHelper.runInEDTAndWaitWithException(() -> this.getShowDownloadedAreaMenuItem().doClick());

test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -272 +272 @@
                 new TileSourceRule.ColorSource(Color.WHITE, "White Tiles", 256),
                 new TileSourceRule.ColorSource(Color.BLACK, "Black Tiles", 256),
                 new TileSourceRule.ColorSource(Color.MAGENTA, "Magenta Tiles", 256),
-                new TileSourceRule.ColorSource(Color.GREEN, "Green Tiles", 256)
+                new TileSourceRule.ColorSource(Color.GREEN, "Green Tiles", 256),
+                new TileSourceRule.VStripeSource(Color.GREEN, Color.WHITE, "Green/white Stripes", 256)
             )
         );
     }

test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java

@@ -161 +161 @@
         }
     }
 
+    /**
+     * A vertically striped tile source
+     */
+    public static class VStripeSource extends ColorSource {
+        protected final Color rightColor
+;
+        public VStripeSource(Color leftColor, Color rightColor, String label, int tileSize) {
+            super(leftColor, label, tileSize);
+            this.rightColor = rightColor;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(this.color, this.rightColor, this.label, this.tileSize, this.getClass());
+        }
+
+        @Override
+        public byte[] generatePayloadBytes() {
+            final BufferedImage image = new BufferedImage(this.tileSize, this.tileSize, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g = image.createGraphics();
+            g.setBackground(this.color);
+            g.clearRect(0, 0, image.getWidth(), image.getHeight());
+            g.setColor(this.rightColor);
+            g.fillRect(0, 0, image.getWidth()/2, image.getHeight());
+
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            try {
+                ImageIO.write(image, "png", outputStream);
+            } catch (IOException e) {
+                Logging.trace(e);
+            }
+            return outputStream.toByteArray();
+        }
+    }
+
     protected final List<ConstSource> sourcesList;
     protected final boolean clearLayerList;
     protected final boolean clearSlippyMapSources;