Changeset 9949 in josm for trunk/test


Ignore:
Timestamp:
2016-03-07T21:45:35+01:00 (4 years ago)
Author:
Don-vip
Message:

remove deprecated stuff, code cleanup, javadoc, unit tests

Location:
trunk/test/unit/org/openstreetmap/josm/gui/layer
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityActionTest.java

    r9816 r9949  
    55import org.junit.Test;
    66import org.openstreetmap.josm.JOSMFixture;
    7 import org.openstreetmap.josm.TestUtils;
    8 import org.openstreetmap.josm.data.gpx.GpxData;
    9 import org.openstreetmap.josm.gui.layer.GpxLayer;
    10 import org.openstreetmap.josm.io.GpxReaderTest;
     7import org.openstreetmap.josm.gui.layer.GpxLayerTest;
    118
    129/**
     
    2926    @Test
    3027    public void testAction() throws Exception {
    31         final GpxData gpx = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "minimal.gpx");
    32         GpxLayer gpxLayer = new GpxLayer(gpx);
    33         ChooseTrackVisibilityAction action = new ChooseTrackVisibilityAction(gpxLayer);
    34         action.actionPerformed(null);
     28        new ChooseTrackVisibilityAction(GpxLayerTest.getMinimalGpxLayer()).actionPerformed(null);
    3529    }
    3630}
  • trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java

    r9719 r9949  
    1111import org.openstreetmap.josm.JOSMFixture;
    1212import org.openstreetmap.josm.Main;
    13 import org.openstreetmap.josm.TestUtils;
    1413import org.openstreetmap.josm.data.gpx.GpxData;
    1514import org.openstreetmap.josm.data.imagery.ImageryInfo;
     15import org.openstreetmap.josm.gui.layer.GpxLayerTest;
    1616import org.openstreetmap.josm.gui.layer.TMSLayer;
    1717import org.openstreetmap.josm.gui.layer.gpx.DownloadWmsAlongTrackAction.PrecacheWmsTask;
    18 import org.openstreetmap.josm.io.GpxReaderTest;
    1918
    2019/**
     
    5251            assertTrue(TMSLayer.getCache().getMatching(".*").isEmpty());
    5352            // Perform action
    54             final GpxData gpx = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "minimal.gpx");
    55             PrecacheWmsTask task = new DownloadWmsAlongTrackAction(gpx).createTask();
     53            PrecacheWmsTask task = new DownloadWmsAlongTrackAction(GpxLayerTest.getMinimalGpxData()).createTask();
    5654            assertNotNull(task);
    5755            task.run();
Note: See TracChangeset for help on using the changeset viewer.