Changeset 2585 in josm for trunk

Timestamp:

2009-12-06T14:16:24+01:00 (14 years ago)

Author:

jttt

Message:

Disable loading of josm properties in DataSetMergerTest - do not seem to be necessary and do not allow to run tests with extra configuration

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

@@ -6 +6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.text.MessageFormat;
+
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.projection.Mercator;
 
 public class DataSetMergerTest {
-    private static Logger logger = Logger.getLogger(DataSetMergerTest.class.getName());
+    /*private static Logger logger = Logger.getLogger(DataSetMergerTest.class.getName());
 
     static Properties testProperties;
@@ -62 +53 @@
         // init projection
         Main.proj = new Mercator();
-    }
+    }*/
 
     @Before