Changeset 17988 in josm for trunk/test

Timestamp:

2021-07-10T23:26:59+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21021 - proper fix of "newer" keyword, handling both formats (date and duration)

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• io/OverpassDownloadReaderTest.java (modified) (1 diff)
• tools/SearchCompilerQueryWizardTest.java (modified) (1 diff)

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

@@ -120 +120 @@
     @Test
     public void testDateNewer() {
-        final String query = getExpandedQuery("type:node and newer:3minutes");
+        String query = getExpandedQuery("type:node and newer:3minutes");
         String statement = query.substring(query.indexOf("node(newer:\"") + 12, query.lastIndexOf("\");"));
+        assertNotNull(DateUtils.fromString(statement));
+
+        query = getExpandedQuery("type:node and newer:\"2021-05-30T20:00:00Z\"");
+        statement = query.substring(query.indexOf("node(newer:\"") + 12, query.lastIndexOf("\");"));
         assertNotNull(DateUtils.fromString(statement));
     }

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

@@ -221 +221 @@
     @Test
     void testNewer() {
-        assertQueryEquals("  nwr(newer:\"2021-05-30T20:00:00Z\");\n",
+        assertQueryEquals("  nwr(newer:\"{{date:3minutes}}\");\n",
+                "newer:3minutes");
+
+        assertQueryEquals("  nwr(newer:\"{{date:2021-05-30T20:00:00Z}}\");\n",
                 "newer:\"2021-05-30T20:00:00Z\"");
     }