--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/10/06 07:49:22	1.25
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2010/11/18 20:21:53	1.42
@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.*;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -39,27 +40,31 @@ public class LinkedTransferQueueTest ext
                             new Generic().testSuite());
     }
 
-    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
-        assertTrue(q.isEmpty());
-        assertEquals(0, q.size());
-        assertNull(q.peek());
-        assertNull(q.poll());
-        assertNull(q.poll(0, MILLISECONDS));
-        assertEquals(q.toString(), "[]");
-        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
-        assertFalse(q.iterator().hasNext());
-        try {
-            q.element();
-            shouldThrow();
-        } catch (NoSuchElementException success) {}
-        try {
-            q.iterator().next();
-            shouldThrow();
-        } catch (NoSuchElementException success) {}
+    void checkEmpty(BlockingQueue q) {
         try {
-            q.remove();
-            shouldThrow();
-        } catch (NoSuchElementException success) {}
+            assertTrue(q.isEmpty());
+            assertEquals(0, q.size());
+            assertNull(q.peek());
+            assertNull(q.poll());
+            assertNull(q.poll(0, MILLISECONDS));
+            assertEquals(q.toString(), "[]");
+            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
+            assertFalse(q.iterator().hasNext());
+            try {
+                q.element();
+                shouldThrow();
+            } catch (NoSuchElementException success) {}
+            try {
+                q.iterator().next();
+                shouldThrow();
+            } catch (NoSuchElementException success) {}
+            try {
+                q.remove();
+                shouldThrow();
+            } catch (NoSuchElementException success) {}
+        } catch (InterruptedException ie) {
+            threadUnexpectedException(ie);
+        }
     }
 
     /**
@@ -273,39 +278,27 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * take blocks interruptibly when empty
-     */
-    public void testTakeFromEmpty() throws InterruptedException {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
-        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
-            public void realRun() throws InterruptedException {
-                q.take();
-            }});
-        Thread.sleep(SHORT_DELAY_MS);
-        t.interrupt();
-        t.join();
-    }
-
-    /**
-     * Take removes existing elements until empty, then blocks interruptibly
+     * take removes existing elements until empty, then blocks interruptibly
      */
     public void testBlockingTake() throws InterruptedException {
-        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
-        Thread t = new Thread(new CheckedRunnable() {
+        final BlockingQueue<Integer> q = populatedQueue(SIZE);
+        final CountDownLatch aboutToWait = new CountDownLatch(1);
+        Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 for (int i = 0; i < SIZE; ++i) {
                     assertEquals(i, (int) q.take());
                 }
+                aboutToWait.countDown();
                 try {
                     q.take();
                     shouldThrow();
                 } catch (InterruptedException success) {}
             }});
 
-        t.start();
-        Thread.sleep(SHORT_DELAY_MS);
+        aboutToWait.await();
+        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
         t.interrupt();
-        t.join();
+        awaitTermination(t, MEDIUM_DELAY_MS);
         checkEmpty(q);
     }
 
@@ -322,7 +315,7 @@ public class LinkedTransferQueueTest 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 {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
@@ -334,17 +327,18 @@ public class LinkedTransferQueueTest 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 {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             long t0 = System.nanoTime();
-            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
-            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
-            assertTrue(millisElapsed < SMALL_DELAY_MS);
+            assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
+            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
         }
+        long t0 = System.nanoTime();
         assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
+        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
         checkEmpty(q);
     }
 
@@ -353,24 +347,53 @@ public class LinkedTransferQueueTest ext
      * returning timeout status
      */
     public void testInterruptedTimedPoll() throws InterruptedException {
-        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        final BlockingQueue<Integer> q = populatedQueue(SIZE);
+        final CountDownLatch aboutToWait = new CountDownLatch(1);
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 for (int i = 0; i < SIZE; ++i) {
                     long t0 = System.nanoTime();
                     assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
-                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
-                    assertTrue(millisElapsed < SMALL_DELAY_MS);
+                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
                 }
+                long t0 = System.nanoTime();
+                aboutToWait.countDown();
                 try {
-                    q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
                     shouldThrow();
-                } catch (InterruptedException success) {}
+                } catch (InterruptedException success) {
+                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
+                }
             }});
 
-        Thread.sleep(SMALL_DELAY_MS);
+        aboutToWait.await();
+        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
         t.interrupt();
-        t.join();
+        awaitTermination(t, MEDIUM_DELAY_MS);
+        checkEmpty(q);
+    }
+
+    /**
+     * timed poll after thread interrupted throws InterruptedException
+     * instead of returning timeout status
+     */
+    public void testTimedPollAfterInterrupt() throws InterruptedException {
+        final BlockingQueue<Integer> q = populatedQueue(SIZE);
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                Thread.currentThread().interrupt();
+                for (int i = 0; i < SIZE; ++i) {
+                    long t0 = System.nanoTime();
+                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
+                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
+                }
+                try {
+                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+            }});
+
+        awaitTermination(t, MEDIUM_DELAY_MS);
         checkEmpty(q);
     }
 
@@ -425,12 +448,18 @@ public class LinkedTransferQueueTest ext
      */
     public void testRemoveElement() throws InterruptedException {
         LinkedTransferQueue q = populatedQueue(SIZE);
-        for (int i = 1; i < SIZE; i += 2) {
+        for (int i = 1; i < SIZE; i+=2) {
+            assertTrue(q.contains(i));
             assertTrue(q.remove(i));
+            assertFalse(q.contains(i));
+            assertTrue(q.contains(i-1));
         }
-        for (int i = 0; i < SIZE; i += 2) {
+        for (int i = 0; i < SIZE; i+=2) {
+            assertTrue(q.contains(i));
             assertTrue(q.remove(i));
-            assertFalse(q.remove(i + 1));
+            assertFalse(q.contains(i));
+            assertFalse(q.remove(i+1));
+            assertFalse(q.contains(i+1));
         }
         checkEmpty(q);
     }
@@ -527,46 +556,47 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * toArray() contains all elements
+     * toArray() contains all elements in FIFO order
      */
-    public void testToArray() throws InterruptedException {
+    public void testToArray() {
         LinkedTransferQueue 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 {
+    public void testToArray2() {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
         Integer[] ints = new Integer[SIZE];
-        ints = 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 NullPointerException
      */
-    public void testToArray_BadArg() {
+    public void testToArray_NullArg() {
         LinkedTransferQueue q = populatedQueue(SIZE);
         try {
-            Object o[] = q.toArray(null);
+            q.toArray(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
 
     /**
-     * toArray(incompatible array type) throws CCE
+     * toArray(incompatible array type) throws ArrayStoreException
      */
     public void testToArray1_BadArg() {
         LinkedTransferQueue q = populatedQueue(SIZE);
         try {
-            Object o[] = q.toArray(new String[10]);
+            q.toArray(new String[10]);
             shouldThrow();
         } catch (ArrayStoreException success) {}
     }
@@ -652,19 +682,22 @@ public class LinkedTransferQueueTest ext
      */
     public void testOfferInExecutor() {
         final LinkedTransferQueue q = new LinkedTransferQueue();
-        q.add(one);
-        q.add(two);
+        final CountDownLatch threadsStarted = new CountDownLatch(2);
         ExecutorService executor = Executors.newFixedThreadPool(2);
 
         executor.execute(new CheckedRunnable() {
-            public void realRun() {
-                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
+            public void realRun() throws InterruptedException {
+                threadsStarted.countDown();
+                threadsStarted.await();
+                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
             }});
 
         executor.execute(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                Thread.sleep(SMALL_DELAY_MS);
+                threadsStarted.countDown();
+                threadsStarted.await();
                 assertSame(one, q.take());
+                checkEmpty(q);
             }});
 
         joinPool(executor);
@@ -675,18 +708,22 @@ public class LinkedTransferQueueTest ext
      */
     public void testPollInExecutor() {
         final LinkedTransferQueue q = new LinkedTransferQueue();
+        final CountDownLatch threadsStarted = new CountDownLatch(2);
         ExecutorService executor = Executors.newFixedThreadPool(2);
 
         executor.execute(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 assertNull(q.poll());
-                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
-                assertTrue(q.isEmpty());
+                threadsStarted.countDown();
+                threadsStarted.await();
+                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
+                checkEmpty(q);
             }});
 
         executor.execute(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                Thread.sleep(SMALL_DELAY_MS);
+                threadsStarted.countDown();
+                threadsStarted.await();
                 q.put(one);
             }});
 
@@ -712,6 +749,8 @@ public class LinkedTransferQueueTest ext
         LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
 
         assertEquals(q.size(), r.size());
+        assertEquals(q.toString(), r.toString());
+        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
         while (!q.isEmpty()) {
             assertEquals(q.remove(), r.remove());
         }
@@ -780,7 +819,7 @@ public class LinkedTransferQueueTest ext
         for (int i = 0; i < SIZE; ++i) {
             assertEquals(l.get(i), i);
         }
-        t.join();
+        awaitTermination(t, MEDIUM_DELAY_MS);
         assertTrue(q.size() + l.size() >= SIZE);
     }
 
@@ -807,7 +846,7 @@ public class LinkedTransferQueueTest 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() {
         LinkedTransferQueue q = new LinkedTransferQueue();
@@ -836,21 +875,26 @@ public class LinkedTransferQueueTest ext
         final LinkedTransferQueue q = new LinkedTransferQueue();
         assertEquals(q.getWaitingConsumerCount(), 0);
         assertFalse(q.hasWaitingConsumer());
+        final CountDownLatch threadStarted = new CountDownLatch(1);
 
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                Thread.sleep(SMALL_DELAY_MS);
-                assertTrue(q.hasWaitingConsumer());
-                assertEquals(q.getWaitingConsumerCount(), 1);
-                assertTrue(q.offer(one));
-                assertFalse(q.hasWaitingConsumer());
+                threadStarted.countDown();
+                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
                 assertEquals(q.getWaitingConsumerCount(), 0);
+                assertFalse(q.hasWaitingConsumer());
             }});
 
-        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
+        threadStarted.await();
+        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
+        assertEquals(q.getWaitingConsumerCount(), 1);
+        assertTrue(q.hasWaitingConsumer());
+
+        assertTrue(q.offer(one));
         assertEquals(q.getWaitingConsumerCount(), 0);
         assertFalse(q.hasWaitingConsumer());
-        t.join();
+
+        awaitTermination(t, MEDIUM_DELAY_MS);
     }
 
     /**
@@ -871,18 +915,21 @@ public class LinkedTransferQueueTest ext
     public void testTransfer2() throws InterruptedException {
         final LinkedTransferQueue<Integer> q
             = new LinkedTransferQueue<Integer>();
+        final CountDownLatch threadStarted = new CountDownLatch(1);
 
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                q.transfer(SIZE);
-                assertTrue(q.isEmpty());
+                threadStarted.countDown();
+                q.transfer(five);
+                checkEmpty(q);
             }});
 
-        Thread.sleep(SHORT_DELAY_MS);
+        threadStarted.await();
+        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
         assertEquals(1, q.size());
-        assertEquals(SIZE, (int) q.poll());
-        assertTrue(q.isEmpty());
-        t.join();
+        assertSame(five, q.poll());
+        checkEmpty(q);
+        awaitTermination(t, MEDIUM_DELAY_MS);
     }
 
     /**
@@ -894,30 +941,28 @@ public class LinkedTransferQueueTest ext
 
         Thread first = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                Integer i = SIZE + 1;
-                q.transfer(i);
-                assertTrue(!q.contains(i));
+                q.transfer(four);
+                assertTrue(!q.contains(four));
                 assertEquals(1, q.size());
             }});
 
         Thread interruptedThread = newStartedThread(
             new CheckedInterruptedRunnable() {
                 public void realRun() throws InterruptedException {
-                    while (q.size() == 0)
+                    while (q.isEmpty())
                         Thread.yield();
-                    q.transfer(SIZE);
+                    q.transfer(five);
                 }});
 
         while (q.size() < 2)
             Thread.yield();
         assertEquals(2, q.size());
-        assertEquals(SIZE + 1, (int) q.poll());
+        assertSame(four, q.poll());
         first.join();
         assertEquals(1, q.size());
         interruptedThread.interrupt();
         interruptedThread.join();
-        assertEquals(0, q.size());
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
     }
 
     /**
@@ -934,10 +979,13 @@ public class LinkedTransferQueueTest ext
                 assertSame(three, q.poll());
             }});
 
-        Thread.sleep(SHORT_DELAY_MS);
+        while (q.isEmpty())
+            Thread.yield();
+        assertFalse(q.isEmpty());
+        assertEquals(1, q.size());
         assertTrue(q.offer(three));
         assertSame(four, q.poll());
-        t.join();
+        awaitTermination(t, MEDIUM_DELAY_MS);
     }
 
     /**
@@ -950,14 +998,17 @@ public class LinkedTransferQueueTest ext
 
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                q.transfer(SIZE);
+                q.transfer(four);
                 checkEmpty(q);
             }});
 
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(SIZE, (int) q.take());
+        while (q.isEmpty())
+            Thread.yield();
+        assertFalse(q.isEmpty());
+        assertEquals(1, q.size());
+        assertSame(four, q.take());
         checkEmpty(q);
-        t.join();
+        awaitTermination(t, MEDIUM_DELAY_MS);
     }
 
     /**
@@ -995,14 +1046,13 @@ public class LinkedTransferQueueTest ext
                 while (! q.hasWaitingConsumer())
                     Thread.yield();
                 assertTrue(q.hasWaitingConsumer());
-                assertTrue(q.isEmpty());
-                assertEquals(q.size(), 0);
+                checkEmpty(q);
                 assertTrue(q.tryTransfer(hotPotato));
             }});
 
         assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
         checkEmpty(q);
-        t.join();
+        awaitTermination(t, MEDIUM_DELAY_MS);
     }
 
     /**
@@ -1018,48 +1068,62 @@ public class LinkedTransferQueueTest ext
                 while (! q.hasWaitingConsumer())
                     Thread.yield();
                 assertTrue(q.hasWaitingConsumer());
-                assertTrue(q.isEmpty());
-                assertEquals(q.size(), 0);
+                checkEmpty(q);
                 assertTrue(q.tryTransfer(hotPotato));
             }});
 
         assertSame(q.take(), hotPotato);
         checkEmpty(q);
-        t.join();
+        awaitTermination(t, MEDIUM_DELAY_MS);
     }
 
     /**
-     * tryTransfer waits the amount given if interrupted, and
-     * throws interrupted exception
+     * tryTransfer waits the amount given, and throws
+     * InterruptedException when interrupted.
      */
     public void testTryTransfer5() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        assertTrue(q.isEmpty());
 
-        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
+        Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
+                long t0 = System.nanoTime();
+                threadStarted.countDown();
+                try {
+                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
+                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
             }});
 
-        Thread.sleep(SMALL_DELAY_MS);
-        toInterrupt.interrupt();
-        toInterrupt.join();
+        threadStarted.await();
+        while (q.isEmpty())
+            Thread.yield();
+        Thread.sleep(SHORT_DELAY_MS);
+        t.interrupt();
+        awaitTermination(t, MEDIUM_DELAY_MS);
+        checkEmpty(q);
     }
 
     /**
-     * tryTransfer gives up after the timeout and return false
+     * tryTransfer gives up after the timeout and returns false
      */
     public void testTryTransfer6() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
 
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
+                long t0 = System.nanoTime();
                 assertFalse(q.tryTransfer(new Object(),
                                           SHORT_DELAY_MS, MILLISECONDS));
+                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
+                checkEmpty(q);
             }});
 
-        Thread.sleep(SMALL_DELAY_MS);
+        awaitTermination(t, MEDIUM_DELAY_MS);
         checkEmpty(q);
-        t.join();
     }
 
     /**
@@ -1073,26 +1137,29 @@ public class LinkedTransferQueueTest ext
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
-                assertTrue(q.isEmpty());
+                checkEmpty(q);
             }});
 
-        Thread.sleep(SHORT_DELAY_MS);
+        while (q.size() != 2)
+            Thread.yield();
         assertEquals(2, q.size());
         assertSame(four, q.poll());
         assertSame(five, q.poll());
         checkEmpty(q);
-        t.join();
+        awaitTermination(t, MEDIUM_DELAY_MS);
     }
 
     /**
-     * tryTransfer attempts to enqueue into the q and fails returning
-     * false not enqueueing and the successive poll is null
+     * tryTransfer attempts to enqueue into the queue and fails
+     * returning false not enqueueing and the successive poll is null
      */
     public void testTryTransfer8() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
         assertTrue(q.offer(four));
         assertEquals(1, q.size());
+        long t0 = System.nanoTime();
         assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
+        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
         assertEquals(1, q.size());
         assertSame(four, q.poll());
         assertNull(q.poll());
@@ -1101,7 +1168,7 @@ public class LinkedTransferQueueTest ext
 
     private LinkedTransferQueue<Integer> populatedQueue(int n) {
         LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
         for (int i = 0; i < n; i++) {
             assertEquals(i, q.size());
             assertTrue(q.offer(i));