Changeset 11916 in josm for trunk/test/unit/org/openstreetmap/josm

Timestamp:

2017-04-15T16:15:28+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14653 - add support for multiple Overpass API output formats

File:

• trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Rule;
@@ -8 +9 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
+import org.openstreetmap.josm.io.OverpassDownloadReader.OverpassOutpoutFormat;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
@@ -77 +79 @@
         assertEquals("// Failed to evaluate {{geocodeArea:foo-bar-baz-does-not-exist}}\n", query);
     }
+
+    /**
+     * Tests evaluating the overpass output format statements.
+     */
+    @Test
+    public void testOutputFormatStatement() {
+        for (OverpassOutpoutFormat oof : OverpassOutpoutFormat.values()) {
+            assertTrue(OverpassDownloadReader.OUTPUT_FORMAT_STATEMENT.matcher("[out:"+oof.getDirective()+"]").matches());
+        }
+
+        assertTrue(OverpassDownloadReader.OUTPUT_FORMAT_STATEMENT.matcher(
+                "[out:pbf][timeout:25][bbox:{{bbox}}];\n" +
+                "(\n" +
+                "  node[\"amenity\"=\"pharmacy\"];\n" +
+                "  way[\"amenity\"=\"pharmacy\"];\n" +
+                "  relation[\"amenity\"=\"pharmacy\"];\n" +
+                ");\n" +
+                "(._;>;);\n" +
+                "out meta;").matches());
+    }
 }