--- jsr166/src/test/tck/LinkedTransferQueueTest.java 2010/11/03 16:46:34 1.37 +++ jsr166/src/test/tck/LinkedTransferQueueTest.java 2021/01/26 13:33:06 1.86 @@ -1,30 +1,30 @@ /* * 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 static java.util.concurrent.TimeUnit.NANOSECONDS; +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(); @@ -32,39 +32,20 @@ public class LinkedTransferQueueTest ext } public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); + main(suite(), args); } public static Test suite() { - return newTestSuite(LinkedTransferQueueTest.class, - new Generic().testSuite()); - } - - void checkEmpty(BlockingQueue q) { - try { - assertTrue(q.isEmpty()); - assertEquals(0, q.size()); - assertNull(q.peek()); - assertNull(q.poll()); - assertNull(q.poll(0, MILLISECONDS)); - assertEquals(q.toString(), "[]"); - assertTrue(Arrays.equals(q.toArray(), new Object[0])); - assertFalse(q.iterator().hasNext()); - try { - q.element(); - shouldThrow(); - } catch (NoSuchElementException success) {} - try { - q.iterator().next(); - shouldThrow(); - } catch (NoSuchElementException success) {} - try { - q.remove(); - shouldThrow(); - } catch (NoSuchElementException success) {} - } catch (InterruptedException ie) { - threadUnexpectedException(ie); + 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())); } /** @@ -72,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()); } @@ -92,9 +73,9 @@ public class LinkedTransferQueueTest ext * NullPointerException */ public void testConstructor3() { + Collection elements = Arrays.asList(new Item[SIZE]); try { - Integer[] ints = new Integer[SIZE]; - new LinkedTransferQueue(Arrays.asList(ints)); + new LinkedTransferQueue(elements); shouldThrow(); } catch (NullPointerException success) {} } @@ -104,12 +85,11 @@ public class LinkedTransferQueueTest ext * throws NullPointerException */ public void testConstructor4() { + Item[] items = new Item[2]; + items[0] = zero; + Collection 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) {} } @@ -118,15 +98,12 @@ 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]), @@ -134,7 +111,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()); } } @@ -142,87 +119,39 @@ 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); } } /** - * 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 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 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) {} } @@ -231,39 +160,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 q = new LinkedTransferQueue(); + LinkedTransferQueue 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]); } } @@ -271,9 +187,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()); } } @@ -281,34 +197,40 @@ public class LinkedTransferQueueTest ext * take removes existing elements until empty, then blocks interruptibly */ public void testBlockingTake() 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) { - assertEquals(i, (int) q.take()); - } - aboutToWait.countDown(); + 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()); }}); - aboutToWait.await(); - waitForThreadToEnterWaitState(t, SMALL_DELAY_MS); + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING); t.interrupt(); - awaitTermination(t, MEDIUM_DELAY_MS); - checkEmpty(q); + awaitTermination(t); } /** * 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); @@ -318,9 +240,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); @@ -330,15 +252,15 @@ 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 t0 = System.nanoTime(); - assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS)); - assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS); - } - long t0 = System.nanoTime(); - assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); - assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS); + 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); } @@ -347,29 +269,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(randomTimeout(), randomTimeUnit()); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.poll(MEDIUM_DELAY_MS, MILLISECONDS); + q.poll(LONGER_DELAY_MS, MILLISECONDS); shouldThrow(); - } catch (InterruptedException success) { - assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS); - } + } 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); } @@ -378,22 +303,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); } @@ -401,12 +324,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); @@ -416,10 +339,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(); @@ -432,9 +355,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(); @@ -444,42 +367,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)); - 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); } } @@ -487,14 +395,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); } @@ -503,12 +411,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)); } @@ -518,8 +426,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) { @@ -528,7 +436,7 @@ public class LinkedTransferQueueTest ext assertTrue(changed); } assertTrue(q.containsAll(p)); - assertEquals(SIZE - i, q.size()); + mustEqual(SIZE - i, q.size()); p.remove(); } } @@ -539,55 +447,46 @@ 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()); } } } /** - * toArray() contains all elements - */ - 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()); - } - } - - /** - * toArray(a) contains all elements + * toArray() contains all elements in FIFO order */ - public void testToArray2() throws InterruptedException { - LinkedTransferQueue 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 testToArray() { + 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(null) throws NullPointerException - */ - public void testToArray_NullArg() { - LinkedTransferQueue q = populatedQueue(SIZE); - try { - q.toArray(null); - shouldThrow(); - } catch (NullPointerException success) {} + * toArray(a) contains all elements in FIFO order + */ + public void testToArray2() { + 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(); @@ -598,25 +497,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(); @@ -630,43 +542,42 @@ 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.indexOf(String.valueOf(i)) >= 0); + assertTrue(s.contains(String.valueOf(i))); } } @@ -674,126 +585,96 @@ public class LinkedTransferQueueTest ext * offer transfers elements across Executor tasks */ public void testOfferInExecutor() { - final LinkedTransferQueue q = new LinkedTransferQueue(); - final CountDownLatch threadsStarted = new CountDownLatch(2); - ExecutorService executor = Executors.newFixedThreadPool(2); + final LinkedTransferQueue 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.countDown(); - threadsStarted.await(); - assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS)); - }}); - - executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - threadsStarted.countDown(); - 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 CountDownLatch threadsStarted = new CountDownLatch(2); - ExecutorService executor = Executors.newFixedThreadPool(2); - - executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - assertNull(q.poll()); - threadsStarted.countDown(); - threadsStarted.await(); - assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS)); - checkEmpty(q); - }}); + final LinkedTransferQueue 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.countDown(); - 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 { - LinkedTransferQueue q = populatedQueue(SIZE); - - ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); - ObjectOutputStream out - = new ObjectOutputStream(new BufferedOutputStream(bout)); - out.writeObject(q); - out.close(); + Queue x = populatedQueue(SIZE); + Queue 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()); - assertEquals(q.toString(), r.toString()); - assertTrue(Arrays.equals(q.toArray(), r.toArray())); - 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 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)); } } @@ -801,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 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(l.get(i), i); - } - awaitTermination(t, MEDIUM_DELAY_MS); + 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 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(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); } } @@ -865,29 +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 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(q.getWaitingConsumerCount(), 0); + mustEqual(0, q.getWaitingConsumerCount()); assertFalse(q.hasWaitingConsumer()); + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); }}); threadStarted.await(); - waitForThreadToEnterWaitState(t, SMALL_DELAY_MS); - assertEquals(q.getWaitingConsumerCount(), 1); - assertTrue(q.hasWaitingConsumer()); + Callable oneConsumer + = new Callable() { public Boolean call() { + return q.hasWaitingConsumer() + && q.getWaitingConsumerCount() == 1; }}; + waitForThreadToEnterWaitState(t, oneConsumer); assertTrue(q.offer(one)); - assertEquals(q.getWaitingConsumerCount(), 0); + mustEqual(0, q.getWaitingConsumerCount()); assertFalse(q.hasWaitingConsumer()); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); } /** @@ -895,19 +755,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() { @@ -918,25 +777,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( @@ -949,10 +810,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); @@ -963,31 +824,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 { @@ -998,18 +858,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) {} @@ -1020,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 q = new LinkedTransferQueue(); assertFalse(q.tryTransfer(new Object())); assertFalse(q.hasWaitingConsumer()); checkEmpty(q); @@ -1032,7 +892,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() { @@ -1043,9 +903,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); } /** @@ -1054,7 +916,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() { @@ -1067,32 +929,38 @@ public class LinkedTransferQueueTest ext assertSame(q.take(), hotPotato); checkEmpty(q); - awaitTermination(t, MEDIUM_DELAY_MS); + 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 CountDownLatch threadStarted = new CountDownLatch(1); + final LinkedTransferQueue q = new LinkedTransferQueue(); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + assertTrue(q.isEmpty()); Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { - long t0 = System.nanoTime(); - threadStarted.countDown(); + Thread.currentThread().interrupt(); try { - q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS); + q.tryTransfer(new Object(), randomTimeout(), randomTimeUnit()); shouldThrow(); } catch (InterruptedException success) {} - assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS); + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); + try { + q.tryTransfer(new Object(), LONGER_DELAY_MS, MILLISECONDS); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - threadStarted.await(); - Thread.sleep(SHORT_DELAY_MS); + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); checkEmpty(q); } @@ -1100,18 +968,18 @@ 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(), - SHORT_DELAY_MS, MILLISECONDS)); - assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS); + timeoutMillis(), MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); checkEmpty(q); }}); - awaitTermination(t, MEDIUM_DELAY_MS); + awaitTermination(t); checkEmpty(q); } @@ -1120,50 +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 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); } /** - * 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 q = new LinkedTransferQueue(); assertTrue(q.offer(four)); - assertEquals(1, q.size()); - long t0 = System.nanoTime(); - assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS)); - assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS); - assertEquals(1, q.size()); + 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 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)); + } + } }