Changeset 9279 in josm for trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy

Timestamp:

2016-01-03T16:29:25+01:00 (9 years ago)

Author:

Don-vip

Message:

fix groovy scripts broken by r9278

File:

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

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy

@@ -6 +6 @@
 import org.openstreetmap.josm.JOSMFixture
 import org.openstreetmap.josm.data.osm.Node
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.TagKeyReference
+import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy
 
 class MapCSSWithExtendedTextDirectivesTest {
@@ -26 +27 @@
         Environment env = new Environment(osm, mc, "default", null)
 
-        TextElement te = TextElement.create(env, Color.WHITE, false /* no default annotate */)
+        TextLabel te = TextLabel.create(env, Color.WHITE, false /* no default annotate */)
         assert te.labelCompositionStrategy != null
         assert te.labelCompositionStrategy instanceof DeriveLabelFromNameTagsCompositionStrategy
@@ -40 +41 @@
         Environment env = new Environment(osm, mc, "default", null)
 
-        TextElement te = TextElement.create(env, Color.WHITE, false /* no default annotate */)
+        TextLabel te = TextLabel.create(env, Color.WHITE, false /* no default annotate */)
         assert te.labelCompositionStrategy != null
         assert te.labelCompositionStrategy instanceof TagLookupCompositionStrategy
@@ -52 +53 @@
         Environment env = new Environment(osm, mc, "default", null)
 
-        TextElement te = TextElement.create(env, Color.WHITE, false /* no default annotate */)
+        TextLabel te = TextLabel.create(env, Color.WHITE, false /* no default annotate */)
         assert te == null
     }