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

Timestamp:

2023-10-03T16:25:42+02:00 (15 months ago)

Author:

taylor.smock

Message:

Fix #23212: Overpass query wizard should transform key: to ["key"] instead of [~"key"~""]

This is fixed by using ExactKeyValue instead of KeyValue for key: queries.
As a happy side effect, this significantly reduces the cost of key: queries.
In a test area ("Mesa County, Colorado"), this reduces the cpu time from 2600ms
to 200ms and reduces memory allocations from 425mb to effectively 0 for a name:
query.

In addition, this simplifies many equals methods by converting the following
pattern to Objects.equals(first, second):

if (first == null) {
    if (second != null) {
        return true;
    }
} else if (!first.equals(second))
    return false;
return true;

There are some additional changes, mostly related to documentation and lint
issues.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/osm/search/SearchCompilerTest.java (modified) (3 diffs)
• tools/SearchCompilerQueryWizardTest.java (modified) (2 diffs)

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

@@ -22 +22 @@
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.openstreetmap.josm.TestUtils;
@@ -45 +46 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Key;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
-import org.openstreetmap.josm.tools.Logging;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -745 +745 @@
     }
 
+    static Set<Class<? extends Match>> testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
+        final Set<Class<? extends Match>> matchers = TestUtils.getJosmSubtypes(Match.class);
+        assertTrue(matchers.size() >= 10, "There should be at least 10 matchers from JOSM core");
+        return matchers;
+    }
+
     /**
      * Unit test of methods {@link Match#equals} and {@link Match#hashCode}, including all subclasses.
-     */
-    @Test
-    void testEqualsContract() {
-        TestUtils.assumeWorkingEqualsVerifier();
-        Set<Class<? extends Match>> matchers = TestUtils.getJosmSubtypes(Match.class);
-        assertTrue(matchers.size() >= 10); // if it finds less than 10 classes, something is broken
-        for (Class<?> c : matchers) {
-            Logging.debug(c.toString());
-            EqualsVerifier.forClass(c).usingGetClass()
-                .suppress(Warning.NONFINAL_FIELDS, Warning.INHERITED_DIRECTLY_FROM_OBJECT)
-                .withPrefabValues(TaggingPreset.class, newTaggingPreset("foo"), newTaggingPreset("bar"))
-                .verify();
-        }
+     * @param clazz The class to test
+     */
+    @ParameterizedTest
+    @MethodSource
+    void testEqualsContract(Class<? extends Match> clazz) {
+        EqualsVerifier.forClass(clazz).usingGetClass()
+            .suppress(Warning.NONFINAL_FIELDS, Warning.INHERITED_DIRECTLY_FROM_OBJECT)
+            .withPrefabValues(TaggingPreset.class, newTaggingPreset("foo"), newTaggingPreset("bar"))
+            .verify();
     }
 

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

@@ -7 +7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.openstreetmap.josm.testutils.annotations.I18n;
 
 /**
  * Unit tests of {@link SearchCompilerQueryWizard} class.
  */
+@I18n("de")
 class SearchCompilerQueryWizardTest {
-    /**
-     * Base test environment is enough
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().i18n("de");
-
     private static String constructQuery(String s) {
         return SearchCompilerQueryWizard.constructQuery(s);
@@ -264 +255 @@
                 "type:node AND (*=forward OR *=backward)");
     }
+
+    /**
+     * Test for ticket <a href="https://josm.openstreetmap.de/ticket/23212>#23212</a>.
+     * {@code key:} search should become {@code nwr["key"]}
+     */
+    @Test
+    void testTicket23212() {
+        assertQueryEquals("  nwr[\"name\"];\n", "name:");
+    }
 }