Changeset 30558 in osm for applications/editors/josm

Timestamp:

2014-08-04T21:31:18+02:00 (10 years ago)

Author:

donvip

Message:

[josm_elevation] fix unit test

Location:

applications/editors/josm/plugins/ElevationProfile

Files:

• .classpath (modified) (1 diff)
• README (modified) (1 diff)
• test/data/N50E008.hgt (added)
• test/data/N50E009.hgt (added)
• test/unit/org/openstreetmap/josm/plugins/elevation/tests/HgtReaderTest.java (modified) (2 diffs)

applications/editors/josm/plugins/ElevationProfile/.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="src" path="test/unit"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>

applications/editors/josm/plugins/ElevationProfile/README

@@ -6 +6 @@
 For detailed instructions please refer to http://wiki.openstreetmap.org/wiki/JOSM/Plugins/ElevationProfile.
 
+SRTM data in test/data is downloaded from http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/Eurasia/
+
 Please report bugs to oliver.wieland@online.de.

applications/editors/josm/plugins/ElevationProfile/test/unit/org/openstreetmap/josm/plugins/elevation/tests/HgtReaderTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.elevation.tests;
 
+import java.io.IOException;
+import java.nio.file.DirectoryIteratorException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import junit.framework.TestCase;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.elevation.HgtReader;
@@ -13 +20 @@
     /**
      * Setup test.
+     * @throws IOException if SRTM files cannot be installed
      */
     @Override
-    public void setUp() {
-        Main.pref = new Preferences();
+    public void setUp() throws IOException {
+        JOSMFixture.createUnitTestFixture().init();
+        // Install SRTM files to plugin directory
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(Paths.get(TestUtils.getTestDataRoot()), "*.hgt")) {
+            Path dir = Paths.get(System.getProperty("josm.home")).resolve("elevation");
+            if (!Files.exists(dir)) {
+                Files.createDirectory(dir);
+            }
+            for (Path src: stream) {
+                Path dst = dir.resolve(src.getFileName());
+                if (!Files.exists(dst)) {
+                    Files.copy(src, dst);
+                }
+            }
+        } catch (DirectoryIteratorException ex) {
+            // I/O error encounted during the iteration, the cause is an IOException
+            throw ex.getCause();
+        }
     }