Changeset 12714 in josm for trunk/test/unit/org/openstreetmap/josm/io

Timestamp:

2017-09-03T21:14:05+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15228 - Support missing Overpass Turbo extended shortcuts: {{center}}, {{date:string}}, {{geocodeId:name}}, {{geocodeBbox:name}}, {{geocodeCoords:name}}

File:

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

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

@@ -7 +7 @@
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
+import java.time.LocalDateTime;
 import java.util.regex.Matcher;
 
@@ -20 +22 @@
 import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
@@ -87 +90 @@
 
     /**
+     * Tests evaluating the extended query feature {@code date}.
+     */
+    @Test
+    public void testDate() {
+        LocalDateTime from = LocalDateTime.of(2017, 7, 14, 2, 40);
+        assertEquals("2016-07-14T02:40:00Z", OverpassDownloadReader.date("1 year", from));
+        assertEquals("2007-07-14T02:40:00Z", OverpassDownloadReader.date("10years", from));
+        assertEquals("2017-06-14T02:40:00Z", OverpassDownloadReader.date("1 month", from));
+        assertEquals("2016-09-14T02:40:00Z", OverpassDownloadReader.date("10months", from));
+        assertEquals("2017-07-07T02:40:00Z", OverpassDownloadReader.date("1 week", from));
+        assertEquals("2017-05-05T02:40:00Z", OverpassDownloadReader.date("10weeks", from));
+        assertEquals("2017-07-13T02:40:00Z", OverpassDownloadReader.date("1 day", from));
+        assertEquals("2017-07-04T02:40:00Z", OverpassDownloadReader.date("10days", from));
+        assertEquals("2017-07-14T01:40:00Z", OverpassDownloadReader.date("1 hour", from));
+        assertEquals("2017-07-13T16:40:00Z", OverpassDownloadReader.date("10hours", from));
+        assertEquals("2017-07-14T02:39:00Z", OverpassDownloadReader.date("1 minute", from));
+        assertEquals("2017-07-14T02:30:00Z", OverpassDownloadReader.date("10minutes", from));
+        assertEquals("2017-07-14T02:39:59Z", OverpassDownloadReader.date("1 second", from));
+        assertEquals("2017-07-14T02:39:50Z", OverpassDownloadReader.date("10seconds", from));
+
+        assertEquals("2016-07-13T02:40:00Z", OverpassDownloadReader.date("1 year 1 day", from));
+        assertEquals("2016-07-14T02:38:20Z", OverpassDownloadReader.date("1 year 100 seconds", from));
+        assertEquals("2017-07-13T02:38:20Z", OverpassDownloadReader.date("1 day  100 seconds", from));
+    }
+
+    /**
+     * Tests evaluating the extended query feature {@code date} through {@code newer:} operator.
+     */
+    @Test
+    public void testDateNewer() {
+        final String query = getExpandedQuery("type:node and newer:3minutes");
+        String statement = query.substring(query.indexOf("node(newer:\"") + 12, query.lastIndexOf("\");"));
+        assertNotNull(DateUtils.fromString(statement));
+    }
+
+    /**
      * Tests evaluating the extended query feature {@code geocodeArea}.
      */