--- jsr166/src/test/jtreg/util/Collections/CheckedSetBash.java	2010/09/05 21:32:19	1.3
+++ jsr166/src/test/jtreg/util/Collections/CheckedSetBash.java	2015/09/09 21:47:59	1.4
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. 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
@@ -23,82 +23,94 @@
 
 /*
  * @test
- * @bug     4904067
+ * @bug     4904067 7129185
  * @summary Unit test for Collections.checkedSet
  * @author  Josh Bloch
+ * @run testng CheckedSetBash
+ * @key randomness
  */
 
 import java.util.*;
+import java.util.function.Supplier;
+import org.testng.annotations.Test;
+import org.testng.annotations.DataProvider;
 
-public class CheckedSetBash {
-    static Random rnd = new Random();
+import static org.testng.Assert.fail;
+import static org.testng.Assert.assertTrue;
 
-    public static void main(String[] args) {
-        int numItr = 100;
-        int setSize = 100;
-
-        for (int i=0; i<numItr; i++) {
-            Set s1 = newSet();
-            AddRandoms(s1, setSize);
-
-            Set s2 = newSet();
-            AddRandoms(s2, setSize);
-
-            Set intersection = clone(s1);
-            intersection.retainAll(s2);
-            Set diff1 = clone(s1); diff1.removeAll(s2);
-            Set diff2 = clone(s2); diff2.removeAll(s1);
-            Set union = clone(s1); union.addAll(s2);
-
-            if (diff1.removeAll(diff2))
-                fail("Set algebra identity 2 failed");
-            if (diff1.removeAll(intersection))
-                fail("Set algebra identity 3 failed");
-            if (diff2.removeAll(diff1))
-                fail("Set algebra identity 4 failed");
-            if (diff2.removeAll(intersection))
-                fail("Set algebra identity 5 failed");
-            if (intersection.removeAll(diff1))
-                fail("Set algebra identity 6 failed");
-            if (intersection.removeAll(diff1))
-                fail("Set algebra identity 7 failed");
-
-            intersection.addAll(diff1); intersection.addAll(diff2);
-            if (!intersection.equals(union))
-                fail("Set algebra identity 1 failed");
-
-            if (new HashSet(union).hashCode() != union.hashCode())
-                fail("Incorrect hashCode computation.");
-
-            Iterator e = union.iterator();
-            while (e.hasNext())
-                if (!intersection.remove(e.next()))
-                    fail("Couldn't remove element from copy.");
-            if (!intersection.isEmpty())
-                fail("Copy nonempty after deleting all elements.");
-
-            e = union.iterator();
-            while (e.hasNext()) {
-                Object o = e.next();
-                if (!union.contains(o))
-                    fail("Set doesn't contain one of its elements.");
-                e.remove();
-                if (union.contains(o))
-                    fail("Set contains element after deletion.");
-            }
-            if (!union.isEmpty())
-                fail("Set nonempty after deleting all elements.");
-
-            s1.clear();
-            if (!s1.isEmpty())
-                fail("Set nonempty after clear.");
+public class CheckedSetBash {
+    static final int numItr = 100;
+    static final int setSize = 100;
+    static final Random rnd = new Random();
+
+    @Test(dataProvider = "Supplier<Set<Integer>>")
+    public static void testCheckedSet(String description, Supplier<Set<Integer>> supplier) {
+
+        Set<Integer> s1 = supplier.get();
+        assertTrue(s1.isEmpty());
+
+        AddRandoms(s1, setSize);
+
+        Set<Integer> s2 = supplier.get();
+
+        assertTrue(s2.isEmpty());
+
+        AddRandoms(s2, setSize);
+
+        Set<Integer> intersection = clone(s1, supplier);
+        intersection.retainAll(s2);
+        Set<Integer> diff1 = clone(s1, supplier); diff1.removeAll(s2);
+        Set<Integer> diff2 = clone(s2, supplier); diff2.removeAll(s1);
+        Set<Integer> union = clone(s1, supplier); union.addAll(s2);
+
+        if (diff1.removeAll(diff2))
+            fail("Set algebra identity 2 failed");
+        if (diff1.removeAll(intersection))
+            fail("Set algebra identity 3 failed");
+        if (diff2.removeAll(diff1))
+            fail("Set algebra identity 4 failed");
+        if (diff2.removeAll(intersection))
+            fail("Set algebra identity 5 failed");
+        if (intersection.removeAll(diff1))
+            fail("Set algebra identity 6 failed");
+        if (intersection.removeAll(diff1))
+            fail("Set algebra identity 7 failed");
+
+        intersection.addAll(diff1); intersection.addAll(diff2);
+        if (!intersection.equals(union))
+            fail("Set algebra identity 1 failed");
+
+        if (new HashSet(union).hashCode() != union.hashCode())
+            fail("Incorrect hashCode computation.");
+
+        Iterator e = union.iterator();
+        while (e.hasNext())
+            if (!intersection.remove(e.next()))
+                fail("Couldn't remove element from copy.");
+        if (!intersection.isEmpty())
+            fail("Copy nonempty after deleting all elements.");
+
+        e = union.iterator();
+        while (e.hasNext()) {
+            Object o = e.next();
+            if (!union.contains(o))
+                fail("Set doesn't contain one of its elements.");
+            e.remove();
+            if (union.contains(o))
+                fail("Set contains element after deletion.");
         }
+        if (!union.isEmpty())
+            fail("Set nonempty after deleting all elements.");
+
+        s1.clear();
+        if (!s1.isEmpty())
+            fail("Set nonempty after clear.");
     }
 
     // Done inefficiently so as to exercise toArray
-    static Set clone(Set s) {
-        Set clone = newSet();
-        List arrayList = Arrays.asList(s.toArray());
+    static <T> Set<T> clone(Set<T> s, Supplier<Set<T>> supplier) {
+        Set<T> clone = supplier.get();
+        List<T> arrayList = Arrays.asList((T[]) s.toArray());
         clone.addAll(arrayList);
         if (!s.equals(clone))
             fail("Set not equal to copy.");
@@ -109,13 +121,6 @@ public class CheckedSetBash {
         return clone;
     }
 
-    static Set newSet() {
-        Set s = Collections.checkedSet(new HashSet(), Integer.class);
-        if (!s.isEmpty())
-            fail("New instance non empty.");
-        return s;
-    }
-
     static void AddRandoms(Set s, int n) {
         for (int i=0; i<n; i++) {
             int r = rnd.nextInt() % n;
@@ -125,19 +130,41 @@ public class CheckedSetBash {
             boolean prePresent = s.contains(e);
             boolean added = s.add(e);
             if (!s.contains(e))
-                fail("Element not present after addition.");
+                fail ("Element not present after addition.");
             if (added == prePresent)
-                fail("added == alreadyPresent");
+                fail ("added == alreadyPresent");
             int postSize = s.size();
             if (added && preSize == postSize)
-                fail("Add returned true, but size didn't change.");
+                fail ("Add returned true, but size didn't change.");
             if (!added && preSize != postSize)
-                fail("Add returned false, but size changed.");
+                fail ("Add returned false, but size changed.");
         }
     }
 
-    static void fail(String s) {
-        throw new RuntimeException(s);
+    @DataProvider(name = "Supplier<Set<Integer>>", parallel = true)
+    public static Iterator<Object[]> navigableSetsProvider() {
+        ArrayList<Object[]> iters = new ArrayList<>(makeCheckedSets());
+        iters.ensureCapacity(numItr * iters.size());
+        for (int each=1; each < numItr; each++) {
+            iters.addAll( makeCheckedSets());
+        }
+        return iters.iterator();
+    }
 
+    public static Collection<Object[]> makeCheckedSets() {
+        return Arrays.asList(
+            new Object[]{"Collections.checkedSet(HashSet)",
+                (Supplier) () -> {return Collections.checkedSet(new HashSet(), Integer.class);}},
+            new Object[]{"Collections.checkedSet(TreeSet(reverseOrder)",
+                (Supplier) () -> {return Collections.checkedSet(new TreeSet(Collections.reverseOrder()), Integer.class);}},
+            new Object[]{"Collections.checkedSet(TreeSet).descendingSet()",
+                (Supplier) () -> {return Collections.checkedSet(new TreeSet().descendingSet(), Integer.class);}},
+            new Object[]{"Collections.checkedNavigableSet(TreeSet)",
+                (Supplier) () -> {return Collections.checkedNavigableSet(new TreeSet(), Integer.class);}},
+            new Object[]{"Collections.checkedNavigableSet(TreeSet(reverseOrder)",
+                (Supplier) () -> {return Collections.checkedNavigableSet(new TreeSet(Collections.reverseOrder()), Integer.class);}},
+            new Object[]{"Collections.checkedNavigableSet().descendingSet()",
+                (Supplier) () -> {return Collections.checkedNavigableSet(new TreeSet().descendingSet(), Integer.class);}}
+            );
     }
 }