Changeset 7066 in josm for trunk

Timestamp:

2014-05-05T18:41:45+02:00 (10 years ago)

Author:

Don-vip

Message:

see #9691 - fix MapCSSParserTest broken by r7064. MapCSSTagCheckerTest is still broken

File:

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

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

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.mappaint.mapcss
+
+import java.awt.Color
 
 import org.junit.Before
@@ -14 +16 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
 import org.openstreetmap.josm.tools.ColorHelper
-
-import java.awt.Color
 
 class MapCSSParserTest {
@@ -235 +235 @@
     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)
+        getParser("{color: testcolour1#88DD22}").declaration().instructions.get(0).execute(e)
         def expected = new Color(0x88DD22)
         assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected
@@ -244 +244 @@
     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)
+        getParser("{color: testcolour2#12345678}").declaration().instructions.get(0).execute(e)
         def expected = new Color(0x12, 0x34, 0x56, 0x78)
         assert e.getCascade(Environment.DEFAULT_LAYER).get("color") == expected