--- jsr166/src/test/tck/LinkedBlockingDequeTest.java	2010/10/06 07:49:22	1.24
+++ jsr166/src/test/tck/LinkedBlockingDequeTest.java	2010/11/05 00:17:22	1.32
@@ -38,8 +38,9 @@ public class LinkedBlockingDequeTest ext
      * Create a deque of given size containing consecutive
      * Integers 0 ... n.
      */
-    private LinkedBlockingDeque populatedDeque(int n) {
-        LinkedBlockingDeque q = new LinkedBlockingDeque(n);
+    private LinkedBlockingDeque<Integer> populatedDeque(int n) {
+        LinkedBlockingDeque<Integer> q =
+            new LinkedBlockingDeque<Integer>(n);
         assertTrue(q.isEmpty());
         for (int i = 0; i < n; i++)
             assertTrue(q.offer(new Integer(i)));
@@ -108,7 +109,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  pollFirst succeeds unless empty
+     * pollFirst succeeds unless empty
      */
     public void testPollFirst() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -119,7 +120,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  pollLast succeeds unless empty
+     * pollLast succeeds unless empty
      */
     public void testPollLast() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -130,7 +131,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  peekFirst returns next element, or null if empty
+     * peekFirst returns next element, or null if empty
      */
     public void testPeekFirst() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -144,7 +145,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  peek returns next element, or null if empty
+     * peek returns next element, or null if empty
      */
     public void testPeek() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -158,7 +159,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  peekLast returns next element, or null if empty
+     * peekLast returns next element, or null if empty
      */
     public void testPeekLast() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -188,7 +189,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  getLast() returns last element, or throws NSEE if empty
+     * getLast() returns last element, or throws NSEE if empty
      */
     public void testLastElement() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -234,7 +235,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  remove removes next element, or throws NSEE if empty
+     * remove removes next element, or throws NSEE if empty
      */
     public void testRemove() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -457,7 +458,7 @@ public class LinkedBlockingDequeTest ext
 
 
     /**
-     *  pop removes next element, or throws NSEE if empty
+     * pop removes next element, or throws NSEE if empty
      */
     public void testPop() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -682,22 +683,6 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     * take blocks interruptibly when empty
-     */
-    public void testTakeFromEmpty() throws InterruptedException {
-        final LinkedBlockingDeque q = new LinkedBlockingDeque(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 {
@@ -967,8 +952,8 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
-     *  on interruption throws
+     * timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds;
+     * on interruption throws
      */
     public void testTimedPollFirstWithOfferFirst() throws InterruptedException {
         final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
@@ -1310,44 +1295,45 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     * toArray contains all elements
+     * toArray contains all elements in FIFO order
      */
     public void testToArray() throws InterruptedException{
         LinkedBlockingDeque q = populatedDeque(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 {
-        LinkedBlockingDeque q = populatedDeque(SIZE);
+    public void testToArray2() {
+        LinkedBlockingDeque<Integer> q = populatedDeque(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.remove());
     }
 
     /**
-     * toArray(null) throws NPE
+     * toArray(null) throws NullPointerException
      */
-    public void testToArray_BadArg() {
+    public void testToArray_NullArg() {
         LinkedBlockingDeque q = populatedDeque(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() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
         try {
-            Object o[] = q.toArray(new String[10]);
+            q.toArray(new String[10]);
             shouldThrow();
         } catch (ArrayStoreException success) {}
     }
@@ -1417,7 +1403,7 @@ public class LinkedBlockingDequeTest ext
 
 
     /**
-     *  Descending iterator iterates through all elements
+     * Descending iterator iterates through all elements
      */
     public void testDescendingIterator() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -1436,7 +1422,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  Descending iterator ordering is reverse FIFO
+     * Descending iterator ordering is reverse FIFO
      */
     public void testDescendingIteratorOrdering() {
         final LinkedBlockingDeque q = new LinkedBlockingDeque();
@@ -1645,7 +1631,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     * drainTo(c, n) empties first max {n, size} elements of deque into c
+     * drainTo(c, n) empties first min(n, size) elements of queue into c
      */
     public void testDrainToN() {
         LinkedBlockingDeque q = new LinkedBlockingDeque();
@@ -1654,7 +1640,7 @@ public class LinkedBlockingDequeTest 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)