Changeset 30568 in osm for applications/editors/josm/plugins/opendata/test/unit/org

Timestamp:

2014-08-06T19:33:57+02:00 (10 years ago)

Author:

donvip

Message:

[josm_opendata] add more unit tests, fix Java 7 warnings

Location:

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io

Files:

• NonRegFunctionalTests.java (modified) (2 diffs)
• archive (added)
• archive/ZipReaderTest.java (added)
• geographic/MifReaderTest.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/NonRegFunctionalTests.java

@@ -6 +6 @@
 import static org.junit.Assert.assertTrue;
 
+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 java.util.ArrayList;
 import java.util.Collection;
 
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -40 +48 @@
         assertTrue(found);
     }
+    
+    /**
+     * Lists all datasets files matching given extension.
+     * @param ext file extension to search for
+     * @returns List of all datasets files matching given extension
+     * @throws IOException in case of I/O error
+     */
+    public static Collection<Path> listDataFiles(String ext) throws IOException {
+        Collection<Path> result = new ArrayList<>();
+        addTree(Paths.get(TestUtils.getTestDataRoot()+"datasets"), result, ext.toLowerCase());
+        return result;
+    }
+    
+    static void addTree(Path directory, Collection<Path> all, String ext) throws IOException {
+        try (DirectoryStream<Path> ds = Files.newDirectoryStream(directory)) {
+            for (Path child : ds) {
+                if (Files.isDirectory(child)) {
+                    addTree(child, all, ext);
+                } else if (child.toString().toLowerCase().endsWith(ext)) {
+                    all.add(child);
+                }
+            }
+        } catch (DirectoryIteratorException ex) {
+            // I/O error encounted during the iteration, the cause is an IOException
+            throw ex.getCause();
+        }
+    }
 }

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReaderTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.opendata.core.io.geographic;
-
-import static org.junit.Assert.assertFalse;
 
 import java.io.File;
@@ -13 +11 @@
 import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.TestUtils;
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.plugins.opendata.core.io.NonRegFunctionalTests;
 
 /**
@@ -36 +34 @@
         File file = new File(TestUtils.getRegressionDataFile(9592, "bg.mif"));
         try (InputStream is = new FileInputStream(file)) {
-            DataSet ds = MifReader.parseDataSet(is, file, null, null);
-            assertFalse(ds.allPrimitives().isEmpty());
+            NonRegFunctionalTests.testGeneric(MifReader.parseDataSet(is, file, null, null));
         }
     }