Changeset 13181 in josm

Timestamp:

2017-12-02T15:13:32+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15599 - Improvements for testing painting (last patches by ris)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/MapViewState.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java (modified) (9 diffs)
• test/unit/org/openstreetmap/josm/testutils/ImagePatternMatching.java (added)

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -3 +3 @@
 
 import java.awt.Container;
+import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.geom.AffineTransform;
@@ -145 +146 @@
 
     private static Point findTopLeftOnScreen(JComponent position) {
-        try {
-            return position.getLocationOnScreen();
-        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
-            throw BugReport.intercept(e).put("position", position).put("parent", position::getParent);
+        if (GraphicsEnvironment.isHeadless()) {
+            // in our imaginary universe the window is always (10, 10) from the top left of the screen
+            Point topLeftInWindow = findTopLeftInWindow(position);
+            return new Point(topLeftInWindow.x + 10, topLeftInWindow.y + 10);
+        } else {
+            try {
+                return position.getLocationOnScreen();
+            } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
+                throw BugReport.intercept(e).put("position", position).put("parent", position::getParent);
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -3 +3 @@
 
 import java.awt.Cursor;
+import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -320 +321 @@
 
     protected boolean isVisibleOnScreen() {
-        return SwingUtilities.getWindowAncestor(this) != null && isShowing();
+        return GraphicsEnvironment.isHeadless() || (
+            SwingUtilities.getWindowAncestor(this) != null && isShowing()
+        );
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs;
 
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -7 +8 @@
 import static org.junit.Assert.fail;
 
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics2D;
+import java.awt.event.ComponentEvent;
 import java.awt.image.BufferedImage;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.regex.Matcher;
 
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 
-import java.util.concurrent.Callable;
-
+import org.awaitility.Awaitility;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
 import org.openstreetmap.josm.gui.bbox.SourceButton;
+import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.testutils.ImagePatternMatching;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
+import com.google.common.collect.ImmutableMap;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-import org.awaitility.Awaitility;
 
 /**
@@ -55 +65 @@
     }
 
-    protected void assertSingleSelectedSourceLabel(String label) {
+    @FunctionalInterface
+    protected interface ThrowingRunnable {
+        void run() throws Throwable;
+    }
+
+    protected static Runnable uncheckExceptions(final ThrowingRunnable tr) {
+        return (() -> {
+            try {
+                tr.run();
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+    protected void assertSingleSelectedSourceLabel(final String label) {
         JPopupMenu menu = this.sourceButton.getPopupMenu();
         boolean found = false;
@@ -74 +99 @@
     }
 
-    protected JMenuItem getSourceMenuItemByLabel(String label) {
-        JPopupMenu menu = this.sourceButton.getPopupMenu();
-        for (Component c: menu.getComponents()) {
-            if (JPopupMenu.Separator.class.isInstance(c)) {
-                break;
-            } else if (((JMenuItem) c).getText() == label) {
-                return (JMenuItem) c;
-            }
-            // else continue...
+    protected void clickSourceMenuItemByLabel(final String label) {
+        try {
+            GuiHelper.runInEDTAndWaitWithException(() -> {
+                JPopupMenu menu = this.sourceButton.getPopupMenu();
+                for (Component c: menu.getComponents()) {
+                    if (JPopupMenu.Separator.class.isInstance(c)) {
+                        // sources should all come before any separators
+                        break;
+                    } else if (((JMenuItem) c).getText() == label) {
+                        ((JMenuItem) c).doClick();
+                        return;
+                    }
+                    // else continue...
+                }
+                fail();
+            });
+        } catch (Throwable e) {
+            // need to turn this *back* into an AssertionFailedError
+            fail(String.format("Failed to find menu item with label %s: %s", label, e));
         }
-        fail("Failed to find menu item with label " + label);
-        return null;
     }
 
@@ -95 +128 @@
     protected static BufferedImage paintedSlippyMap;
 
-    protected void setUpMiniMap() throws Exception {
-        this.minimap = new MinimapDialog();
-        this.minimap.setSize(300, 200);
-        this.minimap.showDialog();
-        this.slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(this.minimap, "slippyMap");
-        this.sourceButton = (SourceButton) TestUtils.getPrivateField(this.slippyMap, "iSourceButton");
+    protected void setUpMiniMap() {
+        GuiHelper.runInEDTAndWaitWithException(uncheckExceptions(() -> {
+            this.minimap = new MinimapDialog();
+            this.minimap.setSize(300, 200);
+            this.minimap.showDialog();
+            this.slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(this.minimap, "slippyMap");
+            this.sourceButton = (SourceButton) TestUtils.getPrivateField(this.slippyMap, "iSourceButton");
+
+            // get minimap in a paintable state
+            this.minimap.addNotify();
+            this.minimap.doLayout();
+        }));
 
         this.slippyMapTasksFinished = () -> !this.slippyMap.getTileController().getTileLoader().hasOutstandingTasks();
-
-        // get minimap in a paintable state
-        this.minimap.addNotify();
-        this.minimap.doLayout();
     }
 
@@ -153 +188 @@
         this.assertSingleSelectedSourceLabel("White Tiles");
 
-        this.getSourceMenuItemByLabel("Magenta Tiles").doClick();
+        this.clickSourceMenuItemByLabel("Magenta Tiles");
         this.assertSingleSelectedSourceLabel("Magenta Tiles");
         // call paint to trigger new tile fetch
@@ -164 +199 @@
         assertEquals(0xffff00ff, paintedSlippyMap.getRGB(0, 0));
 
-        this.getSourceMenuItemByLabel("Green Tiles").doClick();
+        this.clickSourceMenuItemByLabel("Green Tiles");
         this.assertSingleSelectedSourceLabel("Green Tiles");
         // call paint to trigger new tile fetch
@@ -199 +234 @@
         assertEquals(0xff00ff00, paintedSlippyMap.getRGB(0, 0));
 
-        this.getSourceMenuItemByLabel("Magenta Tiles").doClick();
+        this.clickSourceMenuItemByLabel("Magenta Tiles");
         this.assertSingleSelectedSourceLabel("Magenta Tiles");
 
@@ -226 +261 @@
         assertEquals(0xffffffff, paintedSlippyMap.getRGB(0, 0));
     }
+
+    /**
+     * test viewport marker rectangle matches the mapView's aspect ratio
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testViewportAspectRatio() throws Exception {
+        // Add a test layer to the layer manager to get the MapFrame & MapView
+        MainApplication.getLayerManager().addLayer(new TestLayer());
+
+        Main.pref.put("slippy_map_chooser.mapstyle", "White Tiles");
+        // ensure projection matches JMapViewer's
+        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+
+        MapView mapView = MainApplication.getMap().mapView;
+        GuiHelper.runInEDTAndWaitWithException(() -> {
+            mapView.setVisible(true);
+            mapView.addNotify();
+            mapView.doLayout();
+            // ensure we have a square mapView viewport
+            mapView.setBounds(0, 0, 350, 350);
+        });
+
+        this.setUpMiniMap();
+
+        // attempt to set viewport to cover a non-square area
+        mapView.zoomTo(new Bounds(26.27, -18.23, 26.275, -18.229));
+
+        // an initial paint operation is required to trigger the tile fetches
+        this.paintSlippyMap();
+
+        Awaitility.await().atMost(1000, MILLISECONDS).until(this.slippyMapTasksFinished);
+
+        this.paintSlippyMap();
+
+        Map<Integer, String> paletteMap = ImmutableMap.<Integer, String>builder()
+            .put(0xffffffff, "w")
+            .put(0xff000000, "b")
+            .put(0xfff0d1d1, "p")
+            .build();
+
+        Matcher rowMatcher = ImagePatternMatching.rowMatch(
+            paintedSlippyMap,
+            paintedSlippyMap.getHeight()/2,
+            paletteMap,
+            "^(w+)b(p+)b(w+)$",
+            true
+        );
+
+        // (within a tolerance for numerical error) the number of pixels on the left of the viewport marker
+        // should equal the number on the right
+        assertTrue(
+            "Viewport marker not horizontally centered",
+            Math.abs(rowMatcher.group(1).length() - rowMatcher.group(3).length()) < 4
+        );
+
+        Matcher colMatcher = ImagePatternMatching.columnMatch(
+            paintedSlippyMap,
+            paintedSlippyMap.getWidth()/2,
+            paletteMap,
+            "^(w+)b(p+)b(w+)$",
+            true
+        );
+
+        // (within a tolerance for numerical error) the number of pixels on the top of the viewport marker
+        // should equal the number on the bottom
+        assertTrue(
+            "Viewport marker not vertically centered",
+            Math.abs(colMatcher.group(1).length() - colMatcher.group(3).length()) < 4
+        );
+
+        // (within a tolerance for numerical error) the viewport marker should be square
+        assertTrue(
+            "Viewport marker not square",
+            Math.abs(colMatcher.group(2).length() - rowMatcher.group(2).length()) < 4
+        );
+
+        // now change the mapView size
+        GuiHelper.runInEDTAndWaitWithException(() -> {
+            mapView.setBounds(0, 0, 150, 300);
+            Arrays.stream(mapView.getComponentListeners()).forEach(
+                cl -> cl.componentResized(new ComponentEvent(mapView, ComponentEvent.COMPONENT_RESIZED))
+            );
+        });
+        // minimap doesn't (yet?) listen for component resize events to update its viewport marker, so
+        // trigger a zoom change
+        mapView.zoomTo(mapView.getCenter().add(1., 0.));
+        this.paintSlippyMap();
+
+        rowMatcher = ImagePatternMatching.rowMatch(
+            paintedSlippyMap,
+            paintedSlippyMap.getHeight()/2,
+            paletteMap,
+            "^(w+)b(p+)b(w+)$",
+            true
+        );
+        assertTrue(
+            "Viewport marker not horizontally centered",
+            Math.abs(rowMatcher.group(1).length() - rowMatcher.group(3).length()) < 4
+        );
+
+        colMatcher = ImagePatternMatching.columnMatch(
+            paintedSlippyMap,
+            paintedSlippyMap.getWidth()/2,
+            paletteMap,
+            "^(w+)b(p+)b(w+)$",
+            true
+        );
+        assertTrue(
+            "Viewport marker not vertically centered",
+            Math.abs(colMatcher.group(1).length() - colMatcher.group(3).length()) < 4
+        );
+
+        try {
+            javax.imageio.ImageIO.write(paintedSlippyMap, "png", new java.io.File("failed.png"));
+        } catch (java.io.IOException ioe) {
+            System.err.println("Failed writing image");
+        }
+
+        assertTrue(
+            "Viewport marker not 2:1 aspect ratio",
+            Math.abs(colMatcher.group(2).length() - (rowMatcher.group(2).length()*2.0)) < 5
+        );
+    }
 }