Changeset 12850 in josm


Ignore:
Timestamp:
2017-09-14T00:50:48+02:00 (2 months ago)
Author:
bastiK
Message:

see #15229 - use Config in functional tests

Location:
trunk/test/functional/org/openstreetmap/josm/io
Files:
3 edited

Legend:

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

    r12842 r12850  
    2828import org.junit.rules.Timeout;
    2929import org.openstreetmap.josm.JOSMFixture;
    30 import org.openstreetmap.josm.Main;
    3130import org.openstreetmap.josm.data.coor.LatLon;
    3231import org.openstreetmap.josm.data.osm.Changeset;
     
    3837import org.openstreetmap.josm.data.osm.Way;
    3938import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
     39import org.openstreetmap.josm.spi.preferences.Config;
    4040
    4141import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
     
    153153        JOSMFixture.createFunctionalTestFixture().init();
    154154
    155         Main.pref.put("osm-server.auth-method", "basic");
     155        Config.getPref().put("osm-server.auth-method", "basic");
    156156
    157157        // don't use atomic upload, the test API server can't cope with large diff uploads
    158         Main.pref.putBoolean("osm-server.atomic-upload", false);
     158        Config.getPref().putBoolean("osm-server.atomic-upload", false);
    159159
    160160        File dataSetCacheOutputFile = new File(System.getProperty("java.io.tmpdir"),
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r12842 r12850  
    4040import org.openstreetmap.josm.data.projection.Projections;
    4141import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
     42import org.openstreetmap.josm.spi.preferences.Config;
    4243import org.openstreetmap.josm.tools.Logging;
    4344
     
    161162        JOSMFixture.createFunctionalTestFixture().init();
    162163
    163         Main.pref.put("osm-server.auth-method", "basic");
     164        Config.getPref().put("osm-server.auth-method", "basic");
    164165
    165166        // don't use atomic upload, the test API server can't cope with large diff uploads
    166167        //
    167         Main.pref.putBoolean("osm-server.atomic-upload", false);
     168        Config.getPref().putBoolean("osm-server.atomic-upload", false);
    168169        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
    169170        Logging.setLogLevel(Logging.LEVEL_DEBUG);
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java

    r8622 r12850  
    77import org.junit.Test;
    88import org.openstreetmap.josm.JOSMFixture;
    9 import org.openstreetmap.josm.Main;
    109import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
    1110import org.openstreetmap.josm.data.osm.history.History;
    1211import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
    1312import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
     13import org.openstreetmap.josm.spi.preferences.Config;
    1414
    1515/**
     
    2424    public static void init() {
    2525        JOSMFixture.createUnitTestFixture().init();
    26         Main.pref.put("osm-server.url", OsmApi.DEFAULT_API_URL);
     26        Config.getPref().put("osm-server.url", OsmApi.DEFAULT_API_URL);
    2727    }
    2828
Note: See TracChangeset for help on using the changeset viewer.