Changeset 9279 in josm for trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.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/LabelCompositionStrategyTest.groovy (modified) (2 diffs)

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

@@ -3 +3 @@
 
 import org.junit.*
-import org.openstreetmap.josm.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;
+import org.openstreetmap.josm.JOSMFixture
+import org.openstreetmap.josm.data.osm.Node
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.StaticLabelCompositionStrategy
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy
 
 class LabelCompositionStrategyTest {
-    
+
     @BeforeClass
     public static void createJOSMFixture(){
@@ -19 +19 @@
     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"        
+        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 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")        
+        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"        
+        assert strat.compose(n) == "my name"
     }
 }