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

Timestamp:

2014-01-19T20:30:57+01:00 (10 years ago)

Author:

simon04

Message:

fix #9191 - MapCSS: Add option to include colour preferences of external styles

The syntax is the same as for the XML styles: name#123456

File:

• trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

@@ -11 +11 @@
 import org.openstreetmap.josm.gui.mappaint.MultiCascade
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
+import org.openstreetmap.josm.tools.ColorHelper
 import org.openstreetmap.josm.tools.Utils
 
@@ -81 +82 @@
         def mc3 = new MultiCascade()
         css.apply(mc3, getPrimitive("highway", "footway"), 1, null, false);
-        assert Utils.hexToColor("#FF6644").equals(mc3.getCascade("default").get("color", null, Color.class))
+        assert ColorHelper.html2color("#FF6644").equals(mc3.getCascade("default").get("color", null, Color.class))
     }
 
@@ -217 +218 @@
         assert mc.getCascade(Environment.DEFAULT_LAYER).get("text") == "15 - 1.5 - Foo"
     }
+
+    @Test
+    public void testColorNameTicket9191() throws Exception {
+        def e = new Environment(null, new MultiCascade(), Environment.DEFAULT_LAYER, null)
+        getParser("{color: testcolour1#88DD22}").declaration().get(0).execute(e)
+        def expected = new Color(0x88DD22)
+        assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
+        assert Main.pref.getDefaultColor("MapCSS.testcolour1") == expected
+    }
 }