--- jsr166/src/test/tck/LinkedTransferQueueTest.java 2009/08/03 19:07:51 1.7 +++ jsr166/src/test/tck/LinkedTransferQueueTest.java 2009/11/21 17:38:05 1.15 @@ -13,14 +13,15 @@ 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; import junit.framework.Test; import junit.framework.TestSuite; +@SuppressWarnings({"unchecked", "rawtypes"}) public class LinkedTransferQueueTest extends JSR166TestCase { public static void main(String[] args) { @@ -31,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 @@ -85,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); @@ -228,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); } /** @@ -249,11 +282,10 @@ public class LinkedTransferQueueTest ext */ public void testTakeFromEmpty() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - Thread t = new Thread(new CheckedInterruptedRunnable() { + Thread t = newStartedThread(new CheckedInterruptedRunnable() { void realRun() throws InterruptedException { q.take(); }}); - t.start(); Thread.sleep(SHORT_DELAY_MS); t.interrupt(); t.join(); @@ -263,29 +295,30 @@ public class LinkedTransferQueueTest ext * Take removes existing elements until empty, then blocks interruptibly */ public void testBlockingTake() throws InterruptedException { - Thread t = new Thread(new CheckedInterruptedRunnable() { + 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(); }}); - t.start(); - 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); } /** @@ -297,6 +330,7 @@ public class LinkedTransferQueueTest ext assertEquals(i, (int) q.poll(0, MILLISECONDS)); } assertNull(q.poll(0, MILLISECONDS)); + checkEmpty(q); } /** @@ -305,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); } /** @@ -315,19 +353,22 @@ public class LinkedTransferQueueTest ext * returning timeout status */ public void testInterruptedTimedPoll() throws InterruptedException { - Thread t = new Thread(new CheckedInterruptedRunnable() { + 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.poll(SHORT_DELAY_MS, + 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(SHORT_DELAY_MS, MILLISECONDS); + q.poll(LONG_DELAY_MS, MILLISECONDS); }}); - t.start(); - Thread.sleep(SHORT_DELAY_MS); + Thread.sleep(SMALL_DELAY_MS); t.interrupt(); t.join(); + checkEmpty(q); } /** @@ -336,13 +377,12 @@ public class LinkedTransferQueueTest ext */ public void testTimedPollWithOffer() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - Thread t = new Thread(new CheckedInterruptedRunnable() { + Thread t = newStartedThread(new CheckedInterruptedRunnable() { void realRun() throws InterruptedException { threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); q.poll(LONG_DELAY_MS, MILLISECONDS); q.poll(LONG_DELAY_MS, MILLISECONDS); }}); - t.start(); Thread.sleep(SMALL_DELAY_MS); assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS)); t.interrupt(); @@ -352,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()); @@ -361,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()); @@ -377,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()); @@ -392,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)); @@ -406,7 +449,7 @@ public class LinkedTransferQueueTest ext assertTrue(q.remove(i)); assertFalse(q.remove(i + 1)); } - assertTrue(q.isEmpty()); + checkEmpty(q); } /** @@ -419,7 +462,7 @@ public class LinkedTransferQueueTest ext assertTrue(q.remove(one)); assertTrue(q.remove(two)); assertTrue(q.add(three)); - assertTrue(q.take() != null); + assertTrue(q.take() == three); } /** @@ -437,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); } /** @@ -501,7 +544,7 @@ public class LinkedTransferQueueTest ext } /** - * toArray contains all elements + * toArray() contains all elements */ public void testToArray() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); @@ -536,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 { @@ -553,13 +596,15 @@ public class LinkedTransferQueueTest ext public void testIterator() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); Iterator it = q.iterator(); + int i = 0; while (it.hasNext()) { - assertEquals(it.next(), q.take()); + assertEquals(it.next(), i++); } + assertEquals(i, SIZE); } /** - * iterator.remove removes current element + * iterator.remove() removes current element */ public void testIteratorRemove() { final LinkedTransferQueue q = new LinkedTransferQueue(); @@ -646,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(); @@ -744,15 +789,14 @@ 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); - Thread t = new Thread(new CheckedRunnable() { + Thread t = newStartedThread(new CheckedRunnable() { void realRun() { q.put(SIZE + 1); }}); - t.start(); ArrayList l = new ArrayList(); q.drainTo(l); assertTrue(l.size() >= 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,20 +854,28 @@ 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(); - new Thread(new CheckedRunnable() { - void realRun() { + 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())); - }}).start(); + 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(); } /** @@ -834,8 +886,7 @@ public class LinkedTransferQueueTest ext LinkedTransferQueue q = new LinkedTransferQueue(); q.transfer(null); shouldThrow(); - } catch (NullPointerException ex) { - } + } catch (NullPointerException success) {} } /** @@ -846,16 +897,17 @@ public class LinkedTransferQueueTest ext final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new CheckedRunnable() { + Thread t = newStartedThread(new CheckedRunnable() { void realRun() throws InterruptedException { q.transfer(SIZE); threadAssertTrue(q.isEmpty()); - }}).start(); + }}); Thread.sleep(SHORT_DELAY_MS); assertEquals(1, q.size()); assertEquals(SIZE, (int) q.poll()); assertTrue(q.isEmpty()); + t.join(); } /** @@ -865,22 +917,21 @@ public class LinkedTransferQueueTest ext final LinkedTransferQueue q = new LinkedTransferQueue(); - Thread first = new Thread(new CheckedRunnable() { + Thread first = newStartedThread(new CheckedRunnable() { void realRun() throws InterruptedException { Integer i = SIZE + 1; q.transfer(i); threadAssertTrue(!q.contains(i)); threadAssertEquals(1, q.size()); }}); - first.start(); - Thread interruptedThread = new Thread(new CheckedInterruptedRunnable() { - void realRun() throws InterruptedException { - while (q.size() == 0) - Thread.yield(); - q.transfer(SIZE); - }}); - interruptedThread.start(); + Thread interruptedThread = newStartedThread( + new CheckedInterruptedRunnable() { + void realRun() throws InterruptedException { + while (q.size() == 0) + Thread.yield(); + q.transfer(SIZE); + }}); while (q.size() < 2) Thread.yield(); @@ -900,15 +951,18 @@ public class LinkedTransferQueueTest ext */ public void testTransfer4() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new CheckedRunnable() { + + Thread t = newStartedThread(new CheckedRunnable() { void realRun() throws InterruptedException { q.transfer(four); threadAssertFalse(q.contains(four)); threadAssertEquals(three, q.poll()); - }}).start(); - Thread.sleep(MEDIUM_DELAY_MS); + }}); + + Thread.sleep(SHORT_DELAY_MS); assertTrue(q.offer(three)); assertEquals(four, q.poll()); + t.join(); } /** @@ -919,15 +973,16 @@ public class LinkedTransferQueueTest ext final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new CheckedRunnable() { + Thread t = newStartedThread(new CheckedRunnable() { void realRun() throws InterruptedException { q.transfer(SIZE); - threadAssertTrue(q.isEmpty()); - }}).start(); + checkEmpty(q); + }}); Thread.sleep(SHORT_DELAY_MS); assertEquals(SIZE, (int) q.take()); - assertTrue(q.isEmpty()); + checkEmpty(q); + t.join(); } /** @@ -937,21 +992,19 @@ public class LinkedTransferQueueTest ext try { final LinkedTransferQueue q = new LinkedTransferQueue(); q.tryTransfer(null); - this.shouldThrow(); - } catch (NullPointerException ex) { - } + shouldThrow(); + } 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); } /** @@ -961,7 +1014,8 @@ public class LinkedTransferQueueTest ext public void testTryTransfer3() throws InterruptedException { final Object hotPotato = new Object(); final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new CheckedRunnable() { + + Thread t = newStartedThread(new CheckedRunnable() { void realRun() { while (! q.hasWaitingConsumer()) Thread.yield(); @@ -969,9 +1023,11 @@ public class LinkedTransferQueueTest ext threadAssertTrue(q.isEmpty()); threadAssertTrue(q.size() == 0); threadAssertTrue(q.tryTransfer(hotPotato)); - }}).start(); - assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) == hotPotato); - assertTrue(q.isEmpty()); + }}); + + assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato); + checkEmpty(q); + t.join(); } /** @@ -981,7 +1037,8 @@ public class LinkedTransferQueueTest ext public void testTryTransfer4() throws InterruptedException { final Object hotPotato = new Object(); final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new CheckedRunnable() { + + Thread t = newStartedThread(new CheckedRunnable() { void realRun() { while (! q.hasWaitingConsumer()) Thread.yield(); @@ -989,9 +1046,11 @@ public class LinkedTransferQueueTest ext threadAssertTrue(q.isEmpty()); threadAssertTrue(q.size() == 0); threadAssertTrue(q.tryTransfer(hotPotato)); - }}).start(); + }}); + assertTrue(q.take() == hotPotato); - assertTrue(q.isEmpty()); + checkEmpty(q); + t.join(); } /** @@ -1000,13 +1059,15 @@ public class LinkedTransferQueueTest ext */ public void testTryTransfer5() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - Thread toInterrupt = new Thread(new CheckedInterruptedRunnable() { + + Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() { void realRun() throws InterruptedException { q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS); }}); - toInterrupt.start(); + Thread.sleep(SMALL_DELAY_MS); toInterrupt.interrupt(); + toInterrupt.join(); } /** @@ -1014,14 +1075,17 @@ public class LinkedTransferQueueTest ext */ public void testTryTransfer6() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new CheckedRunnable() { + + Thread t = newStartedThread(new CheckedRunnable() { void realRun() throws InterruptedException { threadAssertFalse (q.tryTransfer(new Object(), SHORT_DELAY_MS, MILLISECONDS)); - }}).start(); - Thread.sleep(LONG_DELAY_MS); - assertTrue(q.isEmpty()); + }}); + + Thread.sleep(SMALL_DELAY_MS); + checkEmpty(q); + t.join(); } /** @@ -1031,17 +1095,20 @@ public class LinkedTransferQueueTest ext public void testTryTransfer7() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); assertTrue(q.offer(four)); - new Thread(new CheckedRunnable() { + + Thread t = newStartedThread(new CheckedRunnable() { void realRun() throws InterruptedException { threadAssertTrue(q.tryTransfer(five, - LONG_DELAY_MS, MILLISECONDS)); + MEDIUM_DELAY_MS, MILLISECONDS)); threadAssertTrue(q.isEmpty()); - }}).start(); + }}); + Thread.sleep(SHORT_DELAY_MS); assertEquals(2, q.size()); assertEquals(four, q.poll()); assertEquals(five, q.poll()); - assertTrue(q.isEmpty()); + checkEmpty(q); + t.join(); } /** @@ -1055,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) { @@ -1070,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; - } - } }