--- jsr166/src/test/tck/LinkedBlockingQueueTest.java	2010/10/06 07:49:22	1.29
+++ jsr166/src/test/tck/LinkedBlockingQueueTest.java	2010/11/05 00:17:22	1.37
@@ -41,8 +41,9 @@ public class LinkedBlockingQueueTest ext
      * Create a queue of given size containing consecutive
      * Integers 0 ... n.
      */
-    private LinkedBlockingQueue populatedQueue(int n) {
-        LinkedBlockingQueue q = new LinkedBlockingQueue(n);
+    private LinkedBlockingQueue<Integer> populatedQueue(int n) {
+        LinkedBlockingQueue<Integer> q =
+            new LinkedBlockingQueue<Integer>(n);
         assertTrue(q.isEmpty());
         for (int i = 0; i < n; i++)
             assertTrue(q.offer(new Integer(i)));
@@ -381,22 +382,6 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     * take blocks interruptibly when empty
-     */
-    public void testTakeFromEmpty() throws InterruptedException {
-        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
-        Thread t = new ThreadShouldThrow(InterruptedException.class) {
-            public void realRun() throws InterruptedException {
-                q.take();
-            }};
-
-        t.start();
-        Thread.sleep(SHORT_DELAY_MS);
-        t.interrupt();
-        t.join();
-    }
-
-    /**
      * Take removes existing elements until empty, then blocks interruptibly
      */
     public void testBlockingTake() throws InterruptedException {
@@ -430,7 +415,7 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     * timed pool with zero timeout succeeds when non-empty, else times out
+     * timed poll with zero timeout succeeds when non-empty, else times out
      */
     public void testTimedPoll0() throws InterruptedException {
         LinkedBlockingQueue q = populatedQueue(SIZE);
@@ -441,7 +426,7 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     * timed pool with nonzero timeout succeeds when non-empty, else times out
+     * timed poll with nonzero timeout succeeds when non-empty, else times out
      */
     public void testTimedPoll() throws InterruptedException {
         LinkedBlockingQueue q = populatedQueue(SIZE);
@@ -623,44 +608,45 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     * toArray contains all elements
+     * toArray contains all elements in FIFO order
      */
-    public void testToArray() throws InterruptedException {
+    public void testToArray() {
         LinkedBlockingQueue q = populatedQueue(SIZE);
         Object[] o = q.toArray();
         for (int i = 0; i < o.length; i++)
-            assertEquals(o[i], q.take());
+            assertSame(o[i], q.poll());
     }
 
     /**
-     * toArray(a) contains all elements
+     * toArray(a) contains all elements in FIFO order
      */
     public void testToArray2() throws InterruptedException {
-        LinkedBlockingQueue q = populatedQueue(SIZE);
+        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
         Integer[] ints = new Integer[SIZE];
-        ints = (Integer[])q.toArray(ints);
+        Integer[] array = q.toArray(ints);
+        assertSame(ints, array);
         for (int i = 0; i < ints.length; i++)
-            assertEquals(ints[i], q.take());
+            assertSame(ints[i], q.poll());
     }
 
     /**
-     * toArray(null) throws NPE
+     * toArray(null) throws NullPointerException
      */
-    public void testToArray_BadArg() {
+    public void testToArray_NullArg() {
         LinkedBlockingQueue q = populatedQueue(SIZE);
         try {
-            Object o[] = q.toArray(null);
+            q.toArray(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
 
     /**
-     * toArray with incompatible array type throws CCE
+     * toArray(incompatible array type) throws ArrayStoreException
      */
     public void testToArray1_BadArg() {
         LinkedBlockingQueue q = populatedQueue(SIZE);
         try {
-            Object o[] = q.toArray(new String[10]);
+            q.toArray(new String[10]);
             shouldThrow();
         } catch (ArrayStoreException success) {}
     }
@@ -895,7 +881,7 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     * drainTo(c, n) empties first max {n, size} elements of queue into c
+     * drainTo(c, n) empties first min(n, size) elements of queue into c
      */
     public void testDrainToN() {
         LinkedBlockingQueue q = new LinkedBlockingQueue();
@@ -904,7 +890,7 @@ public class LinkedBlockingQueueTest ext
                 assertTrue(q.offer(new Integer(j)));
             ArrayList l = new ArrayList();
             q.drainTo(l, i);
-            int k = (i < SIZE)? i : SIZE;
+            int k = (i < SIZE) ? i : SIZE;
             assertEquals(l.size(), k);
             assertEquals(q.size(), SIZE-k);
             for (int j = 0; j < k; ++j)