Changeset 15095 in josm for trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTestIT.java

Timestamp:

2019-05-19T17:11:38+02:00 (5 years ago)

Author:

Don-vip

Message:

parameterize integration tests for map paint styles and tagging presets

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.map;
 
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
-import org.junit.Rule;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -21 +26 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.ParallelParameterized;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -28 +34 @@
  * Integration tests of {@link MapPaintPreference} class.
  */
+@RunWith(ParallelParameterized.class)
 public class MapPaintPreferenceTestIT {
 
@@ -33 +40 @@
      * Setup rule
      */
-    @Rule
+    @ClassRule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().https().timeout(15000*60);
+    public static JOSMTestRules test = new JOSMTestRules().https().timeout(15000*60).parameters();
+
+    /** Entry to test */
+    private final ExtendedSourceEntry source;
+    private final List<String> ignoredErrors = new ArrayList<>();
+    private static final List<String> errorsToIgnore = new ArrayList<>();
 
     /**
-     * Test that available map paint styles are valid.
+     * Setup test
+     * @throws IOException in case of I/O error
+     */
+    @BeforeClass
+    public static void beforeClass() throws IOException {
+        errorsToIgnore.addAll(TestUtils.getIgnoredErrorMessages(MapPaintPreferenceTestIT.class));
+    }
+
+    /**
+     * Returns list of map paint styles to test.
+     * @return list of map paint styles to test
+     * @throws Exception if an error occurs
+     */
+    @Parameters(name = "{0} - {1}")
+    public static List<Object[]> data() throws Exception {
+        ImageProvider.clearCache();
+        return new MapPaintPreference.MapPaintSourceEditor().loadAndGetAvailableSources().stream()
+                .map(x -> new Object[] {x.getDisplayName(), x.url, x}).collect(Collectors.toList());
+    }
+
+    /**
+     * Constructs a new {@code MapPaintPreferenceTestIT}
+     * @param displayName displayed name
+     * @param url URL
+     * @param source source entry to test
+     */
+    public MapPaintPreferenceTestIT(String displayName, String url, ExtendedSourceEntry source) {
+        this.source = source;
+    }
+
+    /**
+     * Test that map paint style is valid.
      * @throws Exception in case of error
      */
     @Test
-    public void testValidityOfAvailableStyles() throws Exception {
-        ImageProvider.clearCache();
-        Collection<ExtendedSourceEntry> sources = new MapPaintPreference.MapPaintSourceEditor()
-                .loadAndGetAvailableSources();
-        // Drop everything from yopaseopor, pasharm and www.freietonne.de, too many errors
-        sources.removeIf(x -> x.url.contains("yopaseopor/") || x.url.contains("/pasharm") || x.url.contains("www.freietonne.de"));
-        assertFalse(sources.isEmpty());
-        Map<String, Collection<Throwable>> allErrors = new HashMap<>();
-        Map<String, Collection<String>> allWarnings = new HashMap<>();
-        for (ExtendedSourceEntry source : sources) {
-            // Do not validate XML styles
-            if (!"xml".equalsIgnoreCase(source.styleType)) {
-                System.out.println(source.url);
-                StyleSource style = MapPaintStyles.addStyle(source);
-                if (style instanceof MapCSSStyleSource) {
-                    // Force loading of all icons to detect missing ones
-                    for (MapCSSRule rule : ((MapCSSStyleSource) style).rules) {
-                        for (Instruction instruction : rule.declaration.instructions) {
-                            if (instruction instanceof AssignmentInstruction) {
-                                AssignmentInstruction ai = (AssignmentInstruction) instruction;
-                                if (StyleKeys.ICON_IMAGE.equals(ai.key)
-                                 || StyleKeys.FILL_IMAGE.equals(ai.key)
-                                 || StyleKeys.REPEAT_IMAGE.equals(ai.key)) {
-                                    if (ai.val instanceof String) {
-                                        MapPaintStyles.getIconProvider(new IconReference((String) ai.val, style), true);
-                                    }
-                                }
+    public void testStyleValidity() throws Exception {
+        StyleSource style = MapPaintStyles.addStyle(source);
+        if (style instanceof MapCSSStyleSource) {
+            // Force loading of all icons to detect missing ones
+            for (MapCSSRule rule : ((MapCSSStyleSource) style).rules) {
+                for (Instruction instruction : rule.declaration.instructions) {
+                    if (instruction instanceof AssignmentInstruction) {
+                        AssignmentInstruction ai = (AssignmentInstruction) instruction;
+                        if (StyleKeys.ICON_IMAGE.equals(ai.key)
+                         || StyleKeys.FILL_IMAGE.equals(ai.key)
+                         || StyleKeys.REPEAT_IMAGE.equals(ai.key)) {
+                            if (ai.val instanceof String) {
+                                MapPaintStyles.getIconProvider(new IconReference((String) ai.val, style), true);
                             }
                         }
                     }
                 }
-                System.out.println(style.isValid() ? " => OK" : " => KO");
-                Collection<Throwable> errors = style.getErrors();
-                Collection<String> warnings = style.getWarnings();
-                if (!errors.isEmpty()) {
-                    allErrors.put(source.url, errors);
-                }
-                if (!warnings.isEmpty()) {
-                    allWarnings.put(source.url, warnings);
-                }
             }
         }
-        ImageProvider.clearCache();
-        assertTrue(allErrors.toString()+"\n"+allWarnings.toString(), allErrors.isEmpty() && allWarnings.isEmpty());
+
+        List<Throwable> errors = new ArrayList<>(style.getErrors());
+        errors.stream().map(Throwable::getMessage).filter(MapPaintPreferenceTestIT::isIgnoredSubstring).forEach(ignoredErrors::add);
+        errors.removeIf(e -> ignoredErrors.contains(e.getMessage()));
+
+        List<String> warnings = new ArrayList<>(style.getWarnings());
+        warnings.stream().filter(MapPaintPreferenceTestIT::isIgnoredSubstring).forEach(ignoredErrors::add);
+        warnings.removeAll(ignoredErrors);
+
+        assertTrue(errors.toString() + '\n' + warnings.toString(), errors.isEmpty() && warnings.isEmpty());
+        assumeTrue(ignoredErrors.toString(), ignoredErrors.isEmpty());
+    }
+
+    private static boolean isIgnoredSubstring(String substring) {
+        return errorsToIgnore.parallelStream().anyMatch(x -> substring.contains(x));
     }
 }