--- jsr166/src/test/tck/LinkedTransferQueueTest.java 2009/08/12 02:15:04 1.11 +++ jsr166/src/test/tck/LinkedTransferQueueTest.java 2009/11/21 17:38:05 1.15 @@ -13,8 +13,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.Arrays; -import java.util.ConcurrentModificationException; import java.util.Iterator; +import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -32,6 +32,32 @@ public class LinkedTransferQueueTest ext return new TestSuite(LinkedTransferQueueTest.class); } + void checkEmpty(LinkedTransferQueue q) throws InterruptedException { + assertTrue(q.isEmpty()); + assertEquals(0, q.size()); + assertNull(q.peek()); + assertNull(q.poll()); + assertNull(q.poll(0, MILLISECONDS)); + assertEquals(q.toString(), "[]"); + assertTrue(Arrays.equals(q.toArray(), new Object[0])); + assertFalse(q.iterator().hasNext()); + try { + q.element(); + shouldThrow(); + } catch (NoSuchElementException success) { + } + try { + q.iterator().next(); + shouldThrow(); + } catch (NoSuchElementException success) { + } + try { + q.remove(); + shouldThrow(); + } catch (NoSuchElementException success) { + } + } + /** * Constructor builds new queue with size being zero and empty * being true @@ -86,22 +112,28 @@ public class LinkedTransferQueueTest ext * Queue contains all elements of the collection it is initialized by */ public void testConstructor5() { - try { - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE; ++i) { - ints[i] = i; - } - LinkedTransferQueue q - = new LinkedTransferQueue(Arrays.asList(ints)); - for (int i = 0; i < SIZE; ++i) { - assertEquals(ints[i], q.poll()); - } - } finally { + Integer[] ints = new Integer[SIZE]; + for (int i = 0; i < SIZE; ++i) { + ints[i] = i; + } + List intList = Arrays.asList(ints); + LinkedTransferQueue q + = new LinkedTransferQueue(intList); + assertEquals(q.size(), intList.size()); + assertEquals(q.toString(), intList.toString()); + assertTrue(Arrays.equals(q.toArray(), + intList.toArray())); + assertTrue(Arrays.equals(q.toArray(new Object[0]), + intList.toArray(new Object[0]))); + assertTrue(Arrays.equals(q.toArray(new Object[SIZE]), + intList.toArray(new Object[SIZE]))); + for (int i = 0; i < SIZE; ++i) { + assertEquals(ints[i], q.poll()); } } /** - * Remaining capacity never decrease nor increase on add or remove + * remainingCapacity() always returns Integer.MAX_VALUE */ public void testRemainingCapacity() { LinkedTransferQueue q = populatedQueue(SIZE); @@ -229,10 +261,10 @@ public class LinkedTransferQueueTest ext public void testPut() { LinkedTransferQueue q = new LinkedTransferQueue(); for (int i = 0; i < SIZE; ++i) { + assertEquals(q.size(), i); q.put(i); assertTrue(q.contains(i)); } - assertEquals(q.size(), SIZE); } /** @@ -263,28 +295,30 @@ public class LinkedTransferQueueTest ext * Take removes existing elements until empty, then blocks interruptibly */ public void testBlockingTake() throws InterruptedException { + final LinkedTransferQueue q = populatedQueue(SIZE); Thread t = newStartedThread(new CheckedInterruptedRunnable() { void realRun() throws InterruptedException { - LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { threadAssertEquals(i, (int) q.take()); } q.take(); }}); - Thread.sleep(SHORT_DELAY_MS); + Thread.sleep(SMALL_DELAY_MS); t.interrupt(); t.join(); + checkEmpty(q); } /** * poll succeeds unless empty */ - public void testPoll() { + public void testPoll() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(i, (int) q.poll()); } assertNull(q.poll()); + checkEmpty(q); } /** @@ -296,6 +330,7 @@ public class LinkedTransferQueueTest ext assertEquals(i, (int) q.poll(0, MILLISECONDS)); } assertNull(q.poll(0, MILLISECONDS)); + checkEmpty(q); } /** @@ -304,9 +339,13 @@ public class LinkedTransferQueueTest ext public void testTimedPoll() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS)); + long t0 = System.nanoTime(); + assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); + long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024); + assertTrue(millisElapsed < SMALL_DELAY_MS); } assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); + checkEmpty(q); } /** @@ -318,16 +357,18 @@ public class LinkedTransferQueueTest ext Thread t = newStartedThread(new CheckedInterruptedRunnable() { void realRun() throws InterruptedException { for (int i = 0; i < SIZE; ++i) { + long t0 = System.nanoTime(); threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); + long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024); + assertTrue(millisElapsed < SMALL_DELAY_MS); } q.poll(LONG_DELAY_MS, MILLISECONDS); }}); Thread.sleep(SMALL_DELAY_MS); t.interrupt(); t.join(); - assertEquals(q.size(), 0); - assertNull(q.poll()); + checkEmpty(q); } /** @@ -351,7 +392,7 @@ public class LinkedTransferQueueTest ext /** * peek returns next element, or null if empty */ - public void testPeek() { + public void testPeek() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(i, (int) q.peek()); @@ -360,12 +401,13 @@ public class LinkedTransferQueueTest ext i != (int) q.peek()); } assertNull(q.peek()); + checkEmpty(q); } /** * element returns next element, or throws NoSuchElementException if empty */ - public void testElement() { + public void testElement() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(i, (int) q.element()); @@ -376,12 +418,13 @@ public class LinkedTransferQueueTest ext shouldThrow(); } catch (NoSuchElementException success) { } + checkEmpty(q); } /** * remove removes next element, or throws NoSuchElementException if empty */ - public void testRemove() { + public void testRemove() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(i, (int) q.remove()); @@ -391,12 +434,13 @@ public class LinkedTransferQueueTest ext shouldThrow(); } catch (NoSuchElementException success) { } + checkEmpty(q); } /** * remove(x) removes x and returns true if present */ - public void testRemoveElement() { + public void testRemoveElement() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 1; i < SIZE; i += 2) { assertTrue(q.remove(i)); @@ -405,7 +449,7 @@ public class LinkedTransferQueueTest ext assertTrue(q.remove(i)); assertFalse(q.remove(i + 1)); } - assertTrue(q.isEmpty()); + checkEmpty(q); } /** @@ -436,17 +480,17 @@ public class LinkedTransferQueueTest ext /** * clear removes all elements */ - public void testClear() { + public void testClear() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); q.clear(); - assertTrue(q.isEmpty()); - assertEquals(0, q.size()); + checkEmpty(q); assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); q.add(one); assertFalse(q.isEmpty()); + assertEquals(1, q.size()); assertTrue(q.contains(one)); q.clear(); - assertTrue(q.isEmpty()); + checkEmpty(q); } /** @@ -500,7 +544,7 @@ public class LinkedTransferQueueTest ext } /** - * toArray contains all elements + * toArray() contains all elements */ public void testToArray() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); @@ -535,7 +579,7 @@ public class LinkedTransferQueueTest ext } /** - * toArray with incompatible array type throws CCE + * toArray(incompatible array type) throws CCE */ public void testToArray1_BadArg() { try { @@ -560,7 +604,7 @@ public class LinkedTransferQueueTest ext } /** - * iterator.remove removes current element + * iterator.remove() removes current element */ public void testIteratorRemove() { final LinkedTransferQueue q = new LinkedTransferQueue(); @@ -647,7 +691,7 @@ public class LinkedTransferQueueTest ext } /** - * poll retrieves elements across Executor threads + * timed poll retrieves elements across Executor threads */ public void testPollInExecutor() { final LinkedTransferQueue q = new LinkedTransferQueue(); @@ -745,7 +789,7 @@ public class LinkedTransferQueueTest ext } /** - * drainTo empties full queue, unblocking a waiting put. + * drainTo(c) empties full queue, unblocking a waiting put. */ public void testDrainToWithActivePut() throws InterruptedException { final LinkedTransferQueue q = populatedQueue(SIZE); @@ -769,7 +813,7 @@ public class LinkedTransferQueueTest ext public void testDrainToNullN() { LinkedTransferQueue q = populatedQueue(SIZE); try { - q.drainTo(null, 0); + q.drainTo(null, SIZE); shouldThrow(); } catch (NullPointerException success) { } @@ -781,7 +825,7 @@ public class LinkedTransferQueueTest ext public void testDrainToSelfN() { LinkedTransferQueue q = populatedQueue(SIZE); try { - q.drainTo(q, 0); + q.drainTo(q, SIZE); shouldThrow(); } catch (IllegalArgumentException success) { } @@ -810,23 +854,27 @@ public class LinkedTransferQueueTest ext } /** - * poll and take decrement the waiting consumer count + * timed poll() or take() increments the waiting consumer count; + * offer(e) decrements the waiting consumer count */ public void testWaitingConsumer() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - final ConsumerObserver waiting = new ConsumerObserver(); + assertEquals(q.getWaitingConsumerCount(), 0); + assertFalse(q.hasWaitingConsumer()); Thread t = newStartedThread(new CheckedRunnable() { void realRun() throws InterruptedException { Thread.sleep(SMALL_DELAY_MS); threadAssertTrue(q.hasWaitingConsumer()); - waiting.setWaitingConsumer(q.getWaitingConsumerCount()); + threadAssertEquals(q.getWaitingConsumerCount(), 1); threadAssertTrue(q.offer(new Object())); + threadAssertFalse(q.hasWaitingConsumer()); + threadAssertEquals(q.getWaitingConsumerCount(), 0); }}); assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null); - assertTrue(q.getWaitingConsumerCount() - < waiting.getWaitingConsumers()); + assertEquals(q.getWaitingConsumerCount(), 0); + assertFalse(q.hasWaitingConsumer()); t.join(); } @@ -838,8 +886,7 @@ public class LinkedTransferQueueTest ext LinkedTransferQueue q = new LinkedTransferQueue(); q.transfer(null); shouldThrow(); - } catch (NullPointerException ex) { - } + } catch (NullPointerException success) {} } /** @@ -929,12 +976,12 @@ public class LinkedTransferQueueTest ext Thread t = newStartedThread(new CheckedRunnable() { void realRun() throws InterruptedException { q.transfer(SIZE); - threadAssertTrue(q.isEmpty()); + checkEmpty(q); }}); Thread.sleep(SHORT_DELAY_MS); assertEquals(SIZE, (int) q.take()); - assertTrue(q.isEmpty()); + checkEmpty(q); t.join(); } @@ -946,20 +993,18 @@ public class LinkedTransferQueueTest ext final LinkedTransferQueue q = new LinkedTransferQueue(); q.tryTransfer(null); shouldThrow(); - } catch (NullPointerException ex) { - } + } catch (NullPointerException success) {} } /** * tryTransfer returns false and does not enqueue if there are no * consumers waiting to poll or take. */ - public void testTryTransfer2() { + public void testTryTransfer2() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); assertFalse(q.tryTransfer(new Object())); assertFalse(q.hasWaitingConsumer()); - assertTrue(q.isEmpty()); - assertEquals(0, q.size()); + checkEmpty(q); } /** @@ -981,7 +1026,7 @@ public class LinkedTransferQueueTest ext }}); assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato); - assertTrue(q.isEmpty()); + checkEmpty(q); t.join(); } @@ -1004,7 +1049,7 @@ public class LinkedTransferQueueTest ext }}); assertTrue(q.take() == hotPotato); - assertTrue(q.isEmpty()); + checkEmpty(q); t.join(); } @@ -1039,7 +1084,7 @@ public class LinkedTransferQueueTest ext }}); Thread.sleep(SMALL_DELAY_MS); - assertTrue(q.isEmpty()); + checkEmpty(q); t.join(); } @@ -1062,7 +1107,7 @@ public class LinkedTransferQueueTest ext assertEquals(2, q.size()); assertEquals(four, q.poll()); assertEquals(five, q.poll()); - assertTrue(q.isEmpty()); + checkEmpty(q); t.join(); } @@ -1077,8 +1122,8 @@ public class LinkedTransferQueueTest ext assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS)); assertEquals(1, q.size()); assertEquals(four, q.poll()); - threadAssertTrue(q.isEmpty()); assertNull(q.poll()); + checkEmpty(q); } private LinkedTransferQueue populatedQueue(int n) { @@ -1092,20 +1137,4 @@ public class LinkedTransferQueueTest ext assertFalse(q.isEmpty()); return q; } - - private static class ConsumerObserver { - - private int waitingConsumers; - - private ConsumerObserver() { - } - - private void setWaitingConsumer(int i) { - this.waitingConsumers = i; - } - - private int getWaitingConsumers() { - return waitingConsumers; - } - } }