Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 4069)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 4074)
@@ -1,5 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint
-
 import java.awt.Color
 
@@ -8,4 +7,5 @@
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.TagKeyReference
 class MapCSSWithExtendedTextDirectivesTest {
     
@@ -21,5 +21,5 @@
         c.put("text", new Keyword("auto"))
         
-        TextElement te = TextElement.create(c, Color.WHITE)
+        TextElement te = TextElement.create(c, Color.WHITE, false /* no default annotate */)
         assert te.labelCompositionStrategy != null
         assert te.labelCompositionStrategy instanceof DeriveLabelFromNameTagsCompositionStrategy
@@ -29,18 +29,7 @@
     public void createTextElementComposingTextFromTag() {
         Cascade c = new Cascade()
-        c.put("text", "my_name")
+        c.put("text", new TagKeyReference("my_name"))
         
-        TextElement te = TextElement.create(c, Color.WHITE)
-        assert te.labelCompositionStrategy != null
-        assert te.labelCompositionStrategy instanceof TagLookupCompositionStrategy
-        assert te.labelCompositionStrategy.getDefaultLabelTag() == "my_name"
-    }
-    
-    @Test
-    public void createTextElementComposingTextFromTag_2() {
-        Cascade c = new Cascade()
-        c.put("text", new Keyword("my_name"))
-        
-        TextElement te = TextElement.create(c, Color.WHITE)
+        TextElement te = TextElement.create(c, Color.WHITE, false /* no default annotate */)
         assert te.labelCompositionStrategy != null
         assert te.labelCompositionStrategy instanceof TagLookupCompositionStrategy
@@ -52,5 +41,5 @@
         Cascade c = new Cascade()
         
-        TextElement te = TextElement.create(c, Color.WHITE)
+        TextElement te = TextElement.create(c, Color.WHITE, false /* no default annotate */)
         assert te.labelCompositionStrategy == null
     }
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy	(revision 4069)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy	(revision 4074)
@@ -101,2 +101,3 @@
     }    
 }
+
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy	(revision 4069)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy	(revision 4074)
@@ -90,2 +90,3 @@
     
 }
+
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ParsingLinkSelectorTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ParsingLinkSelectorTest.groovy	(revision 4069)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ParsingLinkSelectorTest.groovy	(revision 4074)
@@ -56,2 +56,3 @@
     }
 }
+