Changeset 7081 in josm for trunk/test/functional/org/openstreetmap/josm/gui/history

Timestamp:

2014-05-09T04:49:54+02:00 (11 years ago)

Author:

Don-vip

Message:

fixes for unit tests

File:

• trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (modified) (4 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
-import static org.junit.Assert.fail;
-
 import java.awt.BorderLayout;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-import java.util.Properties;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -16 +8 @@
 
 import org.junit.BeforeClass;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -21 +14 @@
 import org.openstreetmap.josm.data.osm.history.History;
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
-import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.OsmServerHistoryReader;
@@ -30 +22 @@
     static private Logger logger = Logger.getLogger(HistoryBrowserTest.class.getName());
 
-    static Properties testProperties;
-
     @BeforeClass
     static public void init() {
-        testProperties = new Properties();
-
-        // load properties
-        //
-        try (InputStream is = HistoryBrowserTest.class.getResourceAsStream("/test-functional-env.properties");) {
-            testProperties.load(is);
-        } catch(IOException e){
-            logger.log(Level.SEVERE, MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
-            fail(MessageFormat.format("failed to load property file ''{0}''", "test-functional-env.properties"));
-        }
-
-        // check josm.home
-        //
-        String josmHome = testProperties.getProperty("josm.home");
-        if (josmHome == null) {
-            fail(MessageFormat.format("property ''{0}'' not set in test environment", "josm.home"));
-        } else {
-            File f = new File(josmHome);
-            if (! f.exists() || ! f.canRead()) {
-                fail(MessageFormat.format("property ''{0}'' points to ''{1}'' which is either not existing or not readable", "josm.home", josmHome));
-            }
-        }
-        System.setProperty("josm.home", josmHome);
-        Main.pref.init(false);
-
-        // init projection
-        Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
+        JOSMFixture.createFunctionalTestFixture().init();
     }