Changeset 3988 in josm for trunk/test
- Timestamp:
- 2011-03-13T20:48:25+01:00 (14 years ago)
- Location:
- trunk/test
- Files:
-
- 4 added
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java
r2748 r3988 11 11 12 12 import org.openstreetmap.josm.Main; 13 import org.openstreetmap.josm.data. osm.DataSetMergerTest;13 import org.openstreetmap.josm.data.Preferences; 14 14 import org.openstreetmap.josm.data.projection.Mercator; 15 15 import org.openstreetmap.josm.io.OsmApi; … … 40 40 // 41 41 try { 42 testProperties.load( DataSetMergerTest.class.getResourceAsStream(testPropertiesResourceName));42 testProperties.load(JOSMFixture.class.getResourceAsStream(testPropertiesResourceName)); 43 43 } catch(Exception e){ 44 44 logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", testPropertiesResourceName)); … … 58 58 } 59 59 System.setProperty("josm.home", josmHome); 60 Main.pref = new Preferences(); 60 61 I18n.init(); 61 62 // initialize the plaform hook, and
Note:
See TracChangeset
for help on using the changeset viewer.