Changeset 17587 in josm for trunk

Timestamp:

2021-03-18T01:49:10+01:00 (4 years ago)

Author:

simon04

Message:

see #20613 - AbstractPrimitive.keySet/keys: fix fast path for single key

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -650 +650 @@
             return Collections.emptySet();
         }
-        if (keys.length == 1) {
+        if (keys.length == 2) {
             return Collections.singleton(keys[0]);
         }
@@ -666 +666 @@
         if (k == null) {
             return Stream.empty();
-        } else if (k.length == 1) {
+        } else if (k.length == 2) {
             return Stream.of(k[0]);
         } else {

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -12 +13 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.util.Collections;
+import java.util.HashSet;
 
 /**
@@ -50 +54 @@
 
         testGetKey(n, "akey", "avalue");
+        assertEquals(Collections.singleton("akey"), n.keySet());
+        assertNotEquals(HashSet.class, n.keySet().getClass()); // expect Collections.singleton
+
     }