Changeset 6920 in josm for trunk/test/functional


Ignore:
Timestamp:
2014-03-21T17:31:18+01:00 (6 years ago)
Author:
Don-vip
Message:

fix #9778, fix #9806 - access OSM API and JOSM website in HTTPS by default + other HTTPS links where applicable + update CONTRIBUTION

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

Legend:

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

    r6471 r6920  
    1111
    1212import org.openstreetmap.josm.Main;
    13 import org.openstreetmap.josm.data.Preferences;
    1413import org.openstreetmap.josm.data.projection.Projections;
    1514import org.openstreetmap.josm.io.OsmApi;
     
    7372        //
    7473        String url = OsmApi.getOsmApi().getBaseUrl().toLowerCase().trim();
    75         if (url.startsWith("http://www.openstreetmap.org")
    76                 || url.startsWith("http://api.openstreetmap.org")) {
     74        if (url.startsWith("http://www.openstreetmap.org") || url.startsWith("http://api.openstreetmap.org")
     75            || url.startsWith("https://www.openstreetmap.org") || url.startsWith("https://api.openstreetmap.org")) {
    7776            fail(MessageFormat.format("configured server url ''{0}'' seems to be a productive url, aborting.", url));
    7877        }
  • trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

    r6881 r6920  
    189189        //
    190190        String url = OsmApi.getOsmApi().getBaseUrl().toLowerCase().trim();
    191         if (url.startsWith("http://www.openstreetmap.org")
    192                 || url.startsWith("http://api.openstreetmap.org")) {
     191        if (url.startsWith("http://www.openstreetmap.org") || url.startsWith("http://api.openstreetmap.org")
     192            || url.startsWith("https://www.openstreetmap.org") || url.startsWith("https://api.openstreetmap.org")) {
    193193            fail(MessageFormat.format("configured url ''{0}'' seems to be a productive url, aborting.", url));
    194194        }
    195 
    196195
    197196        String p = System.getProperties().getProperty("useCachedDataset");
  • trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

    r6881 r6920  
    196196        //
    197197        String url = OsmApi.getOsmApi().getBaseUrl().toLowerCase().trim();
    198         if (url.startsWith("http://www.openstreetmap.org")
    199                 || url.startsWith("http://api.openstreetmap.org")) {
     198        if (url.startsWith("http://www.openstreetmap.org") || url.startsWith("http://api.openstreetmap.org")
     199            || url.startsWith("https://www.openstreetmap.org") || url.startsWith("https://api.openstreetmap.org")) {
    200200            fail(MessageFormat.format("configured url ''{0}'' seems to be a productive url, aborting.", url));
    201201        }
    202 
    203202
    204203        String p = System.getProperties().getProperty("useCachedDataset");
Note: See TracChangeset for help on using the changeset viewer.