--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2018/01/07 22:59:18	1.49
+++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2018/05/28 21:36:13	1.50
@@ -456,9 +456,11 @@ public class ConcurrentSkipListSetTest e
      */
     public void testToArray() {
         ConcurrentSkipListSet q = populatedSet(SIZE);
-        Object[] o = q.toArray();
-        for (int i = 0; i < o.length; i++)
-            assertSame(o[i], q.pollFirst());
+        Object[] a = q.toArray();
+        assertSame(Object[].class, a.getClass());
+        for (Object o : a)
+            assertSame(o, q.pollFirst());
+        assertTrue(q.isEmpty());
     }
 
     /**
@@ -468,8 +470,9 @@ public class ConcurrentSkipListSetTest e
         ConcurrentSkipListSet<Integer> q = populatedSet(SIZE);
         Integer[] ints = new Integer[SIZE];
         assertSame(ints, q.toArray(ints));
-        for (int i = 0; i < ints.length; i++)
-            assertSame(ints[i], q.pollFirst());
+        for (Integer o : ints)
+            assertSame(o, q.pollFirst());
+        assertTrue(q.isEmpty());
     }
 
     /**