8285405: add test and check for negative argument to HashMap::newHashMap et al

Reviewed-by: chegar, naoto, lancea, smarks

Author: jaikiran

src/java.base/share/classes/java/util/HashMap.java

@@ -2578,6 +2578,9 @@ static int calculateHashMapCapacity(int numMappings) {
      * @since 19
      */
     public static <K, V> HashMap<K, V> newHashMap(int numMappings) {
+        if (numMappings < 0) {
+            throw new IllegalArgumentException("Negative number of mappings: " + numMappings);
+        }
         return new HashMap<>(calculateHashMapCapacity(numMappings));
     }
 

src/java.base/share/classes/java/util/HashSet.java

@@ -394,6 +394,9 @@ public <T> T[] toArray(T[] a) {
      * @since 19
      */
     public static <T> HashSet<T> newHashSet(int numElements) {
+        if (numElements < 0) {
+            throw new IllegalArgumentException("Negative number of elements: " + numElements);
+        }
         return new HashSet<>(HashMap.calculateHashMapCapacity(numElements));
     }
 

src/java.base/share/classes/java/util/LinkedHashMap.java

@@ -810,6 +810,9 @@ final class LinkedEntryIterator extends LinkedHashIterator
      * @since 19
      */
     public static <K, V> LinkedHashMap<K, V> newLinkedHashMap(int numMappings) {
+        if (numMappings < 0) {
+            throw new IllegalArgumentException("Negative number of mappings: " + numMappings);
+        }
         return new LinkedHashMap<>(HashMap.calculateHashMapCapacity(numMappings));
     }
 

src/java.base/share/classes/java/util/LinkedHashSet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -215,6 +215,9 @@ public Spliterator<E> spliterator() {
      * @since 19
      */
     public static <T> LinkedHashSet<T> newLinkedHashSet(int numElements) {
+        if (numElements < 0) {
+            throw new IllegalArgumentException("Negative number of elements: " + numElements);
+        }
         return new LinkedHashSet<>(HashMap.calculateHashMapCapacity(numElements));
     }
 

src/java.base/share/classes/java/util/WeakHashMap.java

@@ -1357,6 +1357,9 @@ public int characteristics() {
      * @since 19
      */
     public static <K, V> WeakHashMap<K, V> newWeakHashMap(int numMappings) {
+        if (numMappings < 0) {
+            throw new IllegalArgumentException("Negative number of mappings: " + numMappings);
+        }
         return new WeakHashMap<>(HashMap.calculateHashMapCapacity(numMappings));
     }
 

test/jdk/java/util/HashMap/WhiteBoxResizeTest.java

@@ -29,7 +29,6 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.VarHandle;
-import java.lang.reflect.Field;
 import java.util.AbstractMap;
 import java.util.AbstractSet;
 import java.util.ArrayList;
@@ -44,10 +43,12 @@
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.function.Consumer;
+import java.util.function.IntFunction;
 import java.util.function.Supplier;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertThrows;
 
 /*
  * @test
@@ -426,4 +427,27 @@ public int capacity() {
         }
     }
 
+    @DataProvider(name = "negativeNumMappings")
+    public Iterator<Object[]> negativeNumMappings() {
+        final List<Object[]> methods = new ArrayList<>();
+        methods.add(new Object[] {(IntFunction<?>) HashMap::newHashMap, "HashMap::newHashMap"});
+        methods.add(new Object[] {(IntFunction<?>) LinkedHashMap::newLinkedHashMap,
+                "LinkedHashMap::newLinkedHashMap"});
+        methods.add(new Object[] {(IntFunction<?>) WeakHashMap::newWeakHashMap,
+                "WeakHashMap::newWeakHashMap"});
+        methods.add(new Object[] {(IntFunction<?>) HashSet::newHashSet, "HashSet::newHashSet"});
+        methods.add(new Object[] {(IntFunction<?>) LinkedHashSet::newLinkedHashSet,
+                "LinkedHashSet::newLinkedHashSet"});
+        return methods.iterator();
+    }
+
+    /**
+     * Tests that the APIs that take {@code numMappings} or {@code numElements} as a parameter for
+     * creating the collection instance (for example: {@link HashMap#newHashMap(int)}), throw
+     * an {@code IllegalArgumentException} when a negative value is passed to them
+     */
+    @Test(dataProvider = "negativeNumMappings")
+    public void testNegativeNumMappings(final IntFunction<?> method, final String methodName) {
+        assertThrows(IllegalArgumentException.class, () -> method.apply(-1));
+    }
 }