--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2009/08/12 02:15:04	1.11
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2009/11/22 00:17:37	1.19
@@ -13,8 +13,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.ConcurrentModificationException;
 import java.util.Iterator;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.*;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -32,6 +32,29 @@ public class LinkedTransferQueueTest ext
         return new TestSuite(LinkedTransferQueueTest.class);
     }
 
+    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) {}
+        try {
+            q.remove();
+            shouldThrow();
+        } catch (NoSuchElementException success) {}
+    }
+
     /**
      * Constructor builds new queue with size being zero and empty
      * being true
@@ -49,8 +72,7 @@ public class LinkedTransferQueueTest ext
         try {
             new LinkedTransferQueue(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -62,8 +84,7 @@ public class LinkedTransferQueueTest ext
             Integer[] ints = new Integer[SIZE];
             new LinkedTransferQueue(Arrays.asList(ints));
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -78,30 +99,35 @@ public class LinkedTransferQueueTest ext
             }
             new LinkedTransferQueue(Arrays.asList(ints));
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
      * Queue contains all elements of the collection it is initialized by
      */
     public void testConstructor5() {
-        try {
-            Integer[] ints = new Integer[SIZE];
-            for (int i = 0; i < SIZE; ++i) {
-                ints[i] = i;
-            }
-            LinkedTransferQueue q
-                = new LinkedTransferQueue(Arrays.asList(ints));
-            for (int i = 0; i < SIZE; ++i) {
-                assertEquals(ints[i], q.poll());
-            }
-        } finally {
+        Integer[] ints = new Integer[SIZE];
+        for (int i = 0; i < SIZE; ++i) {
+            ints[i] = i;
+        }
+        List intList = Arrays.asList(ints);
+        LinkedTransferQueue q
+            = new LinkedTransferQueue(intList);
+        assertEquals(q.size(), intList.size());
+        assertEquals(q.toString(), intList.toString());
+        assertTrue(Arrays.equals(q.toArray(),
+                                     intList.toArray()));
+        assertTrue(Arrays.equals(q.toArray(new Object[0]),
+                                 intList.toArray(new Object[0])));
+        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
+                                 intList.toArray(new Object[SIZE])));
+        for (int i = 0; i < SIZE; ++i) {
+            assertEquals(ints[i], q.poll());
         }
     }
 
     /**
-     * Remaining capacity never decrease nor increase on add or remove
+     * remainingCapacity() always returns Integer.MAX_VALUE
      */
     public void testRemainingCapacity() {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
@@ -125,8 +151,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = new LinkedTransferQueue();
             q.offer(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -137,8 +162,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = new LinkedTransferQueue();
             q.add(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -149,8 +173,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = new LinkedTransferQueue();
             q.addAll(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -161,8 +184,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = populatedQueue(SIZE);
             q.addAll(q);
             shouldThrow();
-        } catch (IllegalArgumentException success) {
-        }
+        } catch (IllegalArgumentException success) {}
     }
 
     /**
@@ -174,8 +196,7 @@ public class LinkedTransferQueueTest ext
             Integer[] ints = new Integer[SIZE];
             q.addAll(Arrays.asList(ints));
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -191,8 +212,7 @@ public class LinkedTransferQueueTest ext
             }
             q.addAll(Arrays.asList(ints));
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -229,10 +249,10 @@ public class LinkedTransferQueueTest ext
     public void testPut() {
         LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
         for (int i = 0; i < SIZE; ++i) {
+            assertEquals(q.size(), i);
             q.put(i);
             assertTrue(q.contains(i));
         }
-        assertEquals(q.size(), SIZE);
     }
 
     /**
@@ -263,28 +283,35 @@ public class LinkedTransferQueueTest ext
      * Take removes existing elements until empty, then blocks interruptibly
      */
     public void testBlockingTake() throws InterruptedException {
-        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
-            void realRun() throws InterruptedException {
-                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        Thread t = new Thread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
                 for (int i = 0; i < SIZE; ++i) {
-                    threadAssertEquals(i, (int) q.take());
+                    assertEquals(i, (int) q.take());
                 }
-                q.take();
+                try {
+                    q.take();
+                    shouldThrow();
+                } catch (InterruptedException success) {}
             }});
+
+        t.start();
         Thread.sleep(SHORT_DELAY_MS);
         t.interrupt();
         t.join();
+        checkEmpty(q);
     }
 
     /**
      * poll succeeds unless empty
      */
-    public void testPoll() {
+    public void testPoll() throws InterruptedException {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             assertEquals(i, (int) q.poll());
         }
         assertNull(q.poll());
+        checkEmpty(q);
     }
 
     /**
@@ -296,6 +323,7 @@ public class LinkedTransferQueueTest ext
             assertEquals(i, (int) q.poll(0, MILLISECONDS));
         }
         assertNull(q.poll(0, MILLISECONDS));
+        checkEmpty(q);
     }
 
     /**
@@ -304,9 +332,13 @@ public class LinkedTransferQueueTest ext
     public void testTimedPoll() throws InterruptedException {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS));
+            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);
         }
         assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
+        checkEmpty(q);
     }
 
     /**
@@ -315,19 +347,25 @@ public class LinkedTransferQueueTest ext
      */
     public void testInterruptedTimedPoll() throws InterruptedException {
         final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
-        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
+        Thread t = newStartedThread(new CheckedRunnable() {
             void realRun() throws InterruptedException {
                 for (int i = 0; i < SIZE; ++i) {
+                    long t0 = System.nanoTime();
                     threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
                                                        MILLISECONDS));
+                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
+                    assertTrue(millisElapsed < SMALL_DELAY_MS);
                 }
-                q.poll(LONG_DELAY_MS, MILLISECONDS);
+                try {
+                    q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
             }});
+
         Thread.sleep(SMALL_DELAY_MS);
         t.interrupt();
         t.join();
-        assertEquals(q.size(), 0);
-        assertNull(q.poll());
+        checkEmpty(q);
     }
 
     /**
@@ -336,12 +374,17 @@ public class LinkedTransferQueueTest ext
      */
     public void testTimedPollWithOffer() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
-        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
+        Thread t = new Thread(new CheckedRunnable() {
             void realRun() throws InterruptedException {
-                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
-                q.poll(LONG_DELAY_MS, MILLISECONDS);
-                q.poll(LONG_DELAY_MS, MILLISECONDS);
+                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
+                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
+                try {
+                    q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
             }});
+
+        t.start();
         Thread.sleep(SMALL_DELAY_MS);
         assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
         t.interrupt();
@@ -351,7 +394,7 @@ public class LinkedTransferQueueTest ext
     /**
      * peek returns next element, or null if empty
      */
-    public void testPeek() {
+    public void testPeek() throws InterruptedException {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             assertEquals(i, (int) q.peek());
@@ -360,12 +403,13 @@ public class LinkedTransferQueueTest ext
                        i != (int) q.peek());
         }
         assertNull(q.peek());
+        checkEmpty(q);
     }
 
     /**
      * element returns next element, or throws NoSuchElementException if empty
      */
-    public void testElement() {
+    public void testElement() throws InterruptedException {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             assertEquals(i, (int) q.element());
@@ -374,14 +418,14 @@ public class LinkedTransferQueueTest ext
         try {
             q.element();
             shouldThrow();
-        } catch (NoSuchElementException success) {
-        }
+        } catch (NoSuchElementException success) {}
+        checkEmpty(q);
     }
 
     /**
      * remove removes next element, or throws NoSuchElementException if empty
      */
-    public void testRemove() {
+    public void testRemove() throws InterruptedException {
         LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             assertEquals(i, (int) q.remove());
@@ -389,14 +433,14 @@ public class LinkedTransferQueueTest ext
         try {
             q.remove();
             shouldThrow();
-        } catch (NoSuchElementException success) {
-        }
+        } catch (NoSuchElementException success) {}
+        checkEmpty(q);
     }
 
     /**
      * remove(x) removes x and returns true if present
      */
-    public void testRemoveElement() {
+    public void testRemoveElement() throws InterruptedException {
         LinkedTransferQueue q = populatedQueue(SIZE);
         for (int i = 1; i < SIZE; i += 2) {
             assertTrue(q.remove(i));
@@ -405,7 +449,7 @@ public class LinkedTransferQueueTest ext
             assertTrue(q.remove(i));
             assertFalse(q.remove(i + 1));
         }
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
     }
 
     /**
@@ -436,17 +480,17 @@ public class LinkedTransferQueueTest ext
     /**
      * clear removes all elements
      */
-    public void testClear() {
+    public void testClear() throws InterruptedException {
         LinkedTransferQueue q = populatedQueue(SIZE);
         q.clear();
-        assertTrue(q.isEmpty());
-        assertEquals(0, q.size());
+        checkEmpty(q);
         assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
         q.add(one);
         assertFalse(q.isEmpty());
+        assertEquals(1, q.size());
         assertTrue(q.contains(one));
         q.clear();
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
     }
 
     /**
@@ -500,7 +544,7 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * toArray contains all elements
+     * toArray() contains all elements
      */
     public void testToArray() throws InterruptedException {
         LinkedTransferQueue q = populatedQueue(SIZE);
@@ -530,20 +574,18 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = populatedQueue(SIZE);
             Object o[] = q.toArray(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
-     * toArray with incompatible array type throws CCE
+     * toArray(incompatible array type) throws CCE
      */
     public void testToArray1_BadArg() {
         try {
             LinkedTransferQueue q = populatedQueue(SIZE);
             Object o[] = q.toArray(new String[10]);
             shouldThrow();
-        } catch (ArrayStoreException success) {
-        }
+        } catch (ArrayStoreException success) {}
     }
 
     /**
@@ -560,7 +602,7 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * iterator.remove removes current element
+     * iterator.remove() removes current element
      */
     public void testIteratorRemove() {
         final LinkedTransferQueue q = new LinkedTransferQueue();
@@ -647,7 +689,7 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * poll retrieves elements across Executor threads
+     * timed poll retrieves elements across Executor threads
      */
     public void testPollInExecutor() {
         final LinkedTransferQueue q = new LinkedTransferQueue();
@@ -702,8 +744,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(null);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -714,8 +755,7 @@ public class LinkedTransferQueueTest ext
         try {
             q.drainTo(q);
             shouldThrow();
-        } catch (IllegalArgumentException success) {
-        }
+        } catch (IllegalArgumentException success) {}
     }
 
     /**
@@ -745,7 +785,7 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * drainTo empties full queue, unblocking a waiting put.
+     * drainTo(c) empties full queue, unblocking a waiting put.
      */
     public void testDrainToWithActivePut() throws InterruptedException {
         final LinkedTransferQueue q = populatedQueue(SIZE);
@@ -769,10 +809,9 @@ public class LinkedTransferQueueTest ext
     public void testDrainToNullN() {
         LinkedTransferQueue q = populatedQueue(SIZE);
         try {
-            q.drainTo(null, 0);
+            q.drainTo(null, SIZE);
             shouldThrow();
-        } catch (NullPointerException success) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -781,10 +820,9 @@ public class LinkedTransferQueueTest ext
     public void testDrainToSelfN() {
         LinkedTransferQueue q = populatedQueue(SIZE);
         try {
-            q.drainTo(q, 0);
+            q.drainTo(q, SIZE);
             shouldThrow();
-        } catch (IllegalArgumentException success) {
-        }
+        } catch (IllegalArgumentException success) {}
     }
 
     /**
@@ -810,23 +848,27 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * poll and take decrement the waiting consumer count
+     * timed poll() or take() increments the waiting consumer count;
+     * offer(e) decrements the waiting consumer count
      */
     public void testWaitingConsumer() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
-        final ConsumerObserver waiting = new ConsumerObserver();
+        assertEquals(q.getWaitingConsumerCount(), 0);
+        assertFalse(q.hasWaitingConsumer());
 
         Thread t = newStartedThread(new CheckedRunnable() {
             void realRun() throws InterruptedException {
                 Thread.sleep(SMALL_DELAY_MS);
                 threadAssertTrue(q.hasWaitingConsumer());
-                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
+                threadAssertEquals(q.getWaitingConsumerCount(), 1);
                 threadAssertTrue(q.offer(new Object()));
+                threadAssertFalse(q.hasWaitingConsumer());
+                threadAssertEquals(q.getWaitingConsumerCount(), 0);
             }});
 
         assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
-        assertTrue(q.getWaitingConsumerCount()
-                   < waiting.getWaitingConsumers());
+        assertEquals(q.getWaitingConsumerCount(), 0);
+        assertFalse(q.hasWaitingConsumer());
         t.join();
     }
 
@@ -838,8 +880,7 @@ public class LinkedTransferQueueTest ext
             LinkedTransferQueue q = new LinkedTransferQueue();
             q.transfer(null);
             shouldThrow();
-        } catch (NullPointerException ex) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -929,12 +970,12 @@ public class LinkedTransferQueueTest ext
         Thread t = newStartedThread(new CheckedRunnable() {
             void realRun() throws InterruptedException {
                 q.transfer(SIZE);
-                threadAssertTrue(q.isEmpty());
+                checkEmpty(q);
             }});
 
         Thread.sleep(SHORT_DELAY_MS);
         assertEquals(SIZE, (int) q.take());
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
         t.join();
     }
 
@@ -946,20 +987,18 @@ public class LinkedTransferQueueTest ext
             final LinkedTransferQueue q = new LinkedTransferQueue();
             q.tryTransfer(null);
             shouldThrow();
-        } catch (NullPointerException ex) {
-        }
+        } catch (NullPointerException success) {}
     }
 
     /**
      * tryTransfer returns false and does not enqueue if there are no
      * consumers waiting to poll or take.
      */
-    public void testTryTransfer2() {
+    public void testTryTransfer2() throws InterruptedException {
         final LinkedTransferQueue q = new LinkedTransferQueue();
         assertFalse(q.tryTransfer(new Object()));
         assertFalse(q.hasWaitingConsumer());
-        assertTrue(q.isEmpty());
-        assertEquals(0, q.size());
+        checkEmpty(q);
     }
 
     /**
@@ -981,7 +1020,7 @@ public class LinkedTransferQueueTest ext
             }});
 
         assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
         t.join();
     }
 
@@ -1004,7 +1043,7 @@ public class LinkedTransferQueueTest ext
             }});
 
         assertTrue(q.take() == hotPotato);
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
         t.join();
     }
 
@@ -1039,7 +1078,7 @@ public class LinkedTransferQueueTest ext
             }});
 
         Thread.sleep(SMALL_DELAY_MS);
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
         t.join();
     }
 
@@ -1062,7 +1101,7 @@ public class LinkedTransferQueueTest ext
         assertEquals(2, q.size());
         assertEquals(four, q.poll());
         assertEquals(five, q.poll());
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
         t.join();
     }
 
@@ -1077,8 +1116,8 @@ public class LinkedTransferQueueTest ext
         assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
         assertEquals(1, q.size());
         assertEquals(four, q.poll());
-        threadAssertTrue(q.isEmpty());
         assertNull(q.poll());
+        checkEmpty(q);
     }
 
     private LinkedTransferQueue<Integer> populatedQueue(int n) {
@@ -1092,20 +1131,4 @@ public class LinkedTransferQueueTest ext
         assertFalse(q.isEmpty());
         return q;
     }
-
-    private static class ConsumerObserver {
-
-        private int waitingConsumers;
-
-        private ConsumerObserver() {
-        }
-
-        private void setWaitingConsumer(int i) {
-            this.waitingConsumers = i;
-        }
-
-        private int getWaitingConsumers() {
-            return waitingConsumers;
-        }
-    }
 }