Changeset 16595 in josm for trunk/test

Timestamp:

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

Author:

simon04

Message:

Add unit test for Territories.getRegionalTaginfoUrls

File:

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

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);