Index: /trunk/test/data/styles/label-from-tag.mapcss
===================================================================
--- /trunk/test/data/styles/label-from-tag.mapcss	(revision 3990)
+++ /trunk/test/data/styles/label-from-tag.mapcss	(revision 3991)
@@ -18,23 +18,2 @@
    font-size: 12;
 }
-
-/*
- * Simple test style sheet. Includes a style for nodes where the label is derived
- * from the value of a specific tag.
- *
- */
- 
-meta {
-    title: "Test style - Deriving labels from tags";
-}
-
-canvas {
-    background-color: #000000;
-}
-
-node {
-   text: my_label_tag;  /* take the value of the tag 'my_label_tag' as text */
-   text-color: white;   
-   font-size: 12;
-}
-
Index: /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy	(revision 3990)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy	(revision 3991)
@@ -65,68 +65,3 @@
     }
 }
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.mappaint
 
-import org.junit.*
-import org.openstreetmap.josm.fixtures.JOSMFixture;
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy 
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.StaticLabelCompositionStrategy;
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy 
-import org.openstreetmap.josm.data.osm.Node;
-
-class LabelCompositionStrategyTest {
-    
-    @BeforeClass
-    public static void createJOSMFixture(){
-        JOSMFixture.createUnitTestFixture().init()
-    }
-
-    @Test
-    public void createStaticLabelCompositionStrategy() {
-        def n = new Node()
-        
-        def strat = new StaticLabelCompositionStrategy(null)
-        assert strat.compose(n) == null
-        
-        strat = new StaticLabelCompositionStrategy("a label")
-        assert strat.compose(n) == "a label"        
-    }
-    
-    @Test
-    public void createTagLookupCompositionStrategy() {
-        def n = new Node()
-        n.put("my-tag", "my-value")
-        
-        def strat = new TagLookupCompositionStrategy(null)
-        assert strat.compose(n) == null
-        
-        strat = new TagLookupCompositionStrategy("name")
-        assert strat.compose(n) == null
-        
-        strat = new TagLookupCompositionStrategy("my-tag")
-        assert strat.compose(n) == "my-value"
-    }
-    
-    @Test
-    public void createDeriveLabelFromNameTagsCompositionStrategy() {
-        def n 
-        def strat
-        
-        strat = new DeriveLabelFromNameTagsCompositionStrategy()
-        strat.setNameTags(null)
-        assert strat.getNameTags() == []
-        
-        strat = new DeriveLabelFromNameTagsCompositionStrategy()
-        strat.setNameTags(["name", "brand"])
-        assert strat.getNameTags() == ["name", "brand"]
-        
-        n = new Node()
-        n.put("brand", "my brand")        
-        assert strat.compose(n) == "my brand"
-        
-        n = new Node()
-        n.put("name", "my name")
-        n.put("brand", "my brand")
-        assert strat.compose(n) == "my name"        
-    }
-}
Index: /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 3990)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 3991)
@@ -57,60 +57,3 @@
     }
 }
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.mappaint
 
-import java.awt.Color;
-
-import org.junit.*;
-import org.openstreetmap.josm.fixtures.JOSMFixture 
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy 
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.StaticLabelCompositionStrategy 
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy 
-class MapCSSWithExtendedTextDirectivesTest {
-    
-
-    @BeforeClass
-    public static void createJOSMFixture(){
-        JOSMFixture.createUnitTestFixture().init()
-    }
-
-    @Test
-    public void createAutoTextElement() {
-        Cascade c = new Cascade()
-        c.put("text", new Keyword("auto"))
-        
-        TextElement te = TextElement.create(c, Color.WHITE)
-        assert te.labelCompositionStrategy != null
-        assert te.labelCompositionStrategy instanceof DeriveLabelFromNameTagsCompositionStrategy
-    }
-    
-    @Test
-    public void createTextElementComposingTextFromTag() {
-        Cascade c = new Cascade()
-        c.put("text", "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)
-        assert te.labelCompositionStrategy != null
-        assert te.labelCompositionStrategy instanceof TagLookupCompositionStrategy
-        assert te.labelCompositionStrategy.getDefaultLabelTag() == "my_name"
-    }
-        
-    @Test
-    public void createNullStrategy() {
-        Cascade c = new Cascade()
-        
-        TextElement te = TextElement.create(c, Color.WHITE)
-        assert te.labelCompositionStrategy == null
-    }
-}