--- jsr166/src/test/tck/LinkedBlockingQueueTest.java	2010/10/06 07:49:22	1.29
+++ jsr166/src/test/tck/LinkedBlockingQueueTest.java	2010/10/28 17:57:26	1.32
@@ -381,22 +381,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 {
@@ -895,7 +879,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 +888,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)