--- jsr166/src/test/tck/LinkedBlockingDequeTest.java	2010/10/06 07:49:22	1.24
+++ jsr166/src/test/tck/LinkedBlockingDequeTest.java	2010/10/28 17:57:26	1.28
@@ -108,7 +108,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  pollFirst succeeds unless empty
+     * pollFirst succeeds unless empty
      */
     public void testPollFirst() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -119,7 +119,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  pollLast succeeds unless empty
+     * pollLast succeeds unless empty
      */
     public void testPollLast() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -130,7 +130,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 +144,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 +158,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 +188,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 +234,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 +457,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 +682,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 +951,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);
@@ -1417,7 +1401,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 +1420,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 +1629,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 +1638,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)