Changeset 14528 in josm

Timestamp:

2018-12-08T23:48:44+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16073 - handle ignore list

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• TestUtils.java (modified) (3 diffs)
• gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (3 diffs)

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

@@ -25 +25 @@
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -52 +54 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.WikiReader;
 import org.reflections.Reflections;
 
@@ -578 +581 @@
         return Utils.getSystemProperty("osm.username") != null && Utils.getSystemProperty("osm.password") != null;
     }
+
+    /**
+     * Returns the ignored error messages listed on
+     * <a href="https://josm.openstreetmap.de/wiki/IntegrationTestIgnores">JOSM wiki</a> for a given test.
+     * @param integrationTest The integration test class
+     * @return the ignored error messages listed on JOSM wiki for this test.
+     * @throws IOException in case of I/O error
+     */
+    public static List<String> getIgnoredErrorMessages(Class<?> integrationTest) throws IOException {
+        return Arrays.stream(new WikiReader()
+                .read("https://josm.openstreetmap.de/wiki/IntegrationTestIgnores?format=txt")
+                .split("\\n"))
+                .filter(s -> s.startsWith("|| " + integrationTest.getSimpleName() + " ||"))
+                .map(s -> s.substring(s.indexOf("{{{") + 3, s.indexOf("}}}")))
+                .collect(Collectors.toList());
+    }
 }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -15 +15 @@
 import java.util.concurrent.TimeUnit;
 
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -24 +25 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.ScanexTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -57 +59 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().https().projection().projectionNadGrids().timeout(10000*60);
+    public JOSMTestRules test = new JOSMTestRules().https().preferences().projection().projectionNadGrids().timeout(10000*60);
 
     private final Map<String, Map<ImageryInfo, List<String>>> errors = Collections.synchronizedMap(new TreeMap<>());
     private final Set<String> workingURLs = Collections.synchronizedSet(new HashSet<>());
 
+    private List<String> ignoredErrors;
+
+    /**
+     * Setup test
+     * @throws IOException in case of I/O error
+     */
+    @Before
+    public void before() throws IOException {
+        ignoredErrors = TestUtils.getIgnoredErrorMessages(ImageryPreferenceTestIT.class);
+    }
+
     private boolean addError(ImageryInfo info, String error) {
-        return errors.computeIfAbsent(info.getCountryCode(), x -> Collections.synchronizedMap(new TreeMap<>()))
+        return !ignoredErrors.contains(error) &&
+               errors.computeIfAbsent(info.getCountryCode(), x -> Collections.synchronizedMap(new TreeMap<>()))
                      .computeIfAbsent(info, x -> Collections.synchronizedList(new ArrayList<>()))
                      .add(error);