Changeset 3988 in josm

Timestamp:

Mar 13, 2011 8:48:25 PM (2 years ago)

Author:

bastiK

Message:

added tests (patch by anonymous, see #6107)

Location:

trunk/test

Files:

• functional/org/openstreetmap/josm/fixtures/JOSMFixture.java (modified) (3 diffs)
• unit/org/openstreetmap/josm/gui/mappaint (added)
• unit/org/openstreetmap/josm/gui/mappaint/AllMappaintTests.groovy (added)
• unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy (added)
• unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy (added)

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

@@ -11 +11 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.DataSetMergerTest;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.io.OsmApi;
@@ -40 +40 @@
         //
         try {
-            testProperties.load(DataSetMergerTest.class.getResourceAsStream(testPropertiesResourceName));
+            testProperties.load(JOSMFixture.class.getResourceAsStream(testPropertiesResourceName));
         } catch(Exception e){
             logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", testPropertiesResourceName));
@@ -58 +58 @@
         }
         System.setProperty("josm.home", josmHome);
+        Main.pref = new Preferences();
         I18n.init();
         // initialize the plaform hook, and