Changeset 9949 in josm for trunk/test/unit/org

Timestamp:

2016-03-07T21:45:35+01:00 (9 years ago)

Author:

Don-vip

Message:

remove deprecated stuff, code cleanup, javadoc, unit tests

Location:

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

Files:

• GpxLayerTest.java (added)
• gpx/ChooseTrackVisibilityActionTest.java (modified) (2 diffs)
• gpx/DownloadWmsAlongTrackActionTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java

@@ -5 +5 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.gui.layer.GpxLayer;
-import org.openstreetmap.josm.io.GpxReaderTest;
+import org.openstreetmap.josm.gui.layer.GpxLayerTest;
 
 /**
@@ -29 +26 @@
     @Test
     public void testAction() throws Exception {
-        final GpxData gpx = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "minimal.gpx");
-        GpxLayer gpxLayer = new GpxLayer(gpx);
-        ChooseTrackVisibilityAction action = new ChooseTrackVisibilityAction(gpxLayer);
-        action.actionPerformed(null);
+        new ChooseTrackVisibilityAction(GpxLayerTest.getMinimalGpxLayer()).actionPerformed(null);
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java

@@ -11 +11 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.gui.layer.GpxLayerTest;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.gpx.DownloadWmsAlongTrackAction.PrecacheWmsTask;
-import org.openstreetmap.josm.io.GpxReaderTest;
 
 /**
@@ -52 +51 @@
             assertTrue(TMSLayer.getCache().getMatching(".*").isEmpty());
             // Perform action
-            final GpxData gpx = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "minimal.gpx");
-            PrecacheWmsTask task = new DownloadWmsAlongTrackAction(gpx).createTask();
+            PrecacheWmsTask task = new DownloadWmsAlongTrackAction(GpxLayerTest.getMinimalGpxData()).createTask();
             assertNotNull(task);
             task.run();