Changeset 16595 in josm for trunk

Timestamp:

2020-06-11T08:40:11+02:00 (4 years ago)

Author:

simon04

Message:

Add unit test for Territories.getRegionalTaginfoUrls

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Territories.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/tools/Territories.java

@@ -188 +188 @@
 
     private static void initializeExternalData() {
+        initializeExternalData("Geofabrik",
+                Config.getUrls().getJOSMWebsite() + "/remote/geofabrik-index-v1-nogeom.json");
+    }
+
+    static void initializeExternalData(String source, String path) {
         taginfoGeofabrikCache = new TreeMap<>();
-        initializeExternalData(taginfoGeofabrikCache, "Geofabrik",
-                Config.getUrls().getJOSMWebsite() + "/remote/geofabrik-index-v1-nogeom.json");
-    }
-
-    static void initializeExternalData(Map<String, TaginfoRegionalInstance> cache, String source, String path) {
         try (CachedFile cf = new CachedFile(path); InputStream is = cf.getInputStream(); JsonParser json = Json.createParser(is)) {
             while (json.hasNext()) {
@@ -205 +205 @@
                             JsonArray iso2 = props.getJsonArray(ISO3166_2_LC);
                             if (iso1 != null) {
-                                readExternalTaginfo(cache, taginfo, iso1, source);
+                                readExternalTaginfo(taginfoGeofabrikCache, taginfo, iso1, source);
                             } else if (iso2 != null) {
-                                readExternalTaginfo(cache, taginfo, iso2, source);
+                                readExternalTaginfo(taginfoGeofabrikCache, taginfo, iso2, source);
                             }
                         })));

trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java

@@ -9 +9 @@
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 
 import org.junit.Rule;
@@ -35 +35 @@
     /**
      * Tests that {@code Territories} satisfies utility class criteria.
+     *
      * @throws ReflectiveOperationException if an error occurs
      */
@@ -61 +62 @@
     @Test
     public void testTaginfoGeofabrik_nominal() {
-        Map<String, TaginfoRegionalInstance> cache = new TreeMap<>();
-        Territories.initializeExternalData(cache, "foo", TestUtils.getTestDataRoot() + "/taginfo/geofabrik-index-v1-nogeom.json");
+        Territories.initializeExternalData("foo", TestUtils.getTestDataRoot() + "/taginfo/geofabrik-index-v1-nogeom.json");
+        Map<String, TaginfoRegionalInstance> cache = Territories.taginfoGeofabrikCache;
         assertEquals(5, cache.size());
         checkTaginfoInstance(cache.get("AF"), singleton("AF"), "https://taginfo.geofabrik.de/asia/afghanistan/");
@@ -70 +71 @@
         checkTaginfoInstance(cache.get("PS"), israelAndPalestine, "https://taginfo.geofabrik.de/asia/israel-and-palestine/");
         checkTaginfoInstance(cache.get("IL"), israelAndPalestine, "https://taginfo.geofabrik.de/asia/israel-and-palestine/");
+        List<TaginfoRegionalInstance> regionalTaginfo = Territories.getRegionalTaginfoUrls(new LatLon(41.3268733, 19.8187913));
+        assertEquals(1, regionalTaginfo.size());
+        checkTaginfoInstance(regionalTaginfo.iterator().next(), singleton("AL"), "https://taginfo.geofabrik.de/europe/albania/");
     }
 
@@ -83 +87 @@
     @Test
     public void testTaginfoGeofabrik_broken() {
-        Map<String, TaginfoRegionalInstance> cache = new TreeMap<>();
         Logging.clearLastErrorAndWarnings();
-        Territories.initializeExternalData(cache, "foo", TestUtils.getTestDataRoot() + "taginfo/geofabrik-index-v1-nogeom-broken.json");
+        Territories.initializeExternalData("foo", TestUtils.getTestDataRoot() + "taginfo/geofabrik-index-v1-nogeom-broken.json");
+        Map<String, TaginfoRegionalInstance> cache = Territories.taginfoGeofabrikCache;
         assertTrue(cache.isEmpty());
         String error = Logging.getLastErrorAndWarnings().get(0);