Changeset 7068 in josm for trunk/test/unit/org/openstreetmap/josm/gui/mappaint

Timestamp:

2014-05-06T01:24:41+02:00 (11 years ago)

Author:

Don-vip

Message:

test cleanup

Location:

trunk/test/unit/org/openstreetmap/josm/gui/mappaint

Files:

• LabelCompositionStrategyTest.groovy (modified) (1 diff)
• MapCSSWithExtendedTextDirectivesTest.groovy (modified) (1 diff)
• mapcss/ChildOrParentSelectorTest.groovy (modified) (2 diffs)
• mapcss/KeyConditionTest.groovy (modified) (2 diffs)
• mapcss/KeyValueConditionTest.groovy (modified) (2 diffs)
• mapcss/MapCSSParserTest.groovy (modified) (1 diff)
• mapcss/ParsingLinkSelectorTest.groovy (modified) (1 diff)

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

@@ -3 +3 @@
 
 import org.junit.*
-import org.openstreetmap.josm.fixtures.JOSMFixture;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy 
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.StaticLabelCompositionStrategy;

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

@@ -4 +4 @@
 
 import org.junit.*
-import org.openstreetmap.josm.fixtures.JOSMFixture
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy
 import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy

@@ -7 +7 @@
 
 import org.junit.*
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
@@ -13 +14 @@
 import org.openstreetmap.josm.data.osm.RelationMember
 import org.openstreetmap.josm.data.osm.Way
-import org.openstreetmap.josm.fixtures.JOSMFixture
 import org.openstreetmap.josm.gui.mappaint.Environment
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector.ChildOrParentSelector

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy

@@ -5 +5 @@
 
 import org.junit.*
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
@@ -10 +11 @@
 import org.openstreetmap.josm.data.osm.Relation
 import org.openstreetmap.josm.data.osm.RelationMember
-import org.openstreetmap.josm.fixtures.JOSMFixture
 import org.openstreetmap.josm.gui.mappaint.Environment
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy

@@ -5 +5 @@
 
 import org.junit.*
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet
@@ -10 +11 @@
 import org.openstreetmap.josm.data.osm.Relation
 import org.openstreetmap.josm.data.osm.RelationMember
-import org.openstreetmap.josm.fixtures.JOSMFixture
 import org.openstreetmap.josm.gui.mappaint.Environment
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.groovy

@@ -5 +5 @@
 import org.junit.Before
 import org.junit.Test
-import org.openstreetmap.TestUtils
 import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon
 import org.openstreetmap.josm.data.osm.DataSet

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ParsingLinkSelectorTest.groovy

@@ -5 +5 @@
 
 import org.junit.*
-import org.openstreetmap.josm.fixtures.JOSMFixture
+import org.openstreetmap.josm.JOSMFixture;