Changeset 9400 in josm for trunk/test/unit/org

Timestamp:

2016-01-11T01:02:56+01:00 (8 years ago)

Author:

Don-vip

Message:

see #12282 - detect missing icons for MapCSS styles

File:

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

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

@@ -14 +14 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
+import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.AssignmentInstruction;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
@@ -48 +54 @@
                 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);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
                 System.out.println(style.isValid() ? " => OK" : " => KO");
                 Collection<Throwable> errors = style.getErrors();