--- jsr166/src/test/tck/ConcurrentLinkedQueueTest.java	2017/08/04 03:30:21	1.47
+++ jsr166/src/test/tck/ConcurrentLinkedQueueTest.java	2018/05/28 21:19:50	1.48
@@ -389,9 +389,11 @@ public class ConcurrentLinkedQueueTest e
      */
     public void testToArray() {
         ConcurrentLinkedQueue q = populatedQueue(SIZE);
-        Object[] o = q.toArray();
-        for (int i = 0; i < o.length; i++)
-            assertSame(o[i], q.poll());
+        Object[] a = q.toArray();
+        assertSame(Object[].class, a.getClass());
+        for (Object o : a)
+            assertSame(o, q.poll());
+        assertTrue(q.isEmpty());
     }
 
     /**
@@ -402,8 +404,9 @@ public class ConcurrentLinkedQueueTest e
         Integer[] ints = new Integer[SIZE];
         Integer[] array = q.toArray(ints);
         assertSame(ints, array);
-        for (int i = 0; i < ints.length; i++)
-            assertSame(ints[i], q.poll());
+        for (Integer o : ints)
+            assertSame(o, q.poll());
+        assertTrue(q.isEmpty());
     }
 
     /**