Changeset 14015 in josm for trunk

Timestamp:

2018-07-08T02:42:00+02:00 (6 years ago)

Author:

Don-vip

Message:

add unit tests on nominatim area name resolution

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/OverpassDownloadReader.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/io/NameFinderTest.java (added)
• test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

@@ -13 +13 @@
 import java.util.Arrays;
 import java.util.EnumMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -281 +282 @@
 
     private static SearchResult searchName(String area) throws IOException {
-        return NameFinder.queryNominatim(area).stream().filter(
+        return searchName(NameFinder.queryNominatim(area));
+    }
+
+    static SearchResult searchName(List<SearchResult> results) {
+        return results.stream().filter(
                 x -> !OsmPrimitiveType.NODE.equals(x.getOsmId().getType())).iterator().next();
     }
@@ -292 +297 @@
         idOffset.put(OsmPrimitiveType.RELATION, 3_600_000_000L);
         final PrimitiveId osmId = searchName(area).getOsmId();
+        Logging.debug("Area '{0}' resolved to {1}", area, osmId);
         return String.format("area(%d)", osmId.getUniqueId() + idOffset.get(osmId.getType()));
     }

trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java

@@ -11 +11 @@
 import static org.junit.Assert.assertTrue;
 
+import java.io.StringReader;
 import java.time.LocalDateTime;
 import java.util.regex.Matcher;
@@ -217 +218 @@
                 "out body;"));
     }
+
+    /**
+     * Unit test of {@link OverpassDownloadReader#searchName(java.util.List)}
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testSearchName() throws Exception {
+        try (StringReader reader = new StringReader(NameFinderTest.SAMPLE)) {
+            assertEquals(1942586L,
+                    OverpassDownloadReader.searchName(NameFinder.parseSearchResults(reader)).getOsmId().getUniqueId());
+        }
+    }
 }