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

see #8172 - fix JUnit tests

Location:
trunk/test/functional/org/openstreetmap/josm
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java

    r4126 r5556  
    1212import org.openstreetmap.josm.Main;
    1313import org.openstreetmap.josm.data.Preferences;
    14 import org.openstreetmap.josm.data.projection.Mercator;
     14import org.openstreetmap.josm.data.projection.Projections;
    1515import org.openstreetmap.josm.io.OsmApi;
    1616import org.openstreetmap.josm.tools.I18n;
    … …  
    6868
    6969        // init projection
    70         Main.setProjection(new Mercator());
     70        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    7171
    7272        // make sure we don't upload to or test against production

  • trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

    r4126 r5556  
    1111import org.openstreetmap.josm.data.osm.Node;
    1212import org.openstreetmap.josm.data.osm.OsmPrimitive;
    13 import org.openstreetmap.josm.data.projection.Epsg4326;
     13import org.openstreetmap.josm.data.projection.Projections;
    1414
    1515public class PropertiesMergerTest extends JFrame{
    … …  
    1818
    1919    protected void build() {
    20         Main.setProjection(new Epsg4326());
     20        Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); // WGS 84
    2121
    2222        setLayout(new BorderLayout());

  • trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java

    r4126 r5556  
    1919import org.openstreetmap.josm.data.osm.history.History;
    2020import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
    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.OsmServerHistoryReader;
    … …  
    5858
    5959        // init projection
    60         Main.setProjection(new Mercator());
     60        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    6161    }
    6262

  • trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

    r4126 r5556  
    3131import org.openstreetmap.josm.data.osm.RelationMember;
    3232import org.openstreetmap.josm.data.osm.Way;
    33 import org.openstreetmap.josm.data.projection.Mercator;
     33import org.openstreetmap.josm.data.projection.Projections;
    3434import org.openstreetmap.josm.gui.io.UploadStrategy;
    3535import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
    … …  
    176176        //
    177177        Main.pref.put("osm-server.atomic-upload", false);
    178         Main.setProjection(new Mercator());
     178        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    179179
    180180        File dataSetCacheOutputFile = new File(tempOutputDir, MultiFetchServerObjectReaderTest.class.getName() + ".dataset");

  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r4126 r5556  
    3232import org.openstreetmap.josm.data.osm.RelationMember;
    3333import org.openstreetmap.josm.data.osm.Way;
    34 import org.openstreetmap.josm.data.projection.Mercator;
     34import org.openstreetmap.josm.data.projection.Projections;
    3535import org.openstreetmap.josm.gui.io.UploadStrategy;
    3636import org.openstreetmap.josm.gui.io.UploadStrategySpecification;
    … …  
    183183        //
    184184        Main.pref.put("osm-server.atomic-upload", false);
    185         Main.setProjection(new Mercator());
     185        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    186186
    187187        File dataSetCacheOutputFile = new File(tempOutputDir, MultiFetchServerObjectReaderTest.class.getName() + ".dataset");
Note: See TracChangeset for help on using the changeset viewer.