Changeset 16268 in josm for trunk

Timestamp:

2020-04-12T11:27:14+02:00 (5 years ago)

Author:

simon04

Message:

see #15943 - SearchDialog: fix search hint to search for existing key

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java

@@ -292 +292 @@
                 GBC.eol());
         hintPanel.add(new SearchKeywordRow(hcbSearchString)
-                .addKeyword("<i>key</i>", null, tr("matches if ''key'' exists"))
+                .addKeyword("<i>key:</i>", null, tr("matches if ''key'' exists"))
                 .addKeyword("<i>key</i>=<i>value</i>", null, tr("''key'' with exactly ''value''"))
                 .addKeyword("<i>key</i>~<i>regexp</i>", null, tr("value of ''key'' matching the regular expression ''regexp''"))

trunk/test/unit/org/openstreetmap/josm/data/osm/search/SearchCompilerTest.java

@@ -540 +540 @@
 
     /**
+     * Test whether a key exists.
+     * @throws SearchParseError never
+     */
+    @Test
+    public void testKeyExists15943() throws SearchParseError {
+        Match matcher = SearchCompiler.compile("surface:");
+        assertTrue(matcher.match(new Tag("surface", "")));
+        assertTrue(matcher.match(new Tag("surface", "wood")));
+        assertFalse(matcher.match(new Tag("surface:source", "xxx")));
+        assertFalse(matcher.match(new Tag("foo", "bar")));
+        assertFalse(matcher.match(new Tag("name", "foo:surface:bar")));
+    }
+
+    /**
      * Unit test of {@link SearchCompiler.ExactKeyValue.Mode} enum.
      */