--- jsr166/src/test/tck/LinkedTransferQueueTest.java 2011/11/26 05:42:14 1.51 +++ jsr166/src/test/tck/LinkedTransferQueueTest.java 2021/01/27 01:57:24 1.87 @@ -5,25 +5,26 @@ * Other contributors include John Vint */ -import junit.framework.*; -import java.util.Arrays; +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.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 static java.util.concurrent.TimeUnit.MILLISECONDS; -import static java.util.concurrent.TimeUnit.NANOSECONDS; + +import junit.framework.Test; @SuppressWarnings({"unchecked", "rawtypes"}) public class LinkedTransferQueueTest extends JSR166TestCase { - public static class Generic extends BlockingQueueTest { protected BlockingQueue emptyCollection() { return new LinkedTransferQueue(); @@ -31,12 +32,20 @@ public class LinkedTransferQueueTest ext } public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); + main(suite(), args); } public static Test suite() { + 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()); + new Generic().testSuite(), + CollectionTest.testSuite(new Implementation())); } /** @@ -44,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()); } @@ -64,7 +73,7 @@ public class LinkedTransferQueueTest ext * NullPointerException */ public void testConstructor3() { - Collection elements = Arrays.asList(new Integer[SIZE]); + Collection elements = Arrays.asList(new Item[SIZE]); try { new LinkedTransferQueue(elements); shouldThrow(); @@ -76,10 +85,9 @@ public class LinkedTransferQueueTest ext * throws NullPointerException */ public void testConstructor4() { - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE-1; ++i) - ints[i] = i; - Collection elements = Arrays.asList(ints); + Item[] items = new Item[2]; + items[0] = zero; + Collection elements = Arrays.asList(items); try { new LinkedTransferQueue(elements); shouldThrow(); @@ -90,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 intList = Arrays.asList(items); + LinkedTransferQueue 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]), @@ -106,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()); } } @@ -114,16 +118,16 @@ public class LinkedTransferQueueTest ext * remainingCapacity() always returns Integer.MAX_VALUE */ public void testRemainingCapacity() { - LinkedTransferQueue q = populatedQueue(SIZE); + BlockingQueue 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); } } @@ -131,8 +135,8 @@ public class LinkedTransferQueueTest ext * addAll(this) throws IllegalArgumentException */ public void testAddAllSelf() { + LinkedTransferQueue q = populatedQueue(SIZE); try { - LinkedTransferQueue q = populatedQueue(SIZE); q.addAll(q); shouldThrow(); } catch (IllegalArgumentException success) {} @@ -143,13 +147,10 @@ public class LinkedTransferQueueTest ext * NullPointerException after possibly adding some elements */ public void testAddAll3() { + LinkedTransferQueue 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) {} } @@ -158,16 +159,13 @@ 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()); } } @@ -175,11 +173,12 @@ public class LinkedTransferQueueTest ext * all elements successfully put are contained */ public void testPut() { - LinkedTransferQueue q = new LinkedTransferQueue(); + LinkedTransferQueue q = new LinkedTransferQueue<>(); + Item[] items = defaultItems; for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.size()); - q.put(i); - assertTrue(q.contains(i)); + mustEqual(i, q.size()); + q.put(items[i]); + mustContain(q, items[i]); } } @@ -187,9 +186,9 @@ public class LinkedTransferQueueTest ext * take retrieves elements in FIFO order */ public void testTake() throws InterruptedException { - LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, (int) q.take()); + mustEqual(i, q.take()); } } @@ -197,13 +196,11 @@ public class LinkedTransferQueueTest ext * take removes existing elements until empty, then blocks interruptibly */ public void testBlockingTake() throws InterruptedException { - final BlockingQueue q = populatedQueue(SIZE); + final BlockingQueue 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, q.take()); - } + for (int i = 0; i < SIZE; i++) mustEqual(i, q.take()); Thread.currentThread().interrupt(); try { @@ -221,7 +218,7 @@ public class LinkedTransferQueueTest ext }}); await(pleaseInterrupt); - assertThreadStaysAlive(t); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING); t.interrupt(); awaitTermination(t); } @@ -230,9 +227,9 @@ public class LinkedTransferQueueTest ext * poll succeeds unless empty */ public void testPoll() throws InterruptedException { - LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, (int) q.poll()); + mustEqual(i, q.poll()); } assertNull(q.poll()); checkEmpty(q); @@ -242,9 +239,9 @@ public class LinkedTransferQueueTest ext * timed poll with zero timeout succeeds when non-empty, else times out */ public void testTimedPoll0() throws InterruptedException { - LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue 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); @@ -254,13 +251,13 @@ public class LinkedTransferQueueTest ext * timed poll with nonzero timeout succeeds when non-empty, else times out */ public void testTimedPoll() throws InterruptedException { - LinkedTransferQueue q = populatedQueue(SIZE); - for (int i = 0; i < SIZE; ++i) { - long startTime = System.nanoTime(); - assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); - assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); - } + LinkedTransferQueue 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); @@ -271,29 +268,32 @@ public class LinkedTransferQueueTest ext * returning timeout status */ public void testInterruptedTimedPoll() throws InterruptedException { - final BlockingQueue q = populatedQueue(SIZE); - final CountDownLatch aboutToWait = new CountDownLatch(1); + final BlockingQueue 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) { - long t0 = System.nanoTime(); - assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); - assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS); - } - long t0 = System.nanoTime(); - aboutToWait.countDown(); + for (int i = 0; i < SIZE; i++) + mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS)); + + Thread.currentThread().interrupt(); try { - q.poll(MEDIUM_DELAY_MS, MILLISECONDS); + q.poll(randomTimeout(), randomTimeUnit()); shouldThrow(); - } catch (InterruptedException success) { - assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS); - } + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); + try { + q.poll(LONGER_DELAY_MS, MILLISECONDS); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - aboutToWait.await(); - waitForThreadToEnterWaitState(t, SMALL_DELAY_MS); + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); checkEmpty(q); } @@ -302,22 +302,20 @@ public class LinkedTransferQueueTest ext * instead of returning timeout status */ public void testTimedPollAfterInterrupt() throws InterruptedException { - final BlockingQueue q = populatedQueue(SIZE); + final BlockingQueue 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); - } + for (int i = 0; i < SIZE; ++i) + mustEqual(i, q.poll(randomTimeout(), randomTimeUnit())); try { - q.poll(MEDIUM_DELAY_MS, MILLISECONDS); + q.poll(randomTimeout(), randomTimeUnit()); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); checkEmpty(q); } @@ -325,12 +323,12 @@ public class LinkedTransferQueueTest ext * peek returns next element, or null if empty */ public void testPeek() throws InterruptedException { - LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue 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); @@ -340,10 +338,10 @@ public class LinkedTransferQueueTest ext * element returns next element, or throws NoSuchElementException if empty */ public void testElement() throws InterruptedException { - LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue 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(); @@ -356,9 +354,9 @@ public class LinkedTransferQueueTest ext * remove removes next element, or throws NoSuchElementException if empty */ public void testRemove() throws InterruptedException { - LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, (int) q.remove()); + mustEqual(i, q.remove()); } try { q.remove(); @@ -371,24 +369,24 @@ public class LinkedTransferQueueTest ext * 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)); - assertSame(q.take(), three); + LinkedTransferQueue 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 q = populatedQueue(SIZE); + LinkedTransferQueue 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); } } @@ -396,14 +394,14 @@ public class LinkedTransferQueueTest ext * clear removes all elements */ public void testClear() throws InterruptedException { - LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue 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); } @@ -412,12 +410,12 @@ public class LinkedTransferQueueTest ext * containsAll(c) is true when c contains a subset of elements */ public void testContainsAll() { - LinkedTransferQueue q = populatedQueue(SIZE); - LinkedTransferQueue p = new LinkedTransferQueue(); + LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue 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)); } @@ -427,8 +425,8 @@ public class LinkedTransferQueueTest ext * if changed */ public void testRetainAll() { - LinkedTransferQueue q = populatedQueue(SIZE); - LinkedTransferQueue p = populatedQueue(SIZE); + LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue p = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { boolean changed = q.retainAll(p); if (i == 0) { @@ -437,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(); } } @@ -448,12 +446,12 @@ public class LinkedTransferQueueTest ext */ public void testRemoveAll() { for (int i = 1; i < SIZE; ++i) { - LinkedTransferQueue q = populatedQueue(SIZE); - LinkedTransferQueue p = populatedQueue(i); + LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue 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()); } } } @@ -462,31 +460,32 @@ public class LinkedTransferQueueTest ext * toArray() contains all elements in FIFO order */ public void testToArray() { - LinkedTransferQueue q = populatedQueue(SIZE); - Object[] o = q.toArray(); - for (int i = 0; i < o.length; i++) { - assertSame(o[i], q.poll()); - } + LinkedTransferQueue 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 in FIFO order */ public void testToArray2() { - LinkedTransferQueue q = populatedQueue(SIZE); - Integer[] ints = new Integer[SIZE]; - Integer[] array = q.toArray(ints); - assertSame(ints, array); - for (int i = 0; i < ints.length; i++) { - assertSame(ints[i], q.poll()); - } + LinkedTransferQueue 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(incompatible array type) throws ArrayStoreException */ public void testToArray1_BadArg() { - LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue q = populatedQueue(SIZE); try { q.toArray(new String[10]); shouldThrow(); @@ -497,25 +496,38 @@ public class LinkedTransferQueueTest ext * iterator iterates through all 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); + LinkedTransferQueue q = populatedQueue(SIZE); + Iterator 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 of empty collection has no elements + */ + public void testEmptyIterator() { + assertIteratorExhausted(new LinkedTransferQueue().iterator()); } /** * iterator.remove() removes current element */ public void testIteratorRemove() { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); q.add(two); q.add(one); q.add(three); - Iterator it = q.iterator(); + Iterator it = q.iterator(); it.next(); it.remove(); @@ -529,40 +541,39 @@ public class LinkedTransferQueueTest ext * iterator ordering is FIFO */ public void testIteratorOrdering() { - final LinkedTransferQueue q - = new LinkedTransferQueue(); - assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); + final LinkedTransferQueue 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 q = new LinkedTransferQueue<>(); q.add(one); q.add(two); q.add(three); - for (Iterator it = q.iterator(); it.hasNext();) { + for (Iterator 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 q = populatedQueue(SIZE); String s = q.toString(); for (int i = 0; i < SIZE; ++i) { assertTrue(s.contains(String.valueOf(i))); @@ -573,65 +584,69 @@ public class LinkedTransferQueueTest ext * offer transfers elements across Executor tasks */ public void testOfferInExecutor() { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); final CheckedBarrier threadsStarted = new CheckedBarrier(2); - ExecutorService executor = Executors.newFixedThreadPool(2); - - executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - threadsStarted.await(); - assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS)); - }}); + final ExecutorService executor = Executors.newFixedThreadPool(2); + try (PoolCleaner cleaner = cleaner(executor)) { - executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - threadsStarted.await(); - assertSame(one, q.take()); - checkEmpty(q); - }}); + 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(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); final CheckedBarrier threadsStarted = new CheckedBarrier(2); - ExecutorService executor = Executors.newFixedThreadPool(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(); - assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS)); - checkEmpty(q); - }}); - - executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - threadsStarted.await(); - q.put(one); - }}); + 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 { - Queue x = populatedQueue(SIZE); - Queue y = serialClone(x); + Queue x = populatedQueue(SIZE); + Queue y = serialClone(x); - assertTrue(x != y); - assertEquals(x.size(), y.size()); - assertEquals(x.toString(), y.toString()); + 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()); - assertEquals(x.remove(), y.remove()); + mustEqual(x.remove(), y.remove()); } assertTrue(y.isEmpty()); } @@ -640,25 +655,25 @@ public class LinkedTransferQueueTest ext * drainTo(c) empties queue into another collection c */ public void testDrainTo() { - LinkedTransferQueue q = populatedQueue(SIZE); + LinkedTransferQueue q = populatedQueue(SIZE); ArrayList l = new ArrayList(); q.drainTo(l); - assertEquals(0, q.size()); - assertEquals(SIZE, l.size()); + mustEqual(0, q.size()); + mustEqual(SIZE, l.size()); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, l.get(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(0, q.size()); - assertEquals(2, l.size()); + mustEqual(0, q.size()); + mustEqual(2, l.size()); for (int i = 0; i < 2; ++i) { - assertEquals(i, l.get(i)); + mustEqual(i, l.get(i)); } } @@ -666,17 +681,17 @@ 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 q = populatedQueue(SIZE); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() { - q.put(SIZE + 1); + 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(i, l.get(i)); - awaitTermination(t, MEDIUM_DELAY_MS); + mustEqual(i, l.get(i)); + awaitTermination(t); assertTrue(q.size() + l.size() >= SIZE); } @@ -684,20 +699,19 @@ public class LinkedTransferQueueTest ext * drainTo(c, n) empties first min(n, size) elements of queue into c */ public void testDrainToN() { - LinkedTransferQueue q = new LinkedTransferQueue(); + LinkedTransferQueue 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(k, l.size()); - assertEquals(SIZE - k, q.size()); + mustEqual(k, l.size()); + mustEqual(SIZE - k, q.size()); for (int j = 0; j < k; ++j) - assertEquals(j, l.get(j)); - while (q.poll() != null) - ; + mustEqual(j, l.get(j)); + do {} while (q.poll() != null); } } @@ -706,29 +720,33 @@ public class LinkedTransferQueueTest ext * offer(e) decrements the waiting consumer count */ public void testWaitingConsumer() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); - assertEquals(0, q.getWaitingConsumerCount()); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); + mustEqual(0, q.getWaitingConsumerCount()); assertFalse(q.hasWaitingConsumer()); final CountDownLatch threadStarted = new CountDownLatch(1); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { threadStarted.countDown(); + long startTime = System.nanoTime(); assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS)); - assertEquals(0, q.getWaitingConsumerCount()); + mustEqual(0, q.getWaitingConsumerCount()); assertFalse(q.hasWaitingConsumer()); + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); }}); threadStarted.await(); - waitForThreadToEnterWaitState(t, SMALL_DELAY_MS); - assertEquals(1, q.getWaitingConsumerCount()); - assertTrue(q.hasWaitingConsumer()); + Callable oneConsumer = new Callable<>() { + public Boolean call() { + return q.hasWaitingConsumer() + && q.getWaitingConsumerCount() == 1; }}; + waitForThreadToEnterWaitState(t, oneConsumer); assertTrue(q.offer(one)); - assertEquals(0, q.getWaitingConsumerCount()); + mustEqual(0, q.getWaitingConsumerCount()); assertFalse(q.hasWaitingConsumer()); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); } /** @@ -736,19 +754,18 @@ public class LinkedTransferQueueTest ext */ public void testTransfer1() throws InterruptedException { try { - LinkedTransferQueue q = new LinkedTransferQueue(); + LinkedTransferQueue 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 q - = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); final CountDownLatch threadStarted = new CountDownLatch(1); Thread t = newStartedThread(new CheckedRunnable() { @@ -759,25 +776,27 @@ public class LinkedTransferQueueTest ext }}); threadStarted.await(); - waitForThreadToEnterWaitState(t, SMALL_DELAY_MS); - assertEquals(1, q.size()); + Callable oneElement = new Callable<>() { + public Boolean call() { + return !q.isEmpty() && q.size() == 1; }}; + waitForThreadToEnterWaitState(t, oneElement); + assertSame(five, q.poll()); checkEmpty(q); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); } /** * transfer waits until a poll occurs, and then transfers in fifo order */ public void testTransfer3() throws InterruptedException { - final LinkedTransferQueue q - = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); Thread first = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { q.transfer(four); - assertTrue(!q.contains(four)); - assertEquals(1, q.size()); + mustNotContain(q, four); + mustEqual(1, q.size()); }}); Thread interruptedThread = newStartedThread( @@ -790,10 +809,10 @@ public class LinkedTransferQueueTest ext while (q.size() < 2) Thread.yield(); - assertEquals(2, q.size()); + mustEqual(2, q.size()); assertSame(four, q.poll()); first.join(); - assertEquals(1, q.size()); + mustEqual(1, q.size()); interruptedThread.interrupt(); interruptedThread.join(); checkEmpty(q); @@ -804,31 +823,30 @@ public class LinkedTransferQueueTest ext * thread returns the element */ public void testTransfer4() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { q.transfer(four); - assertFalse(q.contains(four)); + mustNotContain(q, four); assertSame(three, q.poll()); }}); while (q.isEmpty()) Thread.yield(); assertFalse(q.isEmpty()); - assertEquals(1, q.size()); + mustEqual(1, q.size()); assertTrue(q.offer(three)); assertSame(four, q.poll()); - awaitTermination(t, MEDIUM_DELAY_MS); + 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 q - = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { @@ -839,18 +857,18 @@ public class LinkedTransferQueueTest ext while (q.isEmpty()) Thread.yield(); assertFalse(q.isEmpty()); - assertEquals(1, q.size()); + mustEqual(1, q.size()); assertSame(four, q.take()); checkEmpty(q); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); } /** * tryTransfer(null) throws NullPointerException */ public void testTryTransfer1() { + final LinkedTransferQueue q = new LinkedTransferQueue<>(); try { - final LinkedTransferQueue q = new LinkedTransferQueue(); q.tryTransfer(null); shouldThrow(); } catch (NullPointerException success) {} @@ -861,7 +879,7 @@ public class LinkedTransferQueueTest ext * consumers waiting to poll or take. */ public void testTryTransfer2() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); assertFalse(q.tryTransfer(new Object())); assertFalse(q.hasWaitingConsumer()); checkEmpty(q); @@ -873,7 +891,7 @@ public class LinkedTransferQueueTest ext */ public void testTryTransfer3() throws InterruptedException { final Object hotPotato = new Object(); - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() { @@ -884,9 +902,11 @@ public class LinkedTransferQueueTest ext assertTrue(q.tryTransfer(hotPotato)); }}); - assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); + long startTime = System.nanoTime(); + assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); checkEmpty(q); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); } /** @@ -895,7 +915,7 @@ public class LinkedTransferQueueTest ext */ public void testTryTransfer4() throws InterruptedException { final Object hotPotato = new Object(); - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() { @@ -908,14 +928,14 @@ public class LinkedTransferQueueTest ext assertSame(q.take(), hotPotato); checkEmpty(q); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); } /** * tryTransfer blocks interruptibly if no takers */ public void testTryTransfer5() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); final CountDownLatch pleaseInterrupt = new CountDownLatch(1); assertTrue(q.isEmpty()); @@ -923,21 +943,21 @@ public class LinkedTransferQueueTest ext public void realRun() throws InterruptedException { Thread.currentThread().interrupt(); try { - q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS); + q.tryTransfer(new Object(), randomTimeout(), randomTimeUnit()); shouldThrow(); } catch (InterruptedException success) {} assertFalse(Thread.interrupted()); pleaseInterrupt.countDown(); try { - q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS); + q.tryTransfer(new Object(), LONGER_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} assertFalse(Thread.interrupted()); }}); await(pleaseInterrupt); - assertThreadStaysAlive(t); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); awaitTermination(t); checkEmpty(q); @@ -947,14 +967,14 @@ public class LinkedTransferQueueTest ext * tryTransfer gives up after the timeout and returns false */ public void testTryTransfer6() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { - long t0 = System.nanoTime(); + long startTime = System.nanoTime(); assertFalse(q.tryTransfer(new Object(), timeoutMillis(), MILLISECONDS)); - assertTrue(millisElapsedSince(t0) >= timeoutMillis()); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); checkEmpty(q); }}); @@ -967,22 +987,24 @@ public class LinkedTransferQueueTest ext * before transfering to a poll or take */ public void testTryTransfer7() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); assertTrue(q.offer(four)); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { - assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS)); + long startTime = System.nanoTime(); + assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); checkEmpty(q); }}); while (q.size() != 2) Thread.yield(); - assertEquals(2, q.size()); + mustEqual(2, q.size()); assertSame(four, q.poll()); assertSame(five, q.poll()); checkEmpty(q); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); } /** @@ -990,27 +1012,42 @@ public class LinkedTransferQueueTest ext * returning false not enqueueing and the successive poll is null */ public void testTryTransfer8() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q = new LinkedTransferQueue<>(); assertTrue(q.offer(four)); - assertEquals(1, q.size()); - long t0 = System.nanoTime(); + mustEqual(1, q.size()); + long startTime = System.nanoTime(); assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS)); - assertTrue(millisElapsedSince(t0) >= timeoutMillis()); - assertEquals(1, q.size()); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); + mustEqual(1, q.size()); assertSame(four, q.poll()); assertNull(q.poll()); checkEmpty(q); } - private LinkedTransferQueue populatedQueue(int n) { - LinkedTransferQueue q = new LinkedTransferQueue(); + private LinkedTransferQueue populatedQueue(int n) { + LinkedTransferQueue 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)); + } + } }