Ignore:
Timestamp:
2012-11-03T18:32:39+01:00 (13 years ago)
Author:
Don-vip
Message:

see #8172 - fix JUnit tests

Location:
trunk/test/unit/org/openstreetmap/josm/data/osm
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

    r4126 r5556  
    2020import org.openstreetmap.josm.data.Preferences;
    2121import org.openstreetmap.josm.data.coor.LatLon;
    22 import org.openstreetmap.josm.data.projection.Mercator;
     22import org.openstreetmap.josm.data.projection.Projections;
    2323
    2424public class DataSetMergerTest {
    … …  
    7676        their = new DataSet();
    7777        their.setVersion("0.6");
    78         Main.setProjection(new Mercator());
     78        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    7979    }
    8080

  • trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java

    r4126 r5556  
    1919import org.openstreetmap.josm.data.Preferences;
    2020import org.openstreetmap.josm.data.coor.LatLon;
    21 import org.openstreetmap.josm.data.projection.Mercator;
     21import org.openstreetmap.josm.data.projection.Projections;
    2222import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    2323import org.openstreetmap.josm.io.IllegalDataException;
    … …  
    2929    @BeforeClass
    3030    public static void setUp() {
    31         Main.setProjection(new Mercator());
     31        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    3232        Main.pref = new Preferences();
    3333    }

  • trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java

    r4126 r5556  
    1111import org.openstreetmap.josm.data.Preferences;
    1212import org.openstreetmap.josm.data.coor.LatLon;
    13 import org.openstreetmap.josm.data.projection.Mercator;
     13import org.openstreetmap.josm.data.projection.Projections;
    1414
    1515public class OsmPrimitiveTest {
    … …  
    2929    @BeforeClass
    3030    public static void setUp() {
    31         Main.setProjection(new Mercator());
     31        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    3232    }
    3333

  • trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java

    r4126 r5556  
    1616import org.openstreetmap.josm.data.Preferences;
    1717import org.openstreetmap.josm.data.coor.LatLon;
    18 import org.openstreetmap.josm.data.projection.Mercator;
     18import org.openstreetmap.josm.data.projection.Projections;
    1919import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
    2020import org.openstreetmap.josm.io.OsmReader;
    … …  
    6666    @Test
    6767    public void testRemove() throws Exception {
    68         Main.setProjection(new Mercator());
     68        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    6969        DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/restriction.osm"), NullProgressMonitor.INSTANCE);
    7070        removeAllTest(ds);
    … …  
    7373    @Test
    7474    public void testMove() throws Exception {
    75         Main.setProjection(new Mercator());
     75        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    7676        DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/restriction.osm"), NullProgressMonitor.INSTANCE);
    7777

  • trunk/test/unit/org/openstreetmap/josm/data/osm/RelationTest.java

    r4126 r5556  
    1010import org.openstreetmap.josm.data.Preferences;
    1111import org.openstreetmap.josm.data.coor.LatLon;
    12 import org.openstreetmap.josm.data.projection.Mercator;
     12import org.openstreetmap.josm.data.projection.Projections;
    1313
    1414public class RelationTest {
    … …  
    1616    @BeforeClass
    1717    public static void setUp() {
    18         Main.setProjection(new Mercator());
     18        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    1919        Main.pref = new Preferences();
    2020    }

  • trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java

    r4126 r5556  
    2121import org.openstreetmap.josm.data.osm.RelationMember;
    2222import org.openstreetmap.josm.data.osm.Way;
    23 import org.openstreetmap.josm.data.projection.Mercator;
     23import org.openstreetmap.josm.data.projection.Projections;
    2424
    2525public class MergeSourceBuildingVisitorTest {
    … …  
    3737    @BeforeClass
    3838    public static void setUp() {
    39         Main.setProjection(new Mercator());
     39        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    4040        Main.pref = new Preferences();
    4141    }
Note: See TracChangeset for help on using the changeset viewer.