Changeset 8937 in josm for trunk

Timestamp:

2015-10-24T00:54:52+02:00 (9 years ago)

Author:

Don-vip

Message:

add unit tests to check validity of all map paint styles and tagging presets

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/preferences/map (added)
• test/unit/org/openstreetmap/josm/gui/preferences/map/MapPaintPreferenceTest.java (added)
• test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTest.java (added)
• test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -11 +11 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -266 +267 @@
             }
         }
-        if (Main.isDebugEnabled()) {
+        if (Main.isDebugEnabled() || !source.getErrors().isEmpty()) {
             final long elapsedTime = System.currentTimeMillis() - startTime;
-            Main.debug("Initializing map style " + source.url + " completed in " + Utils.getDurationString(elapsedTime));
+            String message = "Initializing map style " + source.url + " completed in " + Utils.getDurationString(elapsedTime);
+            if (!source.getErrors().isEmpty()) {
+                Main.warn(message + " (" + source.getErrors().size() + " errors)");
+            } else {
+                Main.debug(message);
+            }
         }
     }
@@ -433 +439 @@
     }
 
-    public static void addStyle(SourceEntry entry) {
+    /**
+     * Add a new map paint style.
+     * @param entry map paint style
+     * @return list of errors that occured during loading
+     */
+    public static Collection<Throwable> addStyle(SourceEntry entry) {
         StyleSource source = fromSourceEntry(entry);
         if (source != null) {
@@ -441 +452 @@
             fireMapPaintSylesUpdated();
             styles.clearCached();
-            Main.map.mapView.repaint();
-        }
+            if (Main.isDisplayingMapView()) {
+                Main.map.mapView.repaint();
+            }
+            return source.getErrors();
+        }
+        return Collections.emptyList();
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -83 +83 @@
     public static final String OPTIONAL_TOOLTIP_TEXT = "Optional tooltip text";
 
+    /** Prefix of preset icon loading failure error message */
+    public static final String PRESET_ICON_ERROR_MSG_PREFIX = "Could not get presets icon ";
+
     public TaggingPresetMenu group;
     public String name;
@@ -166 +169 @@
      * Called from the XML parser to set the icon.
      * The loading task is performed in the background in order to speedup startup.
+     * @param iconName icon name
      */
     public void setIcon(final String iconName) {
@@ -190 +194 @@
                     });
                 } else {
-                    Main.warn("Could not get presets icon " + iconName);
+                    Main.warn(PRESET_ICON_ERROR_MSG_PREFIX + iconName);
                 }
             }

trunk/test/unit/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreferenceTest.java

@@ -6 +6 @@
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 
@@ -35 +36 @@
      */
     @Test
-    public void testValidityOfAvailableSources() throws ParseException, IOException {
+    public void testValidityOfAvailableRules() throws ParseException, IOException {
         Collection<ExtendedSourceEntry> sources = new ValidatorTagCheckerRulesPreference.TagCheckerRulesSourceEditor()
                 .loadAndGetAvailableSources();
         assertFalse(sources.isEmpty());
+        Collection<Throwable> allErrors = new ArrayList<>();
         MapCSSTagChecker tagChecker = new MapCSSTagChecker();
         for (ExtendedSourceEntry source : sources) {
@@ -44 +46 @@
             ParseResult result = tagChecker.addMapCSS(source.url);
             assertFalse(result.parseChecks.isEmpty());
-            assertTrue(result.parseErrors.isEmpty());
-            System.out.println(" => OK");
+            System.out.println(result.parseErrors.isEmpty() ? " => OK" : " => KO");
+            allErrors.addAll(result.parseErrors);
         }
+        assertTrue(allErrors.isEmpty());
     }
 }