Changeset 15423 in josm for trunk/test/unit/org/openstreetmap/josm/gui/preferences

Timestamp:

2019-10-05T19:23:20+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17240 - Presets: verify that wiki links are no redirect

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

@@ -8 +8 @@
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.Collection;
 import java.util.HashSet;
@@ -28 +29 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
+import org.openstreetmap.josm.gui.tagging.presets.items.Link;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.HttpClient.Response;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -113 +117 @@
         assertFalse(presets.isEmpty());
         // wait for asynchronous icon loading
-        presets.stream().map(TaggingPreset::getIconLoadingTask).filter(Objects::nonNull).forEach(t -> {
+        presets.parallelStream().map(TaggingPreset::getIconLoadingTask).filter(Objects::nonNull).forEach(t -> {
             try {
                 t.get(30, TimeUnit.SECONDS);
             } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                Logging.error(e);
+            }
+        });
+        // check that links are correct and not redirections
+        presets.parallelStream().flatMap(x -> x.data.stream().filter(i -> i instanceof Link).map(i -> ((Link) i).getUrl())).forEach(u -> {
+            try {
+                Response cr = HttpClient.create(new URL(u)).setMaxRedirects(-1).connect();
+                final int code = cr.getResponseCode();
+                if (HttpClient.isRedirect(code)) {
+                    addOrIgnoreError(messages, "Found HTTP redirection for " + u + " -> " + code + " -> " + cr.getHeaderField("Location"));
+                } else if (code >= 400) {
+                    addOrIgnoreError(messages, "Found HTTP error for " + u + " -> " + code);
+                }
+            } catch (IOException e) {
                 Logging.error(e);
             }
@@ -125 +143 @@
             if (message.contains(TaggingPreset.PRESET_ICON_ERROR_MSG_PREFIX)) {
                 error = true;
-                if (isIgnoredSubstring(message)) {
-                    ignoredErrors.add(message);
-                } else {
-                    messages.add(message);
-                }
+                addOrIgnoreError(messages, message);
             }
         }
@@ -136 +150 @@
         }
     }
+
+    void addOrIgnoreError(Set<String> messages, String message) {
+        if (isIgnoredSubstring(message)) {
+            ignoredErrors.add(message);
+        } else {
+            messages.add(message);
+        }
+    }
 }