--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2009/11/22 18:57:17	1.20
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2021/01/27 02:55:18	1.88
@@ -1,58 +1,51 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  * Other contributors include John Vint
  */
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
-import java.util.concurrent.*;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import java.util.Queue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedTransferQueue;
+
 import junit.framework.Test;
-import junit.framework.TestSuite;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class LinkedTransferQueueTest extends JSR166TestCase {
+    public static class Generic extends BlockingQueueTest {
+        protected BlockingQueue emptyCollection() {
+            return new LinkedTransferQueue();
+        }
+    }
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
 
     public static Test suite() {
-        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) {}
+        class Implementation implements CollectionImplementation {
+            public Class<?> klazz() { return LinkedTransferQueue.class; }
+            public Collection emptyCollection() { return new LinkedTransferQueue(); }
+            public Object makeElement(int i) { return JSR166TestCase.itemFor(i); }
+            public boolean isConcurrent() { return true; }
+            public boolean permitsNulls() { return false; }
+        }
+        return newTestSuite(LinkedTransferQueueTest.class,
+                            new Generic().testSuite(),
+                            CollectionTest.testSuite(new Implementation()));
     }
 
     /**
@@ -60,7 +53,7 @@ public class LinkedTransferQueueTest ext
      * being true
      */
     public void testConstructor1() {
-        assertEquals(0, new LinkedTransferQueue().size());
+        mustEqual(0, new LinkedTransferQueue().size());
         assertTrue(new LinkedTransferQueue().isEmpty());
     }
 
@@ -80,9 +73,9 @@ public class LinkedTransferQueueTest ext
      * NullPointerException
      */
     public void testConstructor3() {
+        Collection<Item> elements = Arrays.asList(new Item[SIZE]);
         try {
-            Integer[] ints = new Integer[SIZE];
-            new LinkedTransferQueue(Arrays.asList(ints));
+            new LinkedTransferQueue(elements);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -92,12 +85,11 @@ public class LinkedTransferQueueTest ext
      * throws NullPointerException
      */
     public void testConstructor4() {
+        Item[] items = new Item[2];
+        items[0] = zero;
+        Collection<Item> elements = Arrays.asList(items);
         try {
-            Integer[] ints = new Integer[SIZE];
-            for (int i = 0; i < SIZE - 1; ++i) {
-                ints[i] = i;
-            }
-            new LinkedTransferQueue(Arrays.asList(ints));
+            new LinkedTransferQueue(elements);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -106,15 +98,11 @@ public class LinkedTransferQueueTest ext
      * Queue contains all elements of the collection it is initialized by
      */
     public void testConstructor5() {
-        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());
+        Item[] items = defaultItems;
+        List<Item> intList = Arrays.asList(items);
+        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>(intList);
+        mustEqual(q.size(), intList.size());
+        mustEqual(q.toString(), intList.toString());
         assertTrue(Arrays.equals(q.toArray(),
                                      intList.toArray()));
         assertTrue(Arrays.equals(q.toArray(new Object[0]),
@@ -122,7 +110,7 @@ public class LinkedTransferQueueTest ext
         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());
+            mustEqual(items[i], q.poll());
         }
     }
 
@@ -130,87 +118,39 @@ public class LinkedTransferQueueTest ext
      * remainingCapacity() always returns Integer.MAX_VALUE
      */
     public void testRemainingCapacity() {
-        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        BlockingQueue<Item> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
-            assertEquals(SIZE - i, q.size());
-            q.remove();
+            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
+            mustEqual(SIZE - i, q.size());
+            mustEqual(i, q.remove());
         }
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
-            assertEquals(i, q.size());
-            q.add(i);
+            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
+            mustEqual(i, q.size());
+            mustAdd(q, i);
         }
     }
 
     /**
-     * offer(null) throws NullPointerException
-     */
-    public void testOfferNull() {
-        try {
-            LinkedTransferQueue q = new LinkedTransferQueue();
-            q.offer(null);
-            shouldThrow();
-        } catch (NullPointerException success) {}
-    }
-
-    /**
-     * add(null) throws NullPointerException
-     */
-    public void testAddNull() {
-        try {
-            LinkedTransferQueue q = new LinkedTransferQueue();
-            q.add(null);
-            shouldThrow();
-        } catch (NullPointerException success) {}
-    }
-
-    /**
-     * addAll(null) throws NullPointerException
-     */
-    public void testAddAll1() {
-        try {
-            LinkedTransferQueue q = new LinkedTransferQueue();
-            q.addAll(null);
-            shouldThrow();
-        } catch (NullPointerException success) {}
-    }
-
-    /**
      * addAll(this) throws IllegalArgumentException
      */
     public void testAddAllSelf() {
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         try {
-            LinkedTransferQueue q = populatedQueue(SIZE);
             q.addAll(q);
             shouldThrow();
         } catch (IllegalArgumentException success) {}
     }
 
     /**
-     * addAll of a collection with null elements throws NullPointerException
-     */
-    public void testAddAll2() {
-        try {
-            LinkedTransferQueue q = new LinkedTransferQueue();
-            Integer[] ints = new Integer[SIZE];
-            q.addAll(Arrays.asList(ints));
-            shouldThrow();
-        } catch (NullPointerException success) {}
-    }
-
-    /**
      * addAll of a collection with any null elements throws
      * NullPointerException after possibly adding some elements
      */
     public void testAddAll3() {
+        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
+        Item[] items = new Item[2]; items[0] = zero;
         try {
-            LinkedTransferQueue q = new LinkedTransferQueue();
-            Integer[] ints = new Integer[SIZE];
-            for (int i = 0; i < SIZE - 1; ++i) {
-                ints[i] = i;
-            }
-            q.addAll(Arrays.asList(ints));
+            q.addAll(Arrays.asList(items));
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -219,39 +159,26 @@ public class LinkedTransferQueueTest ext
      * Queue contains all elements, in traversal order, of successful addAll
      */
     public void testAddAll5() {
-        Integer[] empty = new Integer[0];
-        Integer[] ints = new Integer[SIZE];
-        for (int i = 0; i < SIZE; ++i) {
-            ints[i] = i;
-        }
+        Item[] empty = new Item[0];
+        Item[] items = defaultItems;
         LinkedTransferQueue q = new LinkedTransferQueue();
         assertFalse(q.addAll(Arrays.asList(empty)));
-        assertTrue(q.addAll(Arrays.asList(ints)));
+        assertTrue(q.addAll(Arrays.asList(items)));
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(ints[i], q.poll());
+            mustEqual(items[i], q.poll());
         }
     }
 
     /**
-     * put(null) throws NullPointerException
-     */
-    public void testPutNull() throws InterruptedException {
-        try {
-            LinkedTransferQueue q = new LinkedTransferQueue();
-            q.put(null);
-            shouldThrow();
-        } catch (NullPointerException success) {}
-    }
-
-    /**
      * all elements successfully put are contained
      */
     public void testPut() {
-        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
+        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
+        Item[] items = defaultItems;
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(q.size(), i);
-            q.put(i);
-            assertTrue(q.contains(i));
+            mustEqual(i, q.size());
+            q.put(items[i]);
+            mustContain(q, items[i]);
         }
     }
 
@@ -259,85 +186,80 @@ public class LinkedTransferQueueTest ext
      * take retrieves elements in FIFO order
      */
     public void testTake() throws InterruptedException {
-        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, (int) q.take());
+            mustEqual(i, q.take());
         }
     }
 
     /**
-     * take blocks interruptibly when empty
-     */
-    public void testTakeFromEmpty() throws InterruptedException {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
-        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
-            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<Item> q = populatedQueue(SIZE);
+        final CountDownLatch pleaseInterrupt = 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());
-                }
+                for (int i = 0; i < SIZE; i++) mustEqual(i, q.take());
+
+                Thread.currentThread().interrupt();
                 try {
                     q.take();
                     shouldThrow();
                 } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
+
+                pleaseInterrupt.countDown();
+                try {
+                    q.take();
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
             }});
 
-        t.start();
-        Thread.sleep(SHORT_DELAY_MS);
+        await(pleaseInterrupt);
+        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
         t.interrupt();
-        t.join();
-        checkEmpty(q);
+        awaitTermination(t);
     }
 
     /**
      * poll succeeds unless empty
      */
     public void testPoll() throws InterruptedException {
-        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, (int) q.poll());
+            mustEqual(i, q.poll());
         }
         assertNull(q.poll());
         checkEmpty(q);
     }
 
     /**
-     * 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);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, (int) q.poll(0, MILLISECONDS));
+            mustEqual(i, q.poll(0, MILLISECONDS));
         }
         assertNull(q.poll(0, MILLISECONDS));
         checkEmpty(q);
     }
 
     /**
-     * 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);
-        }
-        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
+        long startTime = System.nanoTime();
+        for (int i = 0; i < SIZE; ++i)
+            mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
+        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
+
+        startTime = System.nanoTime();
+        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
+        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
         checkEmpty(q);
     }
 
@@ -346,61 +268,67 @@ public class LinkedTransferQueueTest ext
      * returning timeout status
      */
     public void testInterruptedTimedPoll() throws InterruptedException {
-        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        final BlockingQueue<Item> q = populatedQueue(SIZE);
+        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
         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);
-                }
+            public void realRun() throws InterruptedException {
+                for (int i = 0; i < SIZE; i++)
+                    mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
+
+                Thread.currentThread().interrupt();
                 try {
-                    q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    q.poll(randomTimeout(), randomTimeUnit());
                     shouldThrow();
                 } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
+
+                pleaseInterrupt.countDown();
+                try {
+                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
             }});
 
-        Thread.sleep(SMALL_DELAY_MS);
+        await(pleaseInterrupt);
+        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
         t.interrupt();
-        t.join();
+        awaitTermination(t);
         checkEmpty(q);
     }
 
     /**
-     * timed poll before a delayed offer fails; after offer succeeds;
-     * on interruption throws
+     * timed poll after thread interrupted throws InterruptedException
+     * instead of returning timeout status
      */
-    public void testTimedPollWithOffer() throws InterruptedException {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
-        Thread t = new Thread(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
-                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
+    public void testTimedPollAfterInterrupt() throws InterruptedException {
+        final BlockingQueue<Item> q = populatedQueue(SIZE);
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                Thread.currentThread().interrupt();
+                for (int i = 0; i < SIZE; ++i)
+                    mustEqual(i, q.poll(randomTimeout(), randomTimeUnit()));
                 try {
-                    q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    q.poll(randomTimeout(), randomTimeUnit());
                     shouldThrow();
                 } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
             }});
 
-        t.start();
-        Thread.sleep(SMALL_DELAY_MS);
-        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
-        t.interrupt();
-        t.join();
+        awaitTermination(t);
+        checkEmpty(q);
     }
 
     /**
      * peek returns next element, or null if empty
      */
     public void testPeek() throws InterruptedException {
-        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, (int) q.peek());
-            assertEquals(i, (int) q.poll());
+            mustEqual(i, q.peek());
+            mustEqual(i, q.poll());
             assertTrue(q.peek() == null ||
-                       i != (int) q.peek());
+                       i != q.peek().value);
         }
         assertNull(q.peek());
         checkEmpty(q);
@@ -410,10 +338,10 @@ public class LinkedTransferQueueTest ext
      * element returns next element, or throws NoSuchElementException if empty
      */
     public void testElement() throws InterruptedException {
-        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, (int) q.element());
-            assertEquals(i, (int) q.poll());
+            mustEqual(i, q.element());
+            mustEqual(i, q.poll());
         }
         try {
             q.element();
@@ -426,9 +354,9 @@ public class LinkedTransferQueueTest ext
      * remove removes next element, or throws NoSuchElementException if empty
      */
     public void testRemove() throws InterruptedException {
-        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, (int) q.remove());
+            mustEqual(i, q.remove());
         }
         try {
             q.remove();
@@ -438,42 +366,27 @@ public class LinkedTransferQueueTest ext
     }
 
     /**
-     * remove(x) removes x and returns true if present
-     */
-    public void testRemoveElement() throws InterruptedException {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-        for (int i = 1; i < SIZE; i += 2) {
-            assertTrue(q.remove(i));
-        }
-        for (int i = 0; i < SIZE; i += 2) {
-            assertTrue(q.remove(i));
-            assertFalse(q.remove(i + 1));
-        }
-        checkEmpty(q);
-    }
-
-    /**
      * An add following remove(x) succeeds
      */
     public void testRemoveElementAndAdd() throws InterruptedException {
-        LinkedTransferQueue q = new LinkedTransferQueue();
-        assertTrue(q.add(one));
-        assertTrue(q.add(two));
-        assertTrue(q.remove(one));
-        assertTrue(q.remove(two));
-        assertTrue(q.add(three));
-        assertTrue(q.take() == three);
+        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
+        mustAdd(q, one);
+        mustAdd(q, two);
+        mustRemove(q, one);
+        mustRemove(q, two);
+        mustAdd(q, three);
+        mustEqual(q.take(), three);
     }
 
     /**
      * contains(x) reports true when elements added but not yet removed
      */
     public void testContains() {
-        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertTrue(q.contains(i));
-            assertEquals(i, (int) q.poll());
-            assertFalse(q.contains(i));
+            mustContain(q, i);
+            mustEqual(i, q.poll());
+            mustNotContain(q, i);
         }
     }
 
@@ -481,14 +394,14 @@ public class LinkedTransferQueueTest ext
      * clear removes all elements
      */
     public void testClear() throws InterruptedException {
-        LinkedTransferQueue q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         q.clear();
         checkEmpty(q);
-        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
+        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
         q.add(one);
         assertFalse(q.isEmpty());
-        assertEquals(1, q.size());
-        assertTrue(q.contains(one));
+        mustEqual(1, q.size());
+        mustContain(q, one);
         q.clear();
         checkEmpty(q);
     }
@@ -497,12 +410,12 @@ public class LinkedTransferQueueTest ext
      * containsAll(c) is true when c contains a subset of elements
      */
     public void testContainsAll() {
-        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
-        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> p = new LinkedTransferQueue<>();
         for (int i = 0; i < SIZE; ++i) {
             assertTrue(q.containsAll(p));
             assertFalse(p.containsAll(q));
-            p.add(i);
+            mustAdd(p, i);
         }
         assertTrue(p.containsAll(q));
     }
@@ -512,8 +425,8 @@ public class LinkedTransferQueueTest ext
      * if changed
      */
     public void testRetainAll() {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-        LinkedTransferQueue p = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> p = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             boolean changed = q.retainAll(p);
             if (i == 0) {
@@ -522,7 +435,7 @@ public class LinkedTransferQueueTest ext
                 assertTrue(changed);
             }
             assertTrue(q.containsAll(p));
-            assertEquals(SIZE - i, q.size());
+            mustEqual(SIZE - i, q.size());
             p.remove();
         }
     }
@@ -533,90 +446,95 @@ public class LinkedTransferQueueTest ext
      */
     public void testRemoveAll() {
         for (int i = 1; i < SIZE; ++i) {
-            LinkedTransferQueue q = populatedQueue(SIZE);
-            LinkedTransferQueue p = populatedQueue(i);
+            LinkedTransferQueue<Item> q = populatedQueue(SIZE);
+            LinkedTransferQueue<Item> p = populatedQueue(i);
             assertTrue(q.removeAll(p));
-            assertEquals(SIZE - i, q.size());
+            mustEqual(SIZE - i, q.size());
             for (int j = 0; j < i; ++j) {
-                assertFalse(q.contains(p.remove()));
+                mustNotContain(q, p.remove());
             }
         }
     }
 
     /**
-     * toArray() contains all elements
+     * toArray() contains all elements in FIFO order
      */
-    public void testToArray() throws InterruptedException {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-        Object[] o = q.toArray();
-        for (int i = 0; i < o.length; i++) {
-            assertEquals(o[i], q.take());
-        }
+    public void testToArray() {
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
+        Object[] a = q.toArray();
+        assertSame(Object[].class, a.getClass());
+        for (Object o : a)
+            assertSame(o, q.poll());
+        assertTrue(q.isEmpty());
     }
 
     /**
-     * toArray(a) contains all elements
+     * toArray(a) contains all elements in FIFO order
      */
-    public void testToArray2() throws InterruptedException {
-        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
-        Integer[] ints = new Integer[SIZE];
-        ints = q.toArray(ints);
-        for (int i = 0; i < ints.length; i++) {
-            assertEquals(ints[i], q.take());
-        }
+    public void testToArray2() {
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
+        Item[] items = new Item[SIZE];
+        Item[] array = q.toArray(items);
+        assertSame(items, array);
+        for (Item o : items)
+            assertSame(o, q.poll());
+        assertTrue(q.isEmpty());
     }
 
     /**
-     * toArray(null) throws NullPointerException
+     * toArray(incompatible array type) throws ArrayStoreException
      */
-    public void testToArray_BadArg() {
-        LinkedTransferQueue q = populatedQueue(SIZE);
+    @SuppressWarnings("CollectionToArraySafeParameter")
+    public void testToArray_incompatibleArrayType() {
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         try {
-            Object o[] = q.toArray(null);
+            q.toArray(new String[10]);
             shouldThrow();
-        } catch (NullPointerException success) {}
+        } catch (ArrayStoreException success) {}
     }
 
     /**
-     * toArray(incompatible array type) throws CCE
+     * iterator iterates through all elements
      */
-    public void testToArray1_BadArg() {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-        try {
-            Object o[] = q.toArray(new String[10]);
-            shouldThrow();
-        } catch (ArrayStoreException success) {}
+    public void testIterator() throws InterruptedException {
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
+        Iterator<? extends Item> it = q.iterator();
+        int i;
+        for (i = 0; it.hasNext(); i++)
+            mustContain(q, it.next());
+        mustEqual(i, SIZE);
+        assertIteratorExhausted(it);
+
+        it = q.iterator();
+        for (i = 0; it.hasNext(); i++)
+            mustEqual(it.next(), q.take());
+        mustEqual(i, SIZE);
+        assertIteratorExhausted(it);
     }
 
     /**
-     * iterator iterates through all elements
+     * iterator of empty collection has no elements
      */
-    public void testIterator() throws InterruptedException {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-        Iterator it = q.iterator();
-        int i = 0;
-        while (it.hasNext()) {
-            assertEquals(it.next(), i++);
-        }
-        assertEquals(i, SIZE);
+    public void testEmptyIterator() {
+        assertIteratorExhausted(new LinkedTransferQueue().iterator());
     }
 
     /**
      * iterator.remove() removes current element
      */
     public void testIteratorRemove() {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
         q.add(two);
         q.add(one);
         q.add(three);
 
-        Iterator it = q.iterator();
+        Iterator<? extends Item> it = q.iterator();
         it.next();
         it.remove();
 
         it = q.iterator();
-        assertEquals(it.next(), one);
-        assertEquals(it.next(), three);
+        assertSame(it.next(), one);
+        assertSame(it.next(), three);
         assertFalse(it.hasNext());
     }
 
@@ -624,43 +542,42 @@ public class LinkedTransferQueueTest ext
      * iterator ordering is FIFO
      */
     public void testIteratorOrdering() {
-        final LinkedTransferQueue<Integer> q
-            = new LinkedTransferQueue<Integer>();
-        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
+        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
         q.add(one);
         q.add(two);
         q.add(three);
-        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
+        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
         int k = 0;
-        for (Integer n : q) {
-            assertEquals(++k, (int) n);
+        for (Item n : q) {
+            mustEqual(++k, n);
         }
-        assertEquals(3, k);
+        mustEqual(3, k);
     }
 
     /**
      * Modifications do not cause iterators to fail
      */
     public void testWeaklyConsistentIteration() {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
         q.add(one);
         q.add(two);
         q.add(three);
-        for (Iterator it = q.iterator(); it.hasNext();) {
+        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
             q.remove();
             it.next();
         }
-        assertEquals(0, q.size());
+        mustEqual(0, q.size());
     }
 
     /**
      * toString contains toStrings of elements
      */
     public void testToString() {
-        LinkedTransferQueue q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         String s = q.toString();
         for (int i = 0; i < SIZE; ++i) {
-            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+            assertTrue(s.contains(String.valueOf(i)));
         }
     }
 
@@ -668,119 +585,96 @@ public class LinkedTransferQueueTest ext
      * offer transfers elements across Executor tasks
      */
     public void testOfferInExecutor() {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
-        q.add(one);
-        q.add(two);
-        ExecutorService executor = Executors.newFixedThreadPool(2);
-
-        executor.execute(new CheckedRunnable() {
-            void realRun() {
-                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
-                                         MILLISECONDS));
-            }});
-
-        executor.execute(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                Thread.sleep(SMALL_DELAY_MS);
-                threadAssertEquals(one, q.take());
-            }});
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
+        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
+        final ExecutorService executor = Executors.newFixedThreadPool(2);
+        try (PoolCleaner cleaner = cleaner(executor)) {
+
+            executor.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    threadsStarted.await();
+                    long startTime = System.nanoTime();
+                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
+                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
+                }});
 
-        joinPool(executor);
+            executor.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    threadsStarted.await();
+                    assertSame(one, q.take());
+                    checkEmpty(q);
+                }});
+        }
     }
 
     /**
      * timed poll retrieves elements across Executor threads
      */
     public void testPollInExecutor() {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
-        ExecutorService executor = Executors.newFixedThreadPool(2);
-
-        executor.execute(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                threadAssertNull(q.poll());
-                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
-                                                MILLISECONDS));
-                threadAssertTrue(q.isEmpty());
-            }});
-
-        executor.execute(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                Thread.sleep(SMALL_DELAY_MS);
-                q.put(one);
-            }});
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
+        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
+        final ExecutorService executor = Executors.newFixedThreadPool(2);
+        try (PoolCleaner cleaner = cleaner(executor)) {
+
+            executor.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    assertNull(q.poll());
+                    threadsStarted.await();
+                    long startTime = System.nanoTime();
+                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
+                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
+                    checkEmpty(q);
+                }});
 
-        joinPool(executor);
+            executor.execute(new CheckedRunnable() {
+                public void realRun() throws InterruptedException {
+                    threadsStarted.await();
+                    q.put(one);
+                }});
+        }
     }
 
     /**
-     * A deserialized serialized queue has same elements in same order
+     * A deserialized/reserialized queue has same elements in same order
      */
     public void testSerialization() throws Exception {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-
-        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
-        ObjectOutputStream out
-            = new ObjectOutputStream(new BufferedOutputStream(bout));
-        out.writeObject(q);
-        out.close();
+        Queue<Item> x = populatedQueue(SIZE);
+        Queue<Item> y = serialClone(x);
 
-        ByteArrayInputStream bin
-            = new ByteArrayInputStream(bout.toByteArray());
-        ObjectInputStream in
-            = new ObjectInputStream(new BufferedInputStream(bin));
-        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
-
-        assertEquals(q.size(), r.size());
-        while (!q.isEmpty()) {
-            assertEquals(q.remove(), r.remove());
+        assertNotSame(y, x);
+        mustEqual(x.size(), y.size());
+        mustEqual(x.toString(), y.toString());
+        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
+        while (!x.isEmpty()) {
+            assertFalse(y.isEmpty());
+            mustEqual(x.remove(), y.remove());
         }
-    }
-
-    /**
-     * drainTo(null) throws NullPointerException
-     */
-    public void testDrainToNull() {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-        try {
-            q.drainTo(null);
-            shouldThrow();
-        } catch (NullPointerException success) {}
-    }
-
-    /**
-     * drainTo(this) throws IllegalArgumentException
-     */
-    public void testDrainToSelf() {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-        try {
-            q.drainTo(q);
-            shouldThrow();
-        } catch (IllegalArgumentException success) {}
+        assertTrue(y.isEmpty());
     }
 
     /**
      * drainTo(c) empties queue into another collection c
      */
     public void testDrainTo() {
-        LinkedTransferQueue q = populatedQueue(SIZE);
+        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         ArrayList l = new ArrayList();
         q.drainTo(l);
-        assertEquals(q.size(), 0);
-        assertEquals(l.size(), SIZE);
+        mustEqual(0, q.size());
+        mustEqual(SIZE, l.size());
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(l.get(i), i);
+            mustEqual(i, l.get(i));
         }
         q.add(zero);
         q.add(one);
         assertFalse(q.isEmpty());
-        assertTrue(q.contains(zero));
-        assertTrue(q.contains(one));
+        mustContain(q, zero);
+        mustContain(q, one);
         l.clear();
         q.drainTo(l);
-        assertEquals(q.size(), 0);
-        assertEquals(l.size(), 2);
+        mustEqual(0, q.size());
+        mustEqual(2, l.size());
         for (int i = 0; i < 2; ++i) {
-            assertEquals(l.get(i), i);
+            mustEqual(i, l.get(i));
         }
     }
 
@@ -788,62 +682,37 @@ public class LinkedTransferQueueTest ext
      * drainTo(c) empties full queue, unblocking a waiting put.
      */
     public void testDrainToWithActivePut() throws InterruptedException {
-        final LinkedTransferQueue q = populatedQueue(SIZE);
+        final LinkedTransferQueue<Item> q = populatedQueue(SIZE);
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() {
-                q.put(SIZE + 1);
+            public void realRun() {
+                q.put(new Item(SIZE + 1));
             }});
         ArrayList l = new ArrayList();
         q.drainTo(l);
         assertTrue(l.size() >= SIZE);
-        for (int i = 0; i < SIZE; ++i) {
-            assertEquals(l.get(i), i);
-        }
-        t.join();
+        for (int i = 0; i < SIZE; ++i)
+            mustEqual(i, l.get(i));
+        awaitTermination(t);
         assertTrue(q.size() + l.size() >= SIZE);
     }
 
     /**
-     * drainTo(null, n) throws NullPointerException
-     */
-    public void testDrainToNullN() {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-        try {
-            q.drainTo(null, SIZE);
-            shouldThrow();
-        } catch (NullPointerException success) {}
-    }
-
-    /**
-     * drainTo(this, n) throws IllegalArgumentException
-     */
-    public void testDrainToSelfN() {
-        LinkedTransferQueue q = populatedQueue(SIZE);
-        try {
-            q.drainTo(q, SIZE);
-            shouldThrow();
-        } catch (IllegalArgumentException success) {}
-    }
-
-    /**
-     * 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();
+        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
         for (int i = 0; i < SIZE + 2; ++i) {
             for (int j = 0; j < SIZE; j++) {
-                assertTrue(q.offer(j));
+                mustOffer(q, j);
             }
             ArrayList l = new ArrayList();
             q.drainTo(l, i);
             int k = (i < SIZE) ? i : SIZE;
-            assertEquals(l.size(), k);
-            assertEquals(q.size(), SIZE - k);
-            for (int j = 0; j < k; ++j) {
-                assertEquals(l.get(j), j);
-            }
-            while (q.poll() != null)
-                ;
+            mustEqual(k, l.size());
+            mustEqual(SIZE - k, q.size());
+            for (int j = 0; j < k; ++j)
+                mustEqual(j, l.get(j));
+            do {} while (q.poll() != null);
         }
     }
 
@@ -852,24 +721,33 @@ public class LinkedTransferQueueTest ext
      * offer(e) decrements the waiting consumer count
      */
     public void testWaitingConsumer() throws InterruptedException {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
-        assertEquals(q.getWaitingConsumerCount(), 0);
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
+        mustEqual(0, q.getWaitingConsumerCount());
         assertFalse(q.hasWaitingConsumer());
+        final CountDownLatch threadStarted = new CountDownLatch(1);
 
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                Thread.sleep(SMALL_DELAY_MS);
-                threadAssertTrue(q.hasWaitingConsumer());
-                threadAssertEquals(q.getWaitingConsumerCount(), 1);
-                threadAssertTrue(q.offer(new Object()));
-                threadAssertFalse(q.hasWaitingConsumer());
-                threadAssertEquals(q.getWaitingConsumerCount(), 0);
+            public void realRun() throws InterruptedException {
+                threadStarted.countDown();
+                long startTime = System.nanoTime();
+                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
+                mustEqual(0, q.getWaitingConsumerCount());
+                assertFalse(q.hasWaitingConsumer());
+                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
             }});
 
-        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
-        assertEquals(q.getWaitingConsumerCount(), 0);
+        threadStarted.await();
+        Callable<Boolean> oneConsumer = new Callable<>() { 
+            public Boolean call() {
+                return q.hasWaitingConsumer()
+                && q.getWaitingConsumerCount() == 1; }};
+        waitForThreadToEnterWaitState(t, oneConsumer);
+
+        assertTrue(q.offer(one));
+        mustEqual(0, q.getWaitingConsumerCount());
         assertFalse(q.hasWaitingConsumer());
-        t.join();
+
+        awaitTermination(t);
     }
 
     /**
@@ -877,66 +755,68 @@ public class LinkedTransferQueueTest ext
      */
     public void testTransfer1() throws InterruptedException {
         try {
-            LinkedTransferQueue q = new LinkedTransferQueue();
+            LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
             q.transfer(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
 
     /**
-     * transfer waits until a poll occurs. The transfered element
-     * is returned by this associated poll.
+     * transfer waits until a poll occurs. The transferred element
+     * is returned by the associated poll.
      */
     public void testTransfer2() throws InterruptedException {
-        final LinkedTransferQueue<Integer> q
-            = new LinkedTransferQueue<Integer>();
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
+        final CountDownLatch threadStarted = new CountDownLatch(1);
 
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                q.transfer(SIZE);
-                threadAssertTrue(q.isEmpty());
+            public void realRun() throws InterruptedException {
+                threadStarted.countDown();
+                q.transfer(five);
+                checkEmpty(q);
             }});
 
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(1, q.size());
-        assertEquals(SIZE, (int) q.poll());
-        assertTrue(q.isEmpty());
-        t.join();
+        threadStarted.await();
+        Callable<Boolean> oneElement = new Callable<>() { 
+            public Boolean call() {
+                return !q.isEmpty() && q.size() == 1; }};
+        waitForThreadToEnterWaitState(t, oneElement);
+
+        assertSame(five, q.poll());
+        checkEmpty(q);
+        awaitTermination(t);
     }
 
     /**
      * transfer waits until a poll occurs, and then transfers in fifo order
      */
     public void testTransfer3() throws InterruptedException {
-        final LinkedTransferQueue<Integer> q
-            = new LinkedTransferQueue<Integer>();
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
 
         Thread first = newStartedThread(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                Integer i = SIZE + 1;
-                q.transfer(i);
-                threadAssertTrue(!q.contains(i));
-                threadAssertEquals(1, q.size());
+            public void realRun() throws InterruptedException {
+                q.transfer(four);
+                mustNotContain(q, four);
+                mustEqual(1, q.size());
             }});
 
         Thread interruptedThread = newStartedThread(
             new CheckedInterruptedRunnable() {
-                void realRun() throws InterruptedException {
-                    while (q.size() == 0)
+                public void realRun() throws InterruptedException {
+                    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());
+        mustEqual(2, q.size());
+        assertSame(four, q.poll());
         first.join();
-        assertEquals(1, q.size());
+        mustEqual(1, q.size());
         interruptedThread.interrupt();
         interruptedThread.join();
-        assertEquals(0, q.size());
-        assertTrue(q.isEmpty());
+        checkEmpty(q);
     }
 
     /**
@@ -944,47 +824,52 @@ public class LinkedTransferQueueTest ext
      * thread returns the element
      */
     public void testTransfer4() throws InterruptedException {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
 
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
+            public void realRun() throws InterruptedException {
                 q.transfer(four);
-                threadAssertFalse(q.contains(four));
-                threadAssertEquals(three, q.poll());
+                mustNotContain(q, four);
+                assertSame(three, q.poll());
             }});
 
-        Thread.sleep(SHORT_DELAY_MS);
+        while (q.isEmpty())
+            Thread.yield();
+        assertFalse(q.isEmpty());
+        mustEqual(1, q.size());
         assertTrue(q.offer(three));
-        assertEquals(four, q.poll());
-        t.join();
+        assertSame(four, q.poll());
+        awaitTermination(t);
     }
 
     /**
-     * transfer waits until a take occurs. The transfered element
-     * is returned by this associated take.
+     * transfer waits until a take occurs. The transferred element
+     * is returned by the associated take.
      */
     public void testTransfer5() throws InterruptedException {
-        final LinkedTransferQueue<Integer> q
-            = new LinkedTransferQueue<Integer>();
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
 
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                q.transfer(SIZE);
+            public void realRun() throws InterruptedException {
+                q.transfer(four);
                 checkEmpty(q);
             }});
 
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(SIZE, (int) q.take());
+        while (q.isEmpty())
+            Thread.yield();
+        assertFalse(q.isEmpty());
+        mustEqual(1, q.size());
+        assertSame(four, q.take());
         checkEmpty(q);
-        t.join();
+        awaitTermination(t);
     }
 
     /**
      * tryTransfer(null) throws NullPointerException
      */
     public void testTryTransfer1() {
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
         try {
-            final LinkedTransferQueue q = new LinkedTransferQueue();
             q.tryTransfer(null);
             shouldThrow();
         } catch (NullPointerException success) {}
@@ -995,7 +880,7 @@ public class LinkedTransferQueueTest ext
      * consumers waiting to poll or take.
      */
     public void testTryTransfer2() throws InterruptedException {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
+        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
         assertFalse(q.tryTransfer(new Object()));
         assertFalse(q.hasWaitingConsumer());
         checkEmpty(q);
@@ -1007,21 +892,22 @@ public class LinkedTransferQueueTest ext
      */
     public void testTryTransfer3() throws InterruptedException {
         final Object hotPotato = new Object();
-        final LinkedTransferQueue q = new LinkedTransferQueue();
+        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
 
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() {
+            public void realRun() {
                 while (! q.hasWaitingConsumer())
                     Thread.yield();
-                threadAssertTrue(q.hasWaitingConsumer());
-                threadAssertTrue(q.isEmpty());
-                threadAssertTrue(q.size() == 0);
-                threadAssertTrue(q.tryTransfer(hotPotato));
+                assertTrue(q.hasWaitingConsumer());
+                checkEmpty(q);
+                assertTrue(q.tryTransfer(hotPotato));
             }});
 
-        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
+        long startTime = System.nanoTime();
+        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
+        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
         checkEmpty(q);
-        t.join();
+        awaitTermination(t);
     }
 
     /**
@@ -1030,56 +916,71 @@ public class LinkedTransferQueueTest ext
      */
     public void testTryTransfer4() throws InterruptedException {
         final Object hotPotato = new Object();
-        final LinkedTransferQueue q = new LinkedTransferQueue();
+        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
 
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() {
+            public void realRun() {
                 while (! q.hasWaitingConsumer())
                     Thread.yield();
-                threadAssertTrue(q.hasWaitingConsumer());
-                threadAssertTrue(q.isEmpty());
-                threadAssertTrue(q.size() == 0);
-                threadAssertTrue(q.tryTransfer(hotPotato));
+                assertTrue(q.hasWaitingConsumer());
+                checkEmpty(q);
+                assertTrue(q.tryTransfer(hotPotato));
             }});
 
-        assertTrue(q.take() == hotPotato);
+        assertSame(q.take(), hotPotato);
         checkEmpty(q);
-        t.join();
+        awaitTermination(t);
     }
 
     /**
-     * tryTransfer waits the amount given if interrupted, and
-     * throws interrupted exception
+     * tryTransfer blocks interruptibly if no takers
      */
     public void testTryTransfer5() throws InterruptedException {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
+        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
+        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
+        assertTrue(q.isEmpty());
 
-        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
-            void realRun() throws InterruptedException {
-                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() throws InterruptedException {
+                Thread.currentThread().interrupt();
+                try {
+                    q.tryTransfer(new Object(), randomTimeout(), randomTimeUnit());
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
+
+                pleaseInterrupt.countDown();
+                try {
+                    q.tryTransfer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+                assertFalse(Thread.interrupted());
             }});
 
-        Thread.sleep(SMALL_DELAY_MS);
-        toInterrupt.interrupt();
-        toInterrupt.join();
+        await(pleaseInterrupt);
+        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
+        t.interrupt();
+        awaitTermination(t);
+        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();
+        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
 
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                threadAssertFalse
-                    (q.tryTransfer(new Object(),
-                                   SHORT_DELAY_MS, MILLISECONDS));
+            public void realRun() throws InterruptedException {
+                long startTime = System.nanoTime();
+                assertFalse(q.tryTransfer(new Object(),
+                                          timeoutMillis(), MILLISECONDS));
+                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+                checkEmpty(q);
             }});
 
-        Thread.sleep(SMALL_DELAY_MS);
+        awaitTermination(t);
         checkEmpty(q);
-        t.join();
     }
 
     /**
@@ -1087,48 +988,67 @@ public class LinkedTransferQueueTest ext
      * before transfering to a poll or take
      */
     public void testTryTransfer7() throws InterruptedException {
-        final LinkedTransferQueue q = new LinkedTransferQueue();
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
         assertTrue(q.offer(four));
 
         Thread t = newStartedThread(new CheckedRunnable() {
-            void realRun() throws InterruptedException {
-                threadAssertTrue(q.tryTransfer(five,
-                                               MEDIUM_DELAY_MS, MILLISECONDS));
-                threadAssertTrue(q.isEmpty());
+            public void realRun() throws InterruptedException {
+                long startTime = System.nanoTime();
+                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
+                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
+                checkEmpty(q);
             }});
 
-        Thread.sleep(SHORT_DELAY_MS);
-        assertEquals(2, q.size());
-        assertEquals(four, q.poll());
-        assertEquals(five, q.poll());
+        while (q.size() != 2)
+            Thread.yield();
+        mustEqual(2, q.size());
+        assertSame(four, q.poll());
+        assertSame(five, q.poll());
         checkEmpty(q);
-        t.join();
+        awaitTermination(t);
     }
 
     /**
-     * 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();
+        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
         assertTrue(q.offer(four));
-        assertEquals(1, q.size());
-        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
-        assertEquals(1, q.size());
-        assertEquals(four, q.poll());
+        mustEqual(1, q.size());
+        long startTime = System.nanoTime();
+        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
+        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+        mustEqual(1, q.size());
+        assertSame(four, q.poll());
         assertNull(q.poll());
         checkEmpty(q);
     }
 
-    private LinkedTransferQueue<Integer> populatedQueue(int n) {
-        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
-        assertTrue(q.isEmpty());
+    private LinkedTransferQueue<Item> populatedQueue(int n) {
+        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
+        checkEmpty(q);
         for (int i = 0; i < n; i++) {
-            assertEquals(i, q.size());
-            assertTrue(q.offer(i));
-            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
+            mustEqual(i, q.size());
+            mustOffer(q, i);
+            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
         }
         assertFalse(q.isEmpty());
         return q;
     }
+
+    /**
+     * remove(null), contains(null) always return false
+     */
+    public void testNeverContainsNull() {
+        Collection<?>[] qs = {
+            new LinkedTransferQueue<>(),
+            populatedQueue(2),
+        };
+
+        for (Collection<?> q : qs) {
+            assertFalse(q.contains(null));
+            assertFalse(q.remove(null));
+        }
+    }
 }