--- jsr166/src/test/tck/LinkedBlockingDequeTest.java 2009/11/22 00:17:37 1.17 +++ jsr166/src/test/tck/LinkedBlockingDequeTest.java 2021/01/27 01:57:24 1.89 @@ -1,36 +1,73 @@ /* * 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/ */ -import junit.framework.*; -import java.util.*; -import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import java.io.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Deque; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.Queue; +import java.util.concurrent.BlockingDeque; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Executors; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingDeque; + +import junit.framework.Test; public class LinkedBlockingDequeTest extends JSR166TestCase { + + public static class Unbounded extends BlockingQueueTest { + protected BlockingQueue emptyCollection() { + return new LinkedBlockingDeque(); + } + } + + public static class Bounded extends BlockingQueueTest { + protected BlockingQueue emptyCollection() { + return new LinkedBlockingDeque(SIZE); + } + } + public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); + main(suite(), args); } public static Test suite() { - return new TestSuite(LinkedBlockingDequeTest.class); + class Implementation implements CollectionImplementation { + public Class klazz() { return LinkedBlockingDeque.class; } + public Collection emptyCollection() { return new LinkedBlockingDeque(); } + public Object makeElement(int i) { return JSR166TestCase.itemFor(i); } + public boolean isConcurrent() { return true; } + public boolean permitsNulls() { return false; } + } + return newTestSuite(LinkedBlockingDequeTest.class, + new Unbounded().testSuite(), + new Bounded().testSuite(), + CollectionTest.testSuite(new Implementation())); } /** - * Create a deque of given size containing consecutive - * Integers 0 ... n. + * Returns a new deque of given size containing consecutive + * Items 0 ... n - 1. */ - private LinkedBlockingDeque populatedDeque(int n) { - LinkedBlockingDeque q = new LinkedBlockingDeque(n); + private static LinkedBlockingDeque populatedDeque(int n) { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(n); assertTrue(q.isEmpty()); for (int i = 0; i < n; i++) - assertTrue(q.offer(new Integer(i))); + mustOffer(q, i); assertFalse(q.isEmpty()); - assertEquals(0, q.remainingCapacity()); - assertEquals(n, q.size()); + mustEqual(0, q.remainingCapacity()); + mustEqual(n, q.size()); + mustEqual(0, q.peekFirst()); + mustEqual((n - 1), q.peekLast()); return q; } @@ -38,11 +75,11 @@ public class LinkedBlockingDequeTest ext * isEmpty is true before add, false after */ public void testEmpty() { - LinkedBlockingDeque q = new LinkedBlockingDeque(); + LinkedBlockingDeque q = new LinkedBlockingDeque<>(); assertTrue(q.isEmpty()); - q.add(new Integer(1)); + q.add(one); assertFalse(q.isEmpty()); - q.add(new Integer(2)); + q.add(two); q.removeFirst(); q.removeFirst(); assertTrue(q.isEmpty()); @@ -52,118 +89,129 @@ public class LinkedBlockingDequeTest ext * size changes when elements added and removed */ public void testSize() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i, q.size()); + mustEqual(SIZE - i, q.size()); q.removeFirst(); } for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.size()); - q.add(new Integer(i)); + mustEqual(i, q.size()); + mustAdd(q, one); } } /** - * offer(null) throws NPE + * offerFirst(null) throws NullPointerException */ public void testOfferFirstNull() { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(); try { - LinkedBlockingDeque q = new LinkedBlockingDeque(); q.offerFirst(null); shouldThrow(); } catch (NullPointerException success) {} } /** + * offerLast(null) throws NullPointerException + */ + public void testOfferLastNull() { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(); + try { + q.offerLast(null); + shouldThrow(); + } catch (NullPointerException success) {} + } + + /** * OfferFirst succeeds */ public void testOfferFirst() { - LinkedBlockingDeque q = new LinkedBlockingDeque(); - assertTrue(q.offerFirst(new Integer(0))); - assertTrue(q.offerFirst(new Integer(1))); + LinkedBlockingDeque q = new LinkedBlockingDeque<>(); + assertTrue(q.offerFirst(zero)); + assertTrue(q.offerFirst(two)); } /** * OfferLast succeeds */ public void testOfferLast() { - LinkedBlockingDeque q = new LinkedBlockingDeque(); - assertTrue(q.offerLast(new Integer(0))); - assertTrue(q.offerLast(new Integer(1))); + LinkedBlockingDeque q = new LinkedBlockingDeque<>(); + assertTrue(q.offerLast(zero)); + assertTrue(q.offerLast(one)); } /** - * pollFirst succeeds unless empty + * pollFirst succeeds unless empty */ public void testPollFirst() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.pollFirst()).intValue()); + mustEqual(i, q.pollFirst()); } assertNull(q.pollFirst()); } /** - * pollLast succeeds unless empty + * pollLast succeeds unless empty */ public void testPollLast() { - LinkedBlockingDeque q = populatedDeque(SIZE); - for (int i = SIZE-1; i >= 0; --i) { - assertEquals(i, ((Integer)q.pollLast()).intValue()); + LinkedBlockingDeque q = populatedDeque(SIZE); + for (int i = SIZE - 1; i >= 0; --i) { + mustEqual(i, q.pollLast()); } assertNull(q.pollLast()); } /** - * peekFirst returns next element, or null if empty + * peekFirst returns next element, or null if empty */ public void testPeekFirst() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.peekFirst()).intValue()); - q.pollFirst(); + mustEqual(i, q.peekFirst()); + mustEqual(i, q.pollFirst()); assertTrue(q.peekFirst() == null || - i != ((Integer)q.peekFirst()).intValue()); + !q.peekFirst().equals(i)); } assertNull(q.peekFirst()); } /** - * peek returns next element, or null if empty + * peek returns next element, or null if empty */ public void testPeek() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.peek()).intValue()); - q.pollFirst(); + mustEqual(i, q.peek()); + mustEqual(i, q.pollFirst()); assertTrue(q.peek() == null || - i != ((Integer)q.peek()).intValue()); + !q.peek().equals(i)); } assertNull(q.peek()); } /** - * peekLast returns next element, or null if empty + * peekLast returns next element, or null if empty */ public void testPeekLast() { - LinkedBlockingDeque q = populatedDeque(SIZE); - for (int i = SIZE-1; i >= 0; --i) { - assertEquals(i, ((Integer)q.peekLast()).intValue()); - q.pollLast(); + LinkedBlockingDeque q = populatedDeque(SIZE); + for (int i = SIZE - 1; i >= 0; --i) { + mustEqual(i, q.peekLast()); + mustEqual(i, q.pollLast()); assertTrue(q.peekLast() == null || - i != ((Integer)q.peekLast()).intValue()); + !q.peekLast().equals(i)); } assertNull(q.peekLast()); } /** - * getFirst returns next getFirst, or throws NSEE if empty + * getFirst() returns first element, or throws NSEE if empty */ public void testFirstElement() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.getFirst()).intValue()); - q.pollFirst(); + mustEqual(i, q.getFirst()); + mustEqual(i, q.pollFirst()); } try { q.getFirst(); @@ -173,13 +221,13 @@ public class LinkedBlockingDequeTest ext } /** - * getLast returns next element, or throws NSEE if empty + * getLast() returns last element, or throws NSEE if empty */ public void testLastElement() { - LinkedBlockingDeque q = populatedDeque(SIZE); - for (int i = SIZE-1; i >= 0; --i) { - assertEquals(i, ((Integer)q.getLast()).intValue()); - q.pollLast(); + LinkedBlockingDeque q = populatedDeque(SIZE); + for (int i = SIZE - 1; i >= 0; --i) { + mustEqual(i, q.getLast()); + mustEqual(i, q.pollLast()); } try { q.getLast(); @@ -189,12 +237,12 @@ public class LinkedBlockingDequeTest ext } /** - * removeFirst removes next element, or throws NSEE if empty + * removeFirst() removes first element, or throws NSEE if empty */ public void testRemoveFirst() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.removeFirst()).intValue()); + mustEqual(i, q.removeFirst()); } try { q.removeFirst(); @@ -204,12 +252,12 @@ public class LinkedBlockingDequeTest ext } /** - * removeLast removes last element, or throws NSEE if empty + * removeLast() removes last element, or throws NSEE if empty */ public void testRemoveLast() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = SIZE - 1; i >= 0; --i) { - assertEquals(i, ((Integer)q.removeLast()).intValue()); + mustEqual(i, q.removeLast()); } try { q.removeLast(); @@ -219,12 +267,12 @@ public class LinkedBlockingDequeTest ext } /** - * remove removes next element, or throws NSEE if empty + * remove removes next element, or throws NSEE if empty */ public void testRemove() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.remove()).intValue()); + mustEqual(i, q.remove()); } try { q.remove(); @@ -236,13 +284,13 @@ public class LinkedBlockingDequeTest ext * removeFirstOccurrence(x) removes x and returns true if present */ public void testRemoveFirstOccurrence() { - LinkedBlockingDeque q = populatedDeque(SIZE); - for (int i = 1; i < SIZE; i+=2) { - assertTrue(q.removeFirstOccurrence(new Integer(i))); - } - for (int i = 0; i < SIZE; i+=2) { - assertTrue(q.removeFirstOccurrence(new Integer(i))); - assertFalse(q.removeFirstOccurrence(new Integer(i+1))); + LinkedBlockingDeque q = populatedDeque(SIZE); + for (int i = 1; i < SIZE; i += 2) { + assertTrue(q.removeFirstOccurrence(itemFor(i))); + } + for (int i = 0; i < SIZE; i += 2) { + assertTrue(q.removeFirstOccurrence(itemFor(i))); + assertFalse(q.removeFirstOccurrence(itemFor(i + 1))); } assertTrue(q.isEmpty()); } @@ -251,13 +299,13 @@ public class LinkedBlockingDequeTest ext * removeLastOccurrence(x) removes x and returns true if present */ public void testRemoveLastOccurrence() { - LinkedBlockingDeque q = populatedDeque(SIZE); - for (int i = 1; i < SIZE; i+=2) { - assertTrue(q.removeLastOccurrence(new Integer(i))); - } - for (int i = 0; i < SIZE; i+=2) { - assertTrue(q.removeLastOccurrence(new Integer(i))); - assertFalse(q.removeLastOccurrence(new Integer(i+1))); + LinkedBlockingDeque q = populatedDeque(SIZE); + for (int i = 1; i < SIZE; i += 2) { + assertTrue(q.removeLastOccurrence(itemFor(i))); + } + for (int i = 0; i < SIZE; i += 2) { + assertTrue(q.removeLastOccurrence(itemFor(i))); + assertFalse(q.removeLastOccurrence(itemFor(i + 1))); } assertTrue(q.isEmpty()); } @@ -266,72 +314,72 @@ public class LinkedBlockingDequeTest ext * peekFirst returns element inserted with addFirst */ public void testAddFirst() { - LinkedBlockingDeque q = populatedDeque(3); + LinkedBlockingDeque q = populatedDeque(3); q.pollLast(); q.addFirst(four); - assertEquals(four,q.peekFirst()); + assertSame(four, q.peekFirst()); } /** * peekLast returns element inserted with addLast */ public void testAddLast() { - LinkedBlockingDeque q = populatedDeque(3); + LinkedBlockingDeque q = populatedDeque(3); q.pollLast(); q.addLast(four); - assertEquals(four,q.peekLast()); + assertSame(four, q.peekLast()); } - /** * A new deque has the indicated capacity, or Integer.MAX_VALUE if * none given */ public void testConstructor1() { - assertEquals(SIZE, new LinkedBlockingDeque(SIZE).remainingCapacity()); - assertEquals(Integer.MAX_VALUE, new LinkedBlockingDeque().remainingCapacity()); + mustEqual(SIZE, new LinkedBlockingDeque(SIZE).remainingCapacity()); + mustEqual(Integer.MAX_VALUE, new LinkedBlockingDeque().remainingCapacity()); } /** - * Constructor throws IAE if capacity argument nonpositive + * Constructor throws IllegalArgumentException if capacity argument nonpositive */ public void testConstructor2() { try { - LinkedBlockingDeque q = new LinkedBlockingDeque(0); + new LinkedBlockingDeque(0); shouldThrow(); } catch (IllegalArgumentException success) {} } /** - * Initializing from null Collection throws NPE + * Initializing from null Collection throws NullPointerException */ public void testConstructor3() { try { - LinkedBlockingDeque q = new LinkedBlockingDeque(null); + new LinkedBlockingDeque(null); shouldThrow(); } catch (NullPointerException success) {} } /** - * Initializing from Collection of null elements throws NPE + * Initializing from Collection of null elements throws NullPointerException */ public void testConstructor4() { + Collection elements = Arrays.asList(new Item[SIZE]); try { - Integer[] ints = new Integer[SIZE]; - LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints)); + new LinkedBlockingDeque(elements); shouldThrow(); } catch (NullPointerException success) {} } /** - * Initializing from Collection with some null elements throws NPE + * Initializing from Collection with some null elements throws + * NullPointerException */ public void testConstructor5() { + 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] = new Integer(i); - LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints)); + new LinkedBlockingDeque(elements); shouldThrow(); } catch (NullPointerException success) {} } @@ -340,26 +388,24 @@ public class LinkedBlockingDequeTest ext * Deque contains all elements of collection used to initialize */ public void testConstructor6() { - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE; ++i) - ints[i] = new Integer(i); - LinkedBlockingDeque q = new LinkedBlockingDeque(Arrays.asList(ints)); + Item[] items = defaultItems; + LinkedBlockingDeque q = new LinkedBlockingDeque<>(Arrays.asList(items)); for (int i = 0; i < SIZE; ++i) - assertEquals(ints[i], q.poll()); + mustEqual(items[i], q.poll()); } /** * Deque transitions from empty to full when elements added */ public void testEmptyFull() { - LinkedBlockingDeque q = new LinkedBlockingDeque(2); + LinkedBlockingDeque q = new LinkedBlockingDeque<>(2); assertTrue(q.isEmpty()); - assertEquals("should have room for 2", 2, q.remainingCapacity()); + mustEqual(2, q.remainingCapacity()); q.add(one); assertFalse(q.isEmpty()); q.add(two); assertFalse(q.isEmpty()); - assertEquals(0, q.remainingCapacity()); + mustEqual(0, q.remainingCapacity()); assertFalse(q.offer(three)); } @@ -367,65 +413,43 @@ public class LinkedBlockingDequeTest ext * remainingCapacity decreases on add, increases on remove */ public void testRemainingCapacity() { - LinkedBlockingDeque q = populatedDeque(SIZE); + BlockingQueue q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.remainingCapacity()); - assertEquals(SIZE-i, q.size()); - q.remove(); + mustEqual(i, q.remainingCapacity()); + mustEqual(SIZE, q.size() + q.remainingCapacity()); + mustEqual(i, q.remove()); } for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i, q.remainingCapacity()); - assertEquals(i, q.size()); - q.add(new Integer(i)); + mustEqual(SIZE - i, q.remainingCapacity()); + mustEqual(SIZE, q.size() + q.remainingCapacity()); + mustAdd(q, i); } } /** - * offer(null) throws NPE - */ - public void testOfferNull() { - try { - LinkedBlockingDeque q = new LinkedBlockingDeque(1); - q.offer(null); - shouldThrow(); - } catch (NullPointerException success) {} - } - - /** - * add(null) throws NPE - */ - public void testAddNull() { - try { - LinkedBlockingDeque q = new LinkedBlockingDeque(1); - q.add(null); - shouldThrow(); - } catch (NullPointerException success) {} - } - - /** * push(null) throws NPE */ public void testPushNull() { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(1); try { - LinkedBlockingDeque q = new LinkedBlockingDeque(1); q.push(null); shouldThrow(); } catch (NullPointerException success) {} } /** - * push succeeds if not full; throws ISE if full + * push succeeds if not full; throws IllegalStateException if full */ public void testPush() { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); + for (int i = 0; i < SIZE; ++i) { + Item x = itemFor(i); + q.push(x); + mustEqual(x, q.peek()); + } + mustEqual(0, q.remainingCapacity()); try { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - for (int i = 0; i < SIZE; ++i) { - Integer I = new Integer(i); - q.push(I); - assertEquals(I, q.peek()); - } - assertEquals(0, q.remainingCapacity()); - q.push(new Integer(SIZE)); + q.push(itemFor(SIZE)); shouldThrow(); } catch (IllegalStateException success) {} } @@ -434,20 +458,19 @@ public class LinkedBlockingDequeTest ext * peekFirst returns element inserted with push */ public void testPushWithPeek() { - LinkedBlockingDeque q = populatedDeque(3); + LinkedBlockingDeque q = populatedDeque(3); q.pollLast(); q.push(four); - assertEquals(four,q.peekFirst()); + assertSame(four, q.peekFirst()); } - /** - * pop removes next element, or throws NSEE if empty + * pop removes next element, or throws NSEE if empty */ public void testPop() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.pop()).intValue()); + mustEqual(i, q.pop()); } try { q.pop(); @@ -455,88 +478,63 @@ public class LinkedBlockingDequeTest ext } catch (NoSuchElementException success) {} } - /** * Offer succeeds if not full; fails if full */ public void testOffer() { - LinkedBlockingDeque q = new LinkedBlockingDeque(1); + LinkedBlockingDeque q = new LinkedBlockingDeque<>(1); assertTrue(q.offer(zero)); assertFalse(q.offer(one)); } /** - * add succeeds if not full; throws ISE if full + * add succeeds if not full; throws IllegalStateException if full */ public void testAdd() { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); + for (int i = 0; i < SIZE; ++i) + mustAdd(q, i); + mustEqual(0, q.remainingCapacity()); try { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - for (int i = 0; i < SIZE; ++i) { - assertTrue(q.add(new Integer(i))); - } - assertEquals(0, q.remainingCapacity()); - q.add(new Integer(SIZE)); + q.add(itemFor(SIZE)); shouldThrow(); } catch (IllegalStateException success) {} } /** - * addAll(null) throws NPE - */ - public void testAddAll1() { - try { - LinkedBlockingDeque q = new LinkedBlockingDeque(1); - q.addAll(null); - shouldThrow(); - } catch (NullPointerException success) {} - } - - /** - * addAll(this) throws IAE + * addAll(this) throws IllegalArgumentException */ public void testAddAllSelf() { + LinkedBlockingDeque q = populatedDeque(SIZE); try { - LinkedBlockingDeque q = populatedDeque(SIZE); q.addAll(q); shouldThrow(); } catch (IllegalArgumentException success) {} } /** - * addAll of a collection with null elements throws NPE - */ - public void testAddAll2() { - try { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - Integer[] ints = new Integer[SIZE]; - q.addAll(Arrays.asList(ints)); - shouldThrow(); - } catch (NullPointerException success) {} - } - /** * addAll of a collection with any null elements throws NPE after * possibly adding some elements */ public void testAddAll3() { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); + Item[] items = new Item[2]; items[0] = zero; + Collection elements = Arrays.asList(items); try { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE-1; ++i) - ints[i] = new Integer(i); - q.addAll(Arrays.asList(ints)); + q.addAll(elements); shouldThrow(); } catch (NullPointerException success) {} } + /** - * addAll throws ISE if not enough room + * addAll throws IllegalStateException if not enough room */ public void testAddAll4() { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE - 1); + Item[] items = defaultItems; + Collection elements = Arrays.asList(items); try { - LinkedBlockingDeque q = new LinkedBlockingDeque(1); - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE; ++i) - ints[i] = new Integer(i); - q.addAll(Arrays.asList(ints)); + q.addAll(elements); shouldThrow(); } catch (IllegalStateException success) {} } @@ -545,171 +543,189 @@ public class LinkedBlockingDequeTest ext * Deque 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] = new Integer(i); - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); + Item[] empty = new Item[0]; + Item[] items = defaultItems; + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); 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()); - } - - - /** - * put(null) throws NPE - */ - public void testPutNull() throws InterruptedException { - try { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - q.put(null); - shouldThrow(); - } catch (NullPointerException success) {} + mustEqual(items[i], q.poll()); } /** * all elements successfully put are contained */ public void testPut() throws InterruptedException { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); for (int i = 0; i < SIZE; ++i) { - Integer I = new Integer(i); - q.put(I); - assertTrue(q.contains(I)); + Item x = itemFor(i); + q.put(x); + mustContain(q, x); } - assertEquals(0, q.remainingCapacity()); + mustEqual(0, q.remainingCapacity()); } /** * put blocks interruptibly if full */ public void testBlockingPut() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - Thread t = new Thread(new CheckedRunnable() { + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { for (int i = 0; i < SIZE; ++i) - q.put(i); - assertEquals(SIZE, q.size()); - assertEquals(0, q.remainingCapacity()); + q.put(itemFor(i)); + mustEqual(SIZE, q.size()); + mustEqual(0, q.remainingCapacity()); + + Thread.currentThread().interrupt(); + try { + q.put(ninetynine); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.put(99); + q.put(ninetynine); 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(); - assertEquals(SIZE, q.size()); - assertEquals(0, q.remainingCapacity()); + awaitTermination(t); + mustEqual(SIZE, q.size()); + mustEqual(0, q.remainingCapacity()); } /** - * put blocks waiting for take when full + * put blocks interruptibly waiting for take when full */ public void testPutWithTake() throws InterruptedException { final int capacity = 2; - final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - for (int i = 0; i < capacity + 1; i++) - q.put(i); + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(capacity); + final CountDownLatch pleaseTake = new CountDownLatch(1); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() throws InterruptedException { + for (int i = 0; i < capacity; i++) + q.put(itemFor(i)); + pleaseTake.countDown(); + q.put(eightysix); + + Thread.currentThread().interrupt(); + try { + q.put(ninetynine); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.put(99); + q.put(ninetynine); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - t.start(); - Thread.sleep(SHORT_DELAY_MS); - assertEquals(q.remainingCapacity(), 0); - assertEquals(0, q.take()); - Thread.sleep(SHORT_DELAY_MS); + await(pleaseTake); + mustEqual(0, q.remainingCapacity()); + mustEqual(0, q.take()); + + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING); t.interrupt(); - t.join(); - assertEquals(q.remainingCapacity(), 0); + awaitTermination(t); + mustEqual(0, q.remainingCapacity()); } /** * timed offer times out if full and elements not taken */ - public void testTimedOffer() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - Thread t = new Thread(new CheckedRunnable() { + public void testTimedOffer() { + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(2); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { - q.put(new Object()); - q.put(new Object()); - assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS)); + q.put(zero); + q.put(one); + long startTime = System.nanoTime(); + + assertFalse(q.offer(two, timeoutMillis(), MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); + + Thread.currentThread().interrupt(); + try { + q.offer(three, randomTimeout(), randomTimeUnit()); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS); + q.offer(four, LONGER_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - t.start(); - Thread.sleep(SMALL_DELAY_MS); + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); - t.join(); + awaitTermination(t); } /** * take retrieves elements in FIFO order */ public void testTake() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.take()).intValue()); + mustEqual(i, q.take()); } } /** - * take blocks interruptibly when empty + * take removes existing elements until empty, then blocks interruptibly */ - public void testTakeFromEmpty() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - Thread t = new ThreadShouldThrow(InterruptedException.class) { + public void testBlockingTake() throws InterruptedException { + final LinkedBlockingDeque q = populatedDeque(SIZE); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { - q.take(); - }}; + for (int i = 0; i < SIZE; i++) mustEqual(i, q.take()); - t.start(); - Thread.sleep(SHORT_DELAY_MS); - t.interrupt(); - t.join(); - } + Thread.currentThread().interrupt(); + try { + q.take(); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); - /** - * Take removes existing elements until empty, then blocks interruptibly - */ - public void testBlockingTake() throws InterruptedException { - final LinkedBlockingDeque q = populatedDeque(SIZE); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.take()).intValue()); - } + 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(); + awaitTermination(t); } - /** * poll succeeds unless empty */ public void testPoll() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.poll()).intValue()); + mustEqual(i, q.poll()); } assertNull(q.poll()); } @@ -718,9 +734,9 @@ public class LinkedBlockingDequeTest ext * timed poll with zero timeout succeeds when non-empty, else times out */ public void testTimedPoll0() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue()); + mustEqual(i, q.poll(0, MILLISECONDS)); } assertNull(q.poll(0, MILLISECONDS)); } @@ -729,11 +745,16 @@ public class LinkedBlockingDequeTest ext * timed poll with nonzero timeout succeeds when non-empty, else times out */ public void testTimedPoll() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue()); - } - assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); + long startTime = System.nanoTime(); + mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); + } + long startTime = System.nanoTime(); + assertNull(q.poll(timeoutMillis(), MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); + checkEmpty(q); } /** @@ -741,200 +762,295 @@ public class LinkedBlockingDequeTest ext * returning timeout status */ public void testInterruptedTimedPoll() throws InterruptedException { - Thread t = new Thread(new CheckedRunnable() { + final BlockingQueue q = populatedDeque(SIZE); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); - for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue()); - } + for (int i = 0; i < SIZE; i++) + mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS)); + + Thread.currentThread().interrupt(); try { - q.poll(SMALL_DELAY_MS, MILLISECONDS); + q.poll(randomTimeout(), randomTimeUnit()); shouldThrow(); } catch (InterruptedException success) {} - }}); - - t.start(); - Thread.sleep(SHORT_DELAY_MS); - t.interrupt(); - t.join(); - } + assertFalse(Thread.interrupted()); - /** - * timed poll before a delayed offer fails; after offer succeeds; - * on interruption throws - */ - public void testTimedPollWithOffer() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); - assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS)); + pleaseInterrupt.countDown(); try { - q.poll(LONG_DELAY_MS, MILLISECONDS); + q.poll(LONGER_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - t.start(); - Thread.sleep(SMALL_DELAY_MS); - assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS)); + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); - t.join(); + awaitTermination(t); + checkEmpty(q); } - /** * putFirst(null) throws NPE */ - public void testPutFirstNull() throws InterruptedException { + public void testPutFirstNull() throws InterruptedException { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); try { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); q.putFirst(null); shouldThrow(); } catch (NullPointerException success) {} - } + } /** * all elements successfully putFirst are contained */ - public void testPutFirst() throws InterruptedException { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - for (int i = 0; i < SIZE; ++i) { - Integer I = new Integer(i); - q.putFirst(I); - assertTrue(q.contains(I)); - } - assertEquals(0, q.remainingCapacity()); + public void testPutFirst() throws InterruptedException { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); + for (int i = 0; i < SIZE; ++i) { + Item x = itemFor(i); + q.putFirst(x); + mustContain(q, x); + } + mustEqual(0, q.remainingCapacity()); } /** * putFirst blocks interruptibly if full */ public void testBlockingPutFirst() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - Thread t = new Thread(new CheckedRunnable() { + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { for (int i = 0; i < SIZE; ++i) - q.putFirst(i); - assertEquals(SIZE, q.size()); - assertEquals(0, q.remainingCapacity()); + q.putFirst(itemFor(i)); + mustEqual(SIZE, q.size()); + mustEqual(0, q.remainingCapacity()); + + Thread.currentThread().interrupt(); + try { + q.putFirst(ninetynine); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.putFirst(99); + q.putFirst(ninetynine); 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(); - assertEquals(SIZE, q.size()); - assertEquals(0, q.remainingCapacity()); + awaitTermination(t); + mustEqual(SIZE, q.size()); + mustEqual(0, q.remainingCapacity()); } /** - * putFirst blocks waiting for take when full + * putFirst blocks interruptibly waiting for take when full */ public void testPutFirstWithTake() throws InterruptedException { final int capacity = 2; - final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - for (int i = 0; i < capacity + 1; i++) - q.putFirst(i); + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(capacity); + final CountDownLatch pleaseTake = new CountDownLatch(1); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() throws InterruptedException { + for (int i = 0; i < capacity; i++) + q.putFirst(itemFor(i)); + pleaseTake.countDown(); + q.putFirst(eightysix); + + pleaseInterrupt.countDown(); try { - q.putFirst(99); + q.putFirst(ninetynine); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - t.start(); - Thread.sleep(SHORT_DELAY_MS); - assertEquals(q.remainingCapacity(), 0); - assertEquals(capacity - 1, q.take()); - Thread.sleep(SHORT_DELAY_MS); + await(pleaseTake); + mustEqual(0, q.remainingCapacity()); + mustEqual(capacity - 1, q.take()); + + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING); t.interrupt(); - t.join(); - assertEquals(q.remainingCapacity(), 0); + awaitTermination(t); + mustEqual(0, q.remainingCapacity()); } /** * timed offerFirst times out if full and elements not taken */ - public void testTimedOfferFirst() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - q.putFirst(new Object()); - q.putFirst(new Object()); - assertFalse(q.offerFirst(new Object(), SHORT_DELAY_MS, MILLISECONDS)); + public void testTimedOfferFirst() { + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(2); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() throws InterruptedException { + q.putFirst(zero); + q.putFirst(one); + long startTime = System.nanoTime(); + + assertFalse(q.offerFirst(two, timeoutMillis(), MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); + + Thread.currentThread().interrupt(); + try { + q.offerFirst(three, randomTimeout(), randomTimeUnit()); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.offerFirst(new Object(), LONG_DELAY_MS, MILLISECONDS); + q.offerFirst(four, LONGER_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - t.start(); - Thread.sleep(SMALL_DELAY_MS); + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); - t.join(); + awaitTermination(t); } /** * take retrieves elements in FIFO order */ public void testTakeFirst() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.takeFirst()).intValue()); + mustEqual(i, q.takeFirst()); } } /** - * takeFirst blocks interruptibly when empty + * takeFirst() blocks interruptibly when empty */ - public void testTakeFirstFromEmpty() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - Thread t = new ThreadShouldThrow(InterruptedException.class) { - public void realRun() throws InterruptedException { - q.takeFirst(); - }}; + public void testTakeFirstFromEmptyBlocksInterruptibly() { + final BlockingDeque q = new LinkedBlockingDeque<>(); + final CountDownLatch threadStarted = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() { + threadStarted.countDown(); + try { + q.takeFirst(); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + }}); - t.start(); - Thread.sleep(SHORT_DELAY_MS); + await(threadStarted); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING); t.interrupt(); - t.join(); + awaitTermination(t); + } + + /** + * takeFirst() throws InterruptedException immediately if interrupted + * before waiting + */ + public void testTakeFirstFromEmptyAfterInterrupt() { + final BlockingDeque q = new LinkedBlockingDeque<>(); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() { + Thread.currentThread().interrupt(); + try { + q.takeFirst(); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + }}); + + awaitTermination(t); + } + + /** + * takeLast() blocks interruptibly when empty + */ + public void testTakeLastFromEmptyBlocksInterruptibly() { + final BlockingDeque q = new LinkedBlockingDeque<>(); + final CountDownLatch threadStarted = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() { + threadStarted.countDown(); + try { + q.takeLast(); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + }}); + + await(threadStarted); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING); + t.interrupt(); + awaitTermination(t); + } + + /** + * takeLast() throws InterruptedException immediately if interrupted + * before waiting + */ + public void testTakeLastFromEmptyAfterInterrupt() { + final BlockingDeque q = new LinkedBlockingDeque<>(); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() { + Thread.currentThread().interrupt(); + try { + q.takeLast(); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + }}); + + awaitTermination(t); } /** - * TakeFirst removes existing elements until empty, then blocks interruptibly + * takeFirst removes existing elements until empty, then blocks interruptibly */ public void testBlockingTakeFirst() throws InterruptedException { - final LinkedBlockingDeque q = populatedDeque(SIZE); - Thread t = new Thread(new CheckedRunnable() { + final LinkedBlockingDeque q = populatedDeque(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.takeFirst()); + for (int i = 0; i < SIZE; i++) mustEqual(i, q.takeFirst()); + + Thread.currentThread().interrupt(); + try { + q.takeFirst(); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { q.takeFirst(); 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(); + awaitTermination(t); } - /** * timed pollFirst with zero timeout succeeds when non-empty, else times out */ public void testTimedPollFirst0() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.pollFirst(0, MILLISECONDS)).intValue()); + mustEqual(i, q.pollFirst(0, MILLISECONDS)); } assertNull(q.pollFirst(0, MILLISECONDS)); } @@ -943,11 +1059,16 @@ public class LinkedBlockingDequeTest ext * timed pollFirst with nonzero timeout succeeds when non-empty, else times out */ public void testTimedPollFirst() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)).intValue()); - } - assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)); + long startTime = System.nanoTime(); + mustEqual(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); + } + long startTime = System.nanoTime(); + assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); + checkEmpty(q); } /** @@ -955,198 +1076,261 @@ public class LinkedBlockingDequeTest ext * returning timeout status */ public void testInterruptedTimedPollFirst() throws InterruptedException { - Thread t = new Thread(new CheckedRunnable() { + final LinkedBlockingDeque q = populatedDeque(SIZE); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); - for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)).intValue()); - } + for (int i = 0; i < SIZE; i++) + mustEqual(i, q.pollFirst(LONG_DELAY_MS, MILLISECONDS)); + + Thread.currentThread().interrupt(); + try { + q.pollFirst(randomTimeout(), randomTimeUnit()); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.pollFirst(SMALL_DELAY_MS, MILLISECONDS); + q.pollFirst(LONGER_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - t.start(); - Thread.sleep(SHORT_DELAY_MS); + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); - t.join(); + awaitTermination(t); } /** - * timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds; - * on interruption throws + * timed pollFirst before a delayed offerFirst fails; after offerFirst succeeds; + * on interruption throws */ public void testTimedPollFirstWithOfferFirst() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - assertNull(q.pollFirst(SHORT_DELAY_MS, MILLISECONDS)); + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(2); + final CheckedBarrier barrier = new CheckedBarrier(2); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() throws InterruptedException { + long startTime = System.nanoTime(); + assertNull(q.pollFirst(timeoutMillis(), MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); + + barrier.await(); + assertSame(zero, q.pollFirst(LONG_DELAY_MS, MILLISECONDS)); + + Thread.currentThread().interrupt(); + try { + q.pollFirst(randomTimeout(), randomTimeUnit()); + shouldThrow(); + } catch (InterruptedException success) {} + + barrier.await(); try { q.pollFirst(LONG_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); }}); - t.start(); - Thread.sleep(SMALL_DELAY_MS); - assertTrue(q.offerFirst(zero, SHORT_DELAY_MS, MILLISECONDS)); + barrier.await(); + long startTime = System.nanoTime(); + assertTrue(q.offerFirst(zero, LONG_DELAY_MS, MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); + barrier.await(); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); - t.join(); + awaitTermination(t); } /** * putLast(null) throws NPE */ - public void testPutLastNull() throws InterruptedException { + public void testPutLastNull() throws InterruptedException { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); try { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); q.putLast(null); shouldThrow(); } catch (NullPointerException success) {} - } + } /** * all elements successfully putLast are contained */ - public void testPutLast() throws InterruptedException { - LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - for (int i = 0; i < SIZE; ++i) { - Integer I = new Integer(i); - q.putLast(I); - assertTrue(q.contains(I)); - } - assertEquals(0, q.remainingCapacity()); + public void testPutLast() throws InterruptedException { + LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); + for (int i = 0; i < SIZE; ++i) { + Item x = itemFor(i); + q.putLast(x); + mustContain(q, x); + } + mustEqual(0, q.remainingCapacity()); } /** * putLast blocks interruptibly if full */ public void testBlockingPutLast() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(SIZE); - Thread t = new Thread(new CheckedRunnable() { + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(SIZE); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { for (int i = 0; i < SIZE; ++i) - q.putLast(i); - assertEquals(SIZE, q.size()); - assertEquals(0, q.remainingCapacity()); + q.putLast(itemFor(i)); + mustEqual(SIZE, q.size()); + mustEqual(0, q.remainingCapacity()); + + Thread.currentThread().interrupt(); + try { + q.putLast(ninetynine); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.putLast(99); + q.putLast(ninetynine); 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(); - assertEquals(SIZE, q.size()); - assertEquals(0, q.remainingCapacity()); + awaitTermination(t); + mustEqual(SIZE, q.size()); + mustEqual(0, q.remainingCapacity()); } /** - * putLast blocks waiting for take when full + * putLast blocks interruptibly waiting for take when full */ public void testPutLastWithTake() throws InterruptedException { final int capacity = 2; - final LinkedBlockingDeque q = new LinkedBlockingDeque(capacity); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - for (int i = 0; i < capacity + 1; i++) - q.putLast(i); + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(capacity); + final CountDownLatch pleaseTake = new CountDownLatch(1); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() throws InterruptedException { + for (int i = 0; i < capacity; i++) + q.putLast(itemFor(i)); + pleaseTake.countDown(); + q.putLast(eightysix); + + Thread.currentThread().interrupt(); + try { + q.putLast(ninetynine); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.putLast(99); + q.putLast(ninetynine); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - t.start(); - Thread.sleep(SHORT_DELAY_MS); - assertEquals(q.remainingCapacity(), 0); - assertEquals(0, q.take()); - Thread.sleep(SHORT_DELAY_MS); + await(pleaseTake); + mustEqual(0, q.remainingCapacity()); + mustEqual(0, q.take()); + + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING); t.interrupt(); - t.join(); - assertEquals(q.remainingCapacity(), 0); + awaitTermination(t); + mustEqual(0, q.remainingCapacity()); } /** * timed offerLast times out if full and elements not taken */ - public void testTimedOfferLast() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - q.putLast(new Object()); - q.putLast(new Object()); - assertFalse(q.offerLast(new Object(), SHORT_DELAY_MS, MILLISECONDS)); + public void testTimedOfferLast() { + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(2); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() throws InterruptedException { + q.putLast(zero); + q.putLast(one); + long startTime = System.nanoTime(); + + assertFalse(q.offerLast(two, timeoutMillis(), MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); + + Thread.currentThread().interrupt(); + try { + q.offerLast(three, randomTimeout(), randomTimeUnit()); + shouldThrow(); + } catch (InterruptedException success) {} + + pleaseInterrupt.countDown(); try { - q.offerLast(new Object(), LONG_DELAY_MS, MILLISECONDS); + q.offerLast(four, LONGER_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} }}); - t.start(); - Thread.sleep(SMALL_DELAY_MS); + await(pleaseInterrupt); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); - t.join(); + awaitTermination(t); } /** * takeLast retrieves elements in FIFO order */ public void testTakeLast() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i-1, ((Integer)q.takeLast()).intValue()); + mustEqual(SIZE - i - 1, q.takeLast()); } } /** - * takeLast blocks interruptibly when empty + * takeLast removes existing elements until empty, then blocks interruptibly */ - public void testTakeLastFromEmpty() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - Thread t = new ThreadShouldThrow(InterruptedException.class) { + public void testBlockingTakeLast() throws InterruptedException { + final LinkedBlockingDeque q = populatedDeque(SIZE); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { public void realRun() throws InterruptedException { - q.takeLast(); - }}; + for (int i = 0; i < SIZE; i++) + mustEqual(SIZE - i - 1, q.takeLast()); - t.start(); - Thread.sleep(SHORT_DELAY_MS); - t.interrupt(); - t.join(); - } + Thread.currentThread().interrupt(); + try { + q.takeLast(); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); - /** - * TakeLast removes existing elements until empty, then blocks interruptibly - */ - public void testBlockingTakeLast() throws InterruptedException { - final LinkedBlockingDeque q = populatedDeque(SIZE); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - for (int i = 0; i < SIZE; ++i) - assertEquals(SIZE - 1 - i, q.takeLast()); + pleaseInterrupt.countDown(); try { q.takeLast(); 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(); + awaitTermination(t); } /** * timed pollLast with zero timeout succeeds when non-empty, else times out */ public void testTimedPollLast0() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i-1, ((Integer)q.pollLast(0, MILLISECONDS)).intValue()); + mustEqual(SIZE - i - 1, q.pollLast(0, MILLISECONDS)); } assertNull(q.pollLast(0, MILLISECONDS)); } @@ -1155,11 +1339,16 @@ public class LinkedBlockingDequeTest ext * timed pollLast with nonzero timeout succeeds when non-empty, else times out */ public void testTimedPollLast() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i-1, ((Integer)q.pollLast(SHORT_DELAY_MS, MILLISECONDS)).intValue()); - } - assertNull(q.pollLast(SHORT_DELAY_MS, MILLISECONDS)); + long startTime = System.nanoTime(); + mustEqual(SIZE - i - 1, q.pollLast(LONG_DELAY_MS, MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); + } + long startTime = System.nanoTime(); + assertNull(q.pollLast(timeoutMillis(), MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); + checkEmpty(q); } /** @@ -1167,55 +1356,88 @@ public class LinkedBlockingDequeTest ext * returning timeout status */ public void testInterruptedTimedPollLast() throws InterruptedException { - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); - for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i-1, ((Integer)q.pollLast(SHORT_DELAY_MS, MILLISECONDS)).intValue()); - } + final LinkedBlockingDeque q = populatedDeque(SIZE); + final CountDownLatch pleaseInterrupt = new CountDownLatch(1); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() throws InterruptedException { + for (int i = 0; i < SIZE; i++) + mustEqual(SIZE - i - 1, + q.pollLast(LONG_DELAY_MS, MILLISECONDS)); + + Thread.currentThread().interrupt(); + try { + q.pollLast(randomTimeout(), randomTimeUnit()); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + pleaseInterrupt.countDown(); try { - q.pollLast(SMALL_DELAY_MS, MILLISECONDS); + q.pollLast(LONGER_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); }}); - t.start(); - Thread.sleep(SHORT_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 offerLast fails; after offerLast succeeds; - * on interruption throws + * timed poll before a delayed offerLast fails; after offerLast succeeds; + * on interruption throws */ public void testTimedPollWithOfferLast() throws InterruptedException { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(2); + final CheckedBarrier barrier = new CheckedBarrier(2); + Thread t = newStartedThread(new CheckedRunnable() { + public void realRun() throws InterruptedException { + long startTime = System.nanoTime(); + assertNull(q.poll(timeoutMillis(), MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); + + barrier.await(); + assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS)); + + Thread.currentThread().interrupt(); + try { + q.poll(randomTimeout(), randomTimeUnit()); + shouldThrow(); + } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + barrier.await(); try { q.poll(LONG_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} + assertFalse(Thread.interrupted()); + + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); }}); - t.start(); - Thread.sleep(SMALL_DELAY_MS); - assertTrue(q.offerLast(zero, SHORT_DELAY_MS, MILLISECONDS)); + barrier.await(); + long startTime = System.nanoTime(); + assertTrue(q.offerLast(zero, LONG_DELAY_MS, MILLISECONDS)); + assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); + + barrier.await(); + if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); t.interrupt(); - t.join(); + awaitTermination(t); } - /** * element returns next element, or throws NSEE if empty */ public void testElement() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.element()).intValue()); + mustEqual(i, q.element()); q.poll(); } try { @@ -1225,29 +1447,14 @@ public class LinkedBlockingDequeTest ext } /** - * remove(x) removes x and returns true if present - */ - public void testRemoveElement() { - LinkedBlockingDeque q = populatedDeque(SIZE); - for (int i = 1; i < SIZE; i+=2) { - assertTrue(q.remove(new Integer(i))); - } - for (int i = 0; i < SIZE; i+=2) { - assertTrue(q.remove(new Integer(i))); - assertFalse(q.remove(new Integer(i+1))); - } - assertTrue(q.isEmpty()); - } - - /** * contains(x) reports true when elements added but not yet removed */ public void testContains() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertTrue(q.contains(new Integer(i))); + mustContain(q, i); q.poll(); - assertFalse(q.contains(new Integer(i))); + mustNotContain(q, i); } } @@ -1255,14 +1462,14 @@ public class LinkedBlockingDequeTest ext * clear removes all elements */ public void testClear() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); q.clear(); assertTrue(q.isEmpty()); - assertEquals(0, q.size()); - assertEquals(SIZE, q.remainingCapacity()); + mustEqual(0, q.size()); + mustEqual(SIZE, q.remainingCapacity()); q.add(one); assertFalse(q.isEmpty()); - assertTrue(q.contains(one)); + mustContain(q, one); q.clear(); assertTrue(q.isEmpty()); } @@ -1271,12 +1478,12 @@ public class LinkedBlockingDequeTest ext * containsAll(c) is true when c contains a subset of elements */ public void testContainsAll() { - LinkedBlockingDeque q = populatedDeque(SIZE); - LinkedBlockingDeque p = new LinkedBlockingDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque p = new LinkedBlockingDeque<>(SIZE); for (int i = 0; i < SIZE; ++i) { assertTrue(q.containsAll(p)); assertFalse(p.containsAll(q)); - p.add(new Integer(i)); + mustAdd(p, i); } assertTrue(p.containsAll(q)); } @@ -1285,8 +1492,8 @@ public class LinkedBlockingDequeTest ext * retainAll(c) retains only those elements of c and reports true if changed */ public void testRetainAll() { - LinkedBlockingDeque q = populatedDeque(SIZE); - LinkedBlockingDeque p = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque p = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { boolean changed = q.retainAll(p); if (i == 0) @@ -1295,7 +1502,7 @@ public class LinkedBlockingDequeTest ext assertTrue(changed); assertTrue(q.containsAll(p)); - assertEquals(SIZE-i, q.size()); + mustEqual(SIZE - i, q.size()); p.remove(); } } @@ -1305,137 +1512,142 @@ public class LinkedBlockingDequeTest ext */ public void testRemoveAll() { for (int i = 1; i < SIZE; ++i) { - LinkedBlockingDeque q = populatedDeque(SIZE); - LinkedBlockingDeque p = populatedDeque(i); + LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque p = populatedDeque(i); assertTrue(q.removeAll(p)); - assertEquals(SIZE-i, q.size()); + mustEqual(SIZE - i, q.size()); for (int j = 0; j < i; ++j) { - Integer I = (Integer)(p.remove()); - assertFalse(q.contains(I)); + mustNotContain(q, p.remove()); } } } /** - * toArray contains all elements - */ - public void testToArray() throws InterruptedException{ - LinkedBlockingDeque q = populatedDeque(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 { - LinkedBlockingDeque q = populatedDeque(SIZE); - Integer[] ints = new Integer[SIZE]; - ints = (Integer[])q.toArray(ints); - for (int i = 0; i < ints.length; i++) - assertEquals(ints[i], q.take()); + public void testToArray() throws InterruptedException { + LinkedBlockingDeque q = populatedDeque(SIZE); + Object[] a = q.toArray(); + assertSame(Object[].class, a.getClass()); + for (Object o : a) + assertSame(o, q.poll()); + assertTrue(q.isEmpty()); } /** - * toArray(null) throws NPE + * toArray(a) contains all elements in FIFO order */ - public void testToArray_BadArg() { - try { - LinkedBlockingDeque q = populatedDeque(SIZE); - Object o[] = q.toArray(null); - shouldThrow(); - } catch (NullPointerException success) {} + public void testToArray2() { + LinkedBlockingDeque q = populatedDeque(SIZE); + Item[] items = new Item[SIZE]; + Item[] array = q.toArray(items); + assertSame(items, array); + for (Item o : items) + assertSame(o, q.remove()); + assertTrue(q.isEmpty()); } /** - * toArray with incompatible array type throws CCE + * toArray(incompatible array type) throws ArrayStoreException */ public void testToArray1_BadArg() { + LinkedBlockingDeque q = populatedDeque(SIZE); try { - LinkedBlockingDeque q = populatedDeque(SIZE); - Object o[] = q.toArray(new String[10] ); + q.toArray(new String[10]); shouldThrow(); } catch (ArrayStoreException success) {} } - /** * iterator iterates through all elements */ public void testIterator() throws InterruptedException { - LinkedBlockingDeque q = populatedDeque(SIZE); - Iterator it = q.iterator(); - while (it.hasNext()) { - assertEquals(it.next(), q.take()); - } + LinkedBlockingDeque q = populatedDeque(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() { + Deque c = new LinkedBlockingDeque<>(); + assertIteratorExhausted(c.iterator()); + assertIteratorExhausted(c.descendingIterator()); } /** * iterator.remove removes current element */ - public void testIteratorRemove () { - final LinkedBlockingDeque q = new LinkedBlockingDeque(3); + public void testIteratorRemove() { + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(3); q.add(two); q.add(one); q.add(three); - Iterator it = q.iterator(); + Iterator 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()); } - /** * iterator ordering is FIFO */ public void testIteratorOrdering() { - final LinkedBlockingDeque q = new LinkedBlockingDeque(3); + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(3); q.add(one); q.add(two); q.add(three); - assertEquals(0, q.remainingCapacity()); + mustEqual(0, q.remainingCapacity()); int k = 0; - for (Iterator it = q.iterator(); it.hasNext();) { - int i = ((Integer)(it.next())).intValue(); - assertEquals(++k, i); + for (Iterator it = q.iterator(); it.hasNext();) { + mustEqual(++k, it.next()); } - assertEquals(3, k); + mustEqual(3, k); } /** * Modifications do not cause iterators to fail */ - public void testWeaklyConsistentIteration () { - final LinkedBlockingDeque q = new LinkedBlockingDeque(3); + public void testWeaklyConsistentIteration() { + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(3); 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()); } - /** - * Descending iterator iterates through all elements + * Descending iterator iterates through all elements */ public void testDescendingIterator() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(SIZE); int i = 0; - Iterator it = q.descendingIterator(); + Iterator it = q.descendingIterator(); while (it.hasNext()) { - assertTrue(q.contains(it.next())); + mustContain(q, it.next()); ++i; } - assertEquals(i, SIZE); + mustEqual(i, SIZE); assertFalse(it.hasNext()); try { it.next(); @@ -1444,21 +1656,21 @@ public class LinkedBlockingDequeTest ext } /** - * Descending iterator ordering is reverse FIFO + * Descending iterator ordering is reverse FIFO */ public void testDescendingIteratorOrdering() { - final LinkedBlockingDeque q = new LinkedBlockingDeque(); + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(); for (int iters = 0; iters < 100; ++iters) { - q.add(new Integer(3)); - q.add(new Integer(2)); - q.add(new Integer(1)); + mustAdd(q, three); + mustAdd(q, two); + mustAdd(q, one); + int k = 0; - for (Iterator it = q.descendingIterator(); it.hasNext();) { - int i = ((Integer)(it.next())).intValue(); - assertEquals(++k, i); + for (Iterator it = q.descendingIterator(); it.hasNext();) { + mustEqual(++k, it.next()); } - assertEquals(3, k); + mustEqual(3, k); q.remove(); q.remove(); q.remove(); @@ -1468,207 +1680,181 @@ public class LinkedBlockingDequeTest ext /** * descendingIterator.remove removes current element */ - public void testDescendingIteratorRemove () { - final LinkedBlockingDeque q = new LinkedBlockingDeque(); + public void testDescendingIteratorRemove() { + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(); for (int iters = 0; iters < 100; ++iters) { - q.add(new Integer(3)); - q.add(new Integer(2)); - q.add(new Integer(1)); - Iterator it = q.descendingIterator(); - assertEquals(it.next(), new Integer(1)); + mustAdd(q, three); + mustAdd(q, two); + mustAdd(q, one); + Iterator it = q.descendingIterator(); + mustEqual(it.next(), one); it.remove(); - assertEquals(it.next(), new Integer(2)); + mustEqual(it.next(), two); it = q.descendingIterator(); - assertEquals(it.next(), new Integer(2)); - assertEquals(it.next(), new Integer(3)); + mustEqual(it.next(), two); + mustEqual(it.next(), three); it.remove(); assertFalse(it.hasNext()); q.remove(); } } - /** * toString contains toStrings of elements */ public void testToString() { - LinkedBlockingDeque q = populatedDeque(SIZE); + LinkedBlockingDeque q = populatedDeque(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))); } } - /** * offer transfers elements across Executor tasks */ public void testOfferInExecutor() { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(2); q.add(one); q.add(two); - ExecutorService executor = Executors.newFixedThreadPool(2); - executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - threadAssertFalse(q.offer(three)); - threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS)); - threadAssertEquals(0, q.remainingCapacity()); - }}); - - executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - Thread.sleep(SMALL_DELAY_MS); - threadAssertEquals(one, q.take()); - }}); - - joinPool(executor); + 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 { + assertFalse(q.offer(three)); + threadsStarted.await(); + assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS)); + mustEqual(0, q.remainingCapacity()); + }}); + + executor.execute(new CheckedRunnable() { + public void realRun() throws InterruptedException { + threadsStarted.await(); + assertSame(one, q.take()); + }}); + } } /** - * poll retrieves elements across Executor threads + * timed poll retrieves elements across Executor threads */ public void testPollInExecutor() { - final LinkedBlockingDeque q = new LinkedBlockingDeque(2); - ExecutorService executor = Executors.newFixedThreadPool(2); - executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - threadAssertNull(q.poll()); - threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); - threadAssertTrue(q.isEmpty()); - }}); - - executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - Thread.sleep(SMALL_DELAY_MS); - q.put(one); - }}); - - joinPool(executor); + final LinkedBlockingDeque q = new LinkedBlockingDeque<>(2); + 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(); + assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS)); + checkEmpty(q); + }}); + + executor.execute(new CheckedRunnable() { + public void realRun() throws InterruptedException { + threadsStarted.await(); + q.put(one); + }}); + } } /** - * A deserialized serialized deque has same elements in same order + * A deserialized/reserialized deque has same elements in same order */ public void testSerialization() throws Exception { - LinkedBlockingDeque q = populatedDeque(SIZE); - - ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); - ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); - out.writeObject(q); - out.close(); + Queue x = populatedDeque(SIZE); + Queue y = serialClone(x); - ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); - ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); - LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject(); - assertEquals(q.size(), r.size()); - while (!q.isEmpty()) - assertEquals(q.remove(), r.remove()); - } - - /** - * drainTo(null) throws NPE - */ - public void testDrainToNull() { - LinkedBlockingDeque q = populatedDeque(SIZE); - try { - q.drainTo(null); - shouldThrow(); - } catch (NullPointerException success) {} - } - - /** - * drainTo(this) throws IAE - */ - public void testDrainToSelf() { - LinkedBlockingDeque q = populatedDeque(SIZE); - try { - q.drainTo(q); - shouldThrow(); - } catch (IllegalArgumentException success) {} + 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()); + } + assertTrue(y.isEmpty()); } /** * drainTo(c) empties deque into another collection c */ public void testDrainTo() { - LinkedBlockingDeque q = populatedDeque(SIZE); - ArrayList l = new ArrayList(); + LinkedBlockingDeque q = populatedDeque(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), new Integer(i)); + mustEqual(l.get(i), 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), new Integer(i)); + mustEqual(l.get(i), i); } /** * drainTo empties full deque, unblocking a waiting put. */ public void testDrainToWithActivePut() throws InterruptedException { - final LinkedBlockingDeque q = populatedDeque(SIZE); + final LinkedBlockingDeque q = populatedDeque(SIZE); Thread t = new Thread(new CheckedRunnable() { public void realRun() throws InterruptedException { - q.put(new Integer(SIZE+1)); + q.put(new Item(SIZE + 1)); }}); t.start(); - ArrayList l = new ArrayList(); + ArrayList l = new ArrayList<>(); q.drainTo(l); assertTrue(l.size() >= SIZE); for (int i = 0; i < SIZE; ++i) - assertEquals(l.get(i), new Integer(i)); + mustEqual(l.get(i), i); t.join(); assertTrue(q.size() + l.size() >= SIZE); } /** - * drainTo(null, n) throws NPE - */ - public void testDrainToNullN() { - LinkedBlockingDeque q = populatedDeque(SIZE); - try { - q.drainTo(null, 0); - shouldThrow(); - } catch (NullPointerException success) {} - } - - /** - * drainTo(this, n) throws IAE - */ - public void testDrainToSelfN() { - LinkedBlockingDeque q = populatedDeque(SIZE); - try { - q.drainTo(q, 0); - shouldThrow(); - } catch (IllegalArgumentException success) {} - } - - /** - * drainTo(c, n) empties first max {n, size} elements of deque into c + * drainTo(c, n) empties first min(n, size) elements of queue into c */ public void testDrainToN() { - LinkedBlockingDeque q = new LinkedBlockingDeque(); + LinkedBlockingDeque q = new LinkedBlockingDeque<>(); for (int i = 0; i < SIZE + 2; ++i) { for (int j = 0; j < SIZE; j++) - assertTrue(q.offer(new Integer(j))); - ArrayList l = new ArrayList(); + 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); + int k = (i < SIZE) ? i : SIZE; + mustEqual(k, l.size()); + mustEqual(SIZE - k, q.size()); for (int j = 0; j < k; ++j) - assertEquals(l.get(j), new Integer(j)); - while (q.poll() != null) ; + mustEqual(l.get(j), j); + do {} while (q.poll() != null); + } + } + + /** + * remove(null), contains(null) always return false + */ + public void testNeverContainsNull() { + Deque[] qs = { + new LinkedBlockingDeque<>(), + populatedDeque(2), + }; + + for (Deque q : qs) { + assertFalse(q.contains(null)); + assertFalse(q.remove(null)); + assertFalse(q.removeFirstOccurrence(null)); + assertFalse(q.removeLastOccurrence(null)); } }