--- a/test/jdk/java/util/concurrent/tck/LinkedBlockingQueueTest.java Mon Jun 25 09:59:16 2018 -0700
+++ b/test/jdk/java/util/concurrent/tck/LinkedBlockingQueueTest.java Mon Jun 25 09:59:16 2018 -0700
@@ -656,9 +656,11 @@
*/
public void testToArray() {
LinkedBlockingQueue 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());
}
/**
@@ -669,8 +671,9 @@
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());
}
/**