Changeset 15324 in josm

Timestamp:

2019-08-27T20:34:29+02:00 (5 years ago)

Author:

Don-vip

Message:

see #18035 - validate arguments in SelectCommand constructor

Location:

trunk

Files:

• src/org/openstreetmap/josm/command/SelectCommand.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/command/SelectCommandTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/SelectCommand.java

@@ -35 +35 @@
         if (newSelection == null || newSelection.isEmpty()) {
             this.newSelection = Collections.emptySet();
+        } else if (newSelection.contains(null)) {
+            throw new IllegalArgumentException("null primitive in selection");
         } else {
             this.newSelection = new HashSet<>(newSelection);

trunk/test/unit/org/openstreetmap/josm/command/SelectCommandTest.java

@@ -161 +161 @@
             .verify();
     }
+
+    /**
+     * Unit test of {@link SelectCommand#SelectCommand}.
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testConstructorIAE() {
+        new SelectCommand(new DataSet(), Arrays.asList(new OsmPrimitive[] {null}));
+    }
 }