Changeset 3988 in josm for trunk/test/functional


Ignore:
Timestamp:
2011-03-13T20:48:25+01:00 (9 years ago)
Author:
bastiK
Message:

added tests (patch by anonymous, see #6107)

File:
1 edited

Legend:

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

    r2748 r3988  
    1111
    1212import org.openstreetmap.josm.Main;
    13 import org.openstreetmap.josm.data.osm.DataSetMergerTest;
     13import org.openstreetmap.josm.data.Preferences;
    1414import org.openstreetmap.josm.data.projection.Mercator;
    1515import org.openstreetmap.josm.io.OsmApi;
     
    4040        //
    4141        try {
    42             testProperties.load(DataSetMergerTest.class.getResourceAsStream(testPropertiesResourceName));
     42            testProperties.load(JOSMFixture.class.getResourceAsStream(testPropertiesResourceName));
    4343        } catch(Exception e){
    4444            logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", testPropertiesResourceName));
     
    5858        }
    5959        System.setProperty("josm.home", josmHome);
     60        Main.pref = new Preferences();
    6061        I18n.init();
    6162        // initialize the plaform hook, and
Note: See TracChangeset for help on using the changeset viewer.