Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 7396)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 7418)
@@ -5,4 +5,5 @@
 import org.junit.*
 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
@@ -18,8 +19,12 @@
     @Test
     public void createAutoTextElement() {
-        Cascade c = new Cascade()
+        MultiCascade mc = new MultiCascade()
+        Cascade c = mc.getOrCreateCascade("default")
         c.put("text", new Keyword("auto"))
+        Node osm = new Node()
+        osm.put("ref", "A456");
+        Environment env = new Environment(osm, mc, "default", null)
 
-        TextElement te = TextElement.create(c, Color.WHITE, false /* no default annotate */)
+        TextElement te = TextElement.create(env, Color.WHITE, false /* no default annotate */)
         assert te.labelCompositionStrategy != null
         assert te.labelCompositionStrategy instanceof DeriveLabelFromNameTagsCompositionStrategy
@@ -28,8 +33,12 @@
     @Test
     public void createTextElementComposingTextFromTag() {
-        Cascade c = new Cascade()
+        MultiCascade mc = new MultiCascade()
+        Cascade c = mc.getOrCreateCascade("default")
         c.put("text", new TagKeyReference("my_name"))
+        Node osm = new Node()
+        osm.put("my_name", "foobar");
+        Environment env = new Environment(osm, mc, "default", null)
 
-        TextElement te = TextElement.create(c, Color.WHITE, false /* no default annotate */)
+        TextElement te = TextElement.create(env, Color.WHITE, false /* no default annotate */)
         assert te.labelCompositionStrategy != null
         assert te.labelCompositionStrategy instanceof TagLookupCompositionStrategy
@@ -39,7 +48,9 @@
     @Test
     public void createNullStrategy() {
-        Cascade c = new Cascade()
+        MultiCascade mc = new MultiCascade()
+        Node osm = new Node()
+        Environment env = new Environment(osm, mc, "default", null)
 
-        TextElement te = TextElement.create(c, Color.WHITE, false /* no default annotate */)
+        TextElement te = TextElement.create(env, Color.WHITE, false /* no default annotate */)
         assert te == null
     }