Changeset 13078 in josm for trunk

Timestamp:

2017-11-04T17:11:15+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15508 - add TileSourceRule, use in MinimapDialogTest (patch by ris, modified) + update WireMock to 2.10.1

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• test/lib/wiremock-standalone-2.10.1.jar (added)
• test/lib/wiremock-standalone-2.7.1.jar (deleted)
• test/unit/org/openstreetmap/josm/TestUtils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/testutils/TileSourceRule.java (added)

trunk/.classpath

@@ -22 +22 @@
         <classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar"/>
         <classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar"/>
-        <classpathentry kind="lib" path="test/lib/wiremock-standalone-2.7.1.jar"/>
+        <classpathentry kind="lib" path="test/lib/wiremock-standalone-2.10.1.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -171 +171 @@
 
     /**
+     * Returns a private static field value.
+     * @param cls object class
+     * @param fieldName private field name
+     * @return private field value
+     * @throws ReflectiveOperationException if a reflection operation error occurs
+     */
+    public static Object getPrivateStaticField(Class<?> cls, String fieldName) throws ReflectiveOperationException {
+        Field f = cls.getDeclaredField(fieldName);
+        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+            f.setAccessible(true);
+            return null;
+        });
+        return f.get(null);
+    }
+
+    /**
      * Returns an instance of {@link AbstractProgressMonitor} which keeps track of the monitor state,
      * but does not show the progress.

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
+import org.openstreetmap.josm.gui.bbox.SourceButton;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -21 +34 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().platform();
+    public JOSMTestRules josmTestRules = new JOSMTestRules().main().platform().projection().fakeImagery();
 
     /**
@@ -34 +47 @@
         assertFalse(dlg.isVisible());
     }
+
+    private static void assertSingleSelectedSourceLabel(JPopupMenu menu, String label) {
+        boolean found = false;
+        for (Component c: menu.getComponents()) {
+            if (JPopupMenu.Separator.class.isInstance(c)) {
+                break;
+            } else {
+                boolean equalText = ((JMenuItem) c).getText() == label;
+                boolean isSelected = ((JMenuItem) c).isSelected();
+                assertEquals(equalText, isSelected);
+                if (equalText) {
+                    assertFalse("Second selected source found", found);
+                    found = true;
+                }
+            }
+        }
+        assertTrue("Selected source not found in menu", found);
+    }
+
+    private static JMenuItem getSourceMenuItemByLabel(JPopupMenu menu, String label) {
+        for (Component c: menu.getComponents()) {
+            if (JPopupMenu.Separator.class.isInstance(c)) {
+                break;
+            } else if (((JMenuItem) c).getText() == label) {
+                return (JMenuItem) c;
+            }
+            // else continue...
+        }
+        fail("Failed to find menu item with label " + label);
+        return null;
+    }
+
+    /**
+     * Tests to switch imagery source.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testSourceSwitching() throws Exception {
+        MinimapDialog dlg = new MinimapDialog();
+        dlg.setSize(300, 200);
+        dlg.showDialog();
+        SlippyMapBBoxChooser slippyMap = (SlippyMapBBoxChooser) TestUtils.getPrivateField(dlg, "slippyMap");
+        SourceButton sourceButton = (SourceButton) TestUtils.getPrivateField(slippyMap, "iSourceButton");
+
+        // get dlg in a paintable state
+        dlg.addNotify();
+        dlg.doLayout();
+
+        BufferedImage image = new BufferedImage(
+            slippyMap.getSize().width,
+            slippyMap.getSize().height,
+            BufferedImage.TYPE_INT_RGB
+        );
+
+        Graphics2D g = image.createGraphics();
+        // an initial paint operation is required to trigger the tile fetches
+        slippyMap.paintAll(g);
+        g.setBackground(Color.BLUE);
+        g.clearRect(0, 0, image.getWidth(), image.getHeight());
+        g.dispose();
+
+        Thread.sleep(500);
+
+        g = image.createGraphics();
+        slippyMap.paintAll(g);
+
+        assertEquals(0xffffffff, image.getRGB(0, 0));
+
+        assertSingleSelectedSourceLabel(sourceButton.getPopupMenu(), "White Tiles");
+
+        getSourceMenuItemByLabel(sourceButton.getPopupMenu(), "Magenta Tiles").doClick();
+        assertSingleSelectedSourceLabel(sourceButton.getPopupMenu(), "Magenta Tiles");
+        // call paint to trigger new tile fetch
+        slippyMap.paintAll(g);
+
+        // clear background to a recognizably "wrong" color & dispose our Graphics2D so we don't risk carrying over
+        // any state
+        g.setBackground(Color.BLUE);
+        g.clearRect(0, 0, image.getWidth(), image.getHeight());
+        g.dispose();
+
+        Thread.sleep(500);
+
+        g = image.createGraphics();
+        slippyMap.paintAll(g);
+
+        assertEquals(0xffff00ff, image.getRGB(0, 0));
+
+        getSourceMenuItemByLabel(sourceButton.getPopupMenu(), "Green Tiles").doClick();
+        assertSingleSelectedSourceLabel(sourceButton.getPopupMenu(), "Green Tiles");
+        // call paint to trigger new tile fetch
+        slippyMap.paintAll(g);
+
+        g.setBackground(Color.BLUE);
+        g.clearRect(0, 0, image.getWidth(), image.getHeight());
+        g.dispose();
+
+        Thread.sleep(500);
+
+        g = image.createGraphics();
+        slippyMap.paintAll(g);
+
+        assertEquals(0xff00ff00, image.getRGB(0, 0));
+    }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.testutils;
 
+import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
@@ -57 +58 @@
     private APIType useAPI = APIType.NONE;
     private String i18n = null;
+    private TileSourceRule tileSourceRule;
     private boolean platform;
     private boolean useProjection;
@@ -243 +245 @@
 
     /**
+     * Replace imagery sources with a default set of mock tile sources
+     *
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules fakeImagery() {
+        return this.fakeImagery(
+            new TileSourceRule(
+                true,
+                true,
+                true,
+                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)
+            )
+        );
+    }
+
+    /**
+     * Replace imagery sources with those from specific mock tile server setup
+     * @param tileSourceRule Tile source rule
+     *
+     * @return this instance, for easy chaining
+     */
+    public JOSMTestRules fakeImagery(TileSourceRule tileSourceRule) {
+        this.preferences();
+        this.tileSourceRule = tileSourceRule;
+        return this;
+    }
+
+    /**
      * Use the {@link Main#main}, {@code Main.contentPanePrivate}, {@code Main.mainPanel},
      *         {@link Main#menu}, {@link Main#toolbar} global variables in this test.
@@ -257 +290 @@
     public Statement apply(Statement base, Description description) {
         Statement statement = base;
+        // counter-intuitively, Statements which need to have their setup routines performed *after* another one need to
+        // be added into the chain *before* that one, so that it ends up on the "inside".
         if (timeout > 0) {
             // TODO: new DisableOnDebug(timeout)
             statement = new FailOnTimeoutStatement(statement, timeout);
         }
+
+        // this half of TileSourceRule's initialization must happen after josm is set up
+        if (this.tileSourceRule != null) {
+            statement = this.tileSourceRule.applyRegisterLayers(statement, description);
+        }
+
         statement = new CreateJosmEnvironment(statement);
         if (josmHome != null) {
             statement = josmHome.apply(statement, description);
+        }
+
+        // run mock tile server as the outermost Statement (started first) so it can hopefully be initializing in
+        // parallel with other setup
+        if (this.tileSourceRule != null) {
+            statement = this.tileSourceRule.applyRunServer(statement, description);
         }
         return statement;
@@ -407 +454 @@
         MainApplication.getLayerManager().resetState();
         eventManager.resetState();
+    }
+
+    /**
+     * @return TileSourceRule which is automatically started by this rule
+     */
+    public TileSourceRule getTileSourceRule() {
+        return this.tileSourceRule;
     }