Changeset 18823 in josm for trunk/test/unit

Timestamp:

2023-09-06T22:04:23+02:00 (19 months ago)

Author:

taylor.smock

Message:

Improve performance for TaggingPresetSelector$PresetClassifications.getMatchingPresets

This was found when profiling with the Name Suggestion Index enabled.

The improvements are as follows:

• ~80% reduction in CPU usage
• ~85% reduction in memory allocations

A good chunk of the remaining cpu cycles and memory allocations is from the sort
operation.

Non-performance related changes are as follows:

• Add documentation
• Lint fixes

File:

• trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelectorTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelectorTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.extension.RegisterExtension;
+import java.util.Collections;
+
 import org.junit.jupiter.api.Test;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSelector.PresetClassification;
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -16 +13 @@
  */
 class TaggingPresetSelectorTest {
-
     /**
-     * Setup rule
-     */
-    @RegisterExtension
-    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
-
-    /**
-     * Unit test for {@link PresetClassification#isMatching}.
+     * Unit test for {@link TaggingPresetSelector.PresetClassifications#getMatchingPresets}.
      */
     @Test
-    void testIsMatching() {
+    void testGetMatching() {
         TaggingPreset preset = new TaggingPreset();
         preset.name = "estação de bombeiros"; // fire_station in brazilian portuguese
-        PresetClassification pc = new PresetClassification(preset);
-        assertEquals(0, pc.isMatchingName("foo"));
-        assertTrue(pc.isMatchingName("estação") > 0);
-        assertTrue(pc.isMatchingName("estacao") > 0);
+        TaggingPresetSelector.PresetClassifications presetClassifications = new TaggingPresetSelector.PresetClassifications();
+        presetClassifications.loadPresets(Collections.singleton(preset));
+        assertTrue(presetClassifications.getMatchingPresets(null, new String[] {"foo"}, false,
+                false, null, null).isEmpty());
+        assertSame(preset, presetClassifications.getMatchingPresets(null, new String[] {"estação"}, false,
+                false, null, null).get(0).preset);
+        assertSame(preset, presetClassifications.getMatchingPresets(null, new String[] {"estacao"}, false,
+                false, null, null).get(0).preset);
     }
 }