--- jsr166/src/test/jtreg/util/Collections/CheckedMapBash.java	2009/09/01 01:24:16	1.1
+++ jsr166/src/test/jtreg/util/Collections/CheckedMapBash.java	2015/10/18 17:34:26	1.10
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -16,92 +16,100 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 /*
  * @test
- * @bug     4904067 5023830
+ * @bug     4904067 5023830 7129185 8072015
  * @summary Unit test for Collections.checkedMap
  * @author  Josh Bloch
+ * @run testng CheckedMapBash
+ * @key randomness
  */
 
 import java.util.*;
+import java.util.function.Supplier;
+import org.testng.annotations.Test;
+import org.testng.annotations.DataProvider;
+
+import static org.testng.Assert.fail;
+import static org.testng.Assert.assertTrue;
 
 public class CheckedMapBash {
-    static Random rnd = new Random();
-    static Object nil = new Integer(0);
+    static final Random rnd = new Random();
+    static final Object nil = new Integer(0);
+    static final int numItr = 100;
+    static final int mapSize = 100;
+
+    @Test(dataProvider = "Bash.Supplier<Map<Integer,Integer>>")
+    public static void testCheckedMap(String description, Supplier<Map<Integer,Integer>> supplier) {
+        Map m = supplier.get();
+        Object head = nil;
+
+        for (int j=0; j<mapSize; j++) {
+            Object newHead;
+            do {
+                newHead = new Integer(rnd.nextInt());
+            } while (m.containsKey(newHead) || newHead.equals(nil));
+            m.put(newHead, head);
+            head = newHead;
+        }
+        if (m.size() != mapSize)
+            fail("Size not as expected.");
 
-    public static void main(String[] args) {
-        int numItr = 100;
-        int mapSize = 100;
-
-        // Linked List test
-        for (int i=0; i<numItr; i++) {
-            Map m = newMap();
-            Object head = nil;
-
-            for (int j=0; j<mapSize; j++) {
-                Object newHead;
-                do {
-                    newHead = new Integer(rnd.nextInt());
-                } while (m.containsKey(newHead));
-                m.put(newHead, head);
-                head = newHead;
-            }
-            if (m.size() != mapSize)
-                fail("Size not as expected.");
-
-            {
-                HashMap hm = new HashMap(m);
-                if (! (hm.hashCode() == m.hashCode() &&
-                       hm.entrySet().hashCode() == m.entrySet().hashCode() &&
-                       hm.keySet().hashCode() == m.keySet().hashCode()))
-                    fail("Incorrect hashCode computation.");
-
-                if (! (hm.equals(m) &&
-                       hm.entrySet().equals(m.entrySet()) &&
-                       hm.keySet().equals(m.keySet()) &&
-                       m.equals(hm) &&
-                       m.entrySet().equals(hm.entrySet()) &&
-                       m.keySet().equals(hm.keySet())))
-                    fail("Incorrect equals computation.");
-            }
-
-            Map m2 = newMap(); m2.putAll(m);
-            m2.values().removeAll(m.keySet());
-            if (m2.size()!= 1 || !m2.containsValue(nil))
-                fail("Collection views test failed.");
-
-            int j=0;
-            while (head != nil) {
-                if (!m.containsKey(head))
-                    fail("Linked list doesn't contain a link.");
-                Object newHead = m.get(head);
-                if (newHead == null)
-                    fail("Could not retrieve a link.");
-                m.remove(head);
-                head = newHead;
-                j++;
-            }
-            if (!m.isEmpty())
-                fail("Map nonempty after removing all links.");
-            if (j != mapSize)
-                fail("Linked list size not as expected.");
+        {
+            HashMap hm = new HashMap(m);
+            if (! (hm.hashCode() == m.hashCode() &&
+                   hm.entrySet().hashCode() == m.entrySet().hashCode() &&
+                   hm.keySet().hashCode() == m.keySet().hashCode()))
+                fail("Incorrect hashCode computation.");
+
+            if (! (hm.equals(m) &&
+                   hm.entrySet().equals(m.entrySet()) &&
+                   hm.keySet().equals(m.keySet()) &&
+                   m.equals(hm) &&
+                   m.entrySet().equals(hm.entrySet()) &&
+                   m.keySet().equals(hm.keySet())))
+                fail("Incorrect equals computation.");
         }
 
-        Map m = newMap();
+        Map m2 = supplier.get(); m2.putAll(m);
+        m2.values().removeAll(m.keySet());
+        if (m2.size()!= 1 || !m2.containsValue(nil))
+            fail("Collection views test failed.");
+
+        int j=0;
+        while (head != nil) {
+            if (!m.containsKey(head))
+                fail("Linked list doesn't contain a link.");
+            Object newHead = m.get(head);
+            if (newHead == null)
+                fail("Could not retrieve a link.");
+            m.remove(head);
+            head = newHead;
+            j++;
+        }
+        if (!m.isEmpty())
+            fail("Map nonempty after removing all links.");
+        if (j != mapSize)
+            fail("Linked list size not as expected.");
+    }
+
+    @Test(dataProvider = "Supplier<Map<Integer,Integer>>")
+    public static void testCheckedMap2(String description, Supplier<Map<Integer,Integer>> supplier) {
+        Map m = supplier.get();
         for (int i=0; i<mapSize; i++)
             if (m.put(new Integer(i), new Integer(2*i)) != null)
-                fail("put returns a non-null value erroenously.");
+                fail("put returns a non-null value erroneously.");
         for (int i=0; i<2*mapSize; i++)
             if (m.containsValue(new Integer(i)) != (i%2==0))
                 fail("contains value "+i);
         if (m.put(nil, nil) == null)
-            fail("put returns a null value erroenously.");
-        Map m2 = newMap(); m2.putAll(m);
+            fail("put returns a null value erroneously.");
+        Map m2 = supplier.get(); m2.putAll(m);
         if (!m.equals(m2))
             fail("Clone not equal to original. (1)");
         if (!m2.equals(m))
@@ -126,7 +134,7 @@ public class CheckedMapBash {
             fail("clear failed.");
 
         Iterator i = m.entrySet().iterator();
-        while(i.hasNext()) {
+        while (i.hasNext()) {
             i.next();
             i.remove();
         }
@@ -134,16 +142,36 @@ public class CheckedMapBash {
             fail("Iterator.remove() failed");
     }
 
-    static Map newMap() {
-        Map m = Collections.checkedMap(new HashMap(),
-                                       Integer.class, Integer.class);
+    @DataProvider(name = "Bash.Supplier<Map<Integer,Integer>>", parallel = true)
+    public static Iterator<Object[]> bashNavigableMapProvider() {
+        ArrayList<Object[]> iters = new ArrayList<>(makeCheckedMaps());
+        iters.ensureCapacity(numItr * iters.size());
+        for (int each=1; each < numItr; each++) {
+            iters.addAll(makeCheckedMaps());
+        }
+        return iters.iterator();
+    }
 
-        if (!m.isEmpty())
-            fail("New instance non empty.");
-        return m;
+    @DataProvider(name = "Supplier<Map<Integer,Integer>>", parallel = true)
+    public static Iterator<Object[]> navigableMapProvider() {
+        return makeCheckedMaps().iterator();
     }
 
-    static void fail(String s) {
-        throw new RuntimeException(s);
+    public static Collection<Object[]> makeCheckedMaps() {
+        Object[][] params = {
+            {"Collections.checkedMap(HashMap)",
+             (Supplier) () -> Collections.checkedMap(new HashMap(), Integer.class, Integer.class)},
+            {"Collections.checkedMap(TreeMap(reverseOrder))",
+             (Supplier) () -> Collections.checkedMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class)},
+            {"Collections.checkedMap(TreeMap.descendingMap())",
+             (Supplier) () -> Collections.checkedMap(new TreeMap().descendingMap(), Integer.class, Integer.class)},
+            {"Collections.checkedNavigableMap(TreeMap)",
+             (Supplier) () -> Collections.checkedNavigableMap(new TreeMap(), Integer.class, Integer.class)},
+            {"Collections.checkedNavigableMap(TreeMap(reverseOrder))",
+             (Supplier) () -> Collections.checkedNavigableMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class)},
+            {"Collections.checkedNavigableMap(TreeMap.descendingMap())",
+             (Supplier) () -> Collections.checkedNavigableMap(new TreeMap().descendingMap(), Integer.class, Integer.class)},
+        };
+        return Arrays.asList(params);
     }
 }