Changeset 6774 in josm for trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

Timestamp:

2014-01-29T22:15:06+01:00 (11 years ago)

Author:

simon04

Message:

fix #9633 - MapCSS: allow (named) colours with alpha

File:

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

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

@@ -225 +225 @@
         def expected = new Color(0x88DD22)
         assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
-        assert Main.pref.getDefaultColor("MapCSS.testcolour1") == expected
+        assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour1") == expected
+    }
+
+    @Test
+    public void testColorNameTicket9191Alpha() throws Exception {
+        def e = new Environment(null, new MultiCascade(), Environment.DEFAULT_LAYER, null)
+        getParser("{color: testcolour2#12345678}").declaration().get(0).execute(e)
+        def expected = new Color(0x12, 0x34, 0x56, 0x78)
+        assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
+        assert Main.pref.getDefaultColor("mappaint.mapcss.testcolour2") == expected
+    }
+
+    @Test
+    public void testColorParsing() throws Exception {
+        assert ColorHelper.html2color("#12345678") == new Color(0x12, 0x34, 0x56, 0x78)
     }
 }