Changeset 18021 in josm for trunk

Timestamp:

2021-07-14T20:52:02+02:00 (4 years ago)

Author:

Don-vip

Message:

see #8472 - don't load image from Wikimedia Commons for real in unit test. Breaks our CI in case of network/load issues, see ​https://github.com/openstreetmap/josm/runs/3069693523

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/geoimage/WikimediaCommonsLoader.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/WikimediaCommonsLoaderTest.java (modified) (3 diffs)

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

@@ -130 +130 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
-import org.openstreetmap.josm.gui.layer.geoimage.WikimediaCommonsLoader;
+import org.openstreetmap.josm.gui.layer.geoimage.WikimediaCommonsLoader.WikimediaCommonsLoadImagesAction;
 import org.openstreetmap.josm.gui.mappaint.MapPaintMenu;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
@@ -749 +749 @@
         add(fileMenu, searchNotes);
         add(fileMenu, downloadNotesInView);
-        add(fileMenu, new WikimediaCommonsLoader.Action());
+        add(fileMenu, new WikimediaCommonsLoadImagesAction());
         add(fileMenu, downloadReferrers);
         add(fileMenu, update);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/WikimediaCommonsLoader.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.layer.geoimage;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathExpressionException;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -10 +20 @@
 import org.openstreetmap.josm.tools.Mediawiki;
 import org.xml.sax.SAXException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathExpressionException;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -59 +60 @@
     }
 
-    public static class Action extends JosmAction {
-        public Action() {
+    /**
+     * Load images from Wikimedia Commons
+     * @since 18021
+     */
+    public static class WikimediaCommonsLoadImagesAction extends JosmAction {
+        /**
+         * Constructs a new {@code WikimediaCommonsLoadImagesAction}
+         */
+        public WikimediaCommonsLoadImagesAction() {
             super(tr("Load images from Wikimedia Commons"), "wikimedia_commons", null, null, false);
         }
@@ -75 +83 @@
         }
     }
-
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/WikimediaCommonsLoaderTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.layer.geoimage;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import java.net.URL;
-import java.util.List;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
@@ -17 +7 @@
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.URL;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -51 +53 @@
         assertEquals(new URL("https://upload.wikimedia.org/wikipedia/commons/e/e8/ISS053-E-105875_-_View_of_Earth.jpg"),
                 image.getImageUrl());
-        image.read(null); // load the image from commons.wikimedia.org
     }