--- jsr166/src/test/tck/LinkedTransferQueueTest.java 2009/08/02 12:31:24 1.6 +++ jsr166/src/test/tck/LinkedTransferQueueTest.java 2009/08/12 02:15:04 1.11 @@ -17,9 +17,11 @@ import java.util.ConcurrentModificationE import java.util.Iterator; 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,7 +33,8 @@ public class LinkedTransferQueueTest ext } /** - * Constructor builds new queue with size being zero and empty being true + * Constructor builds new queue with size being zero and empty + * being true */ public void testConstructor1() { assertEquals(0, new LinkedTransferQueue().size()); @@ -39,7 +42,8 @@ public class LinkedTransferQueueTest ext } /** - * Initializing constructor with null collection throws NullPointerException + * Initializing constructor with null collection throws + * NullPointerException */ public void testConstructor2() { try { @@ -50,12 +54,13 @@ public class LinkedTransferQueueTest ext } /** - * Initializing from Collection of null elements throws NullPointerException + * Initializing from Collection of null elements throws + * NullPointerException */ public void testConstructor3() { try { Integer[] ints = new Integer[SIZE]; - LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints)); + new LinkedTransferQueue(Arrays.asList(ints)); shouldThrow(); } catch (NullPointerException success) { } @@ -71,7 +76,7 @@ public class LinkedTransferQueueTest ext for (int i = 0; i < SIZE - 1; ++i) { ints[i] = i; } - LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints)); + new LinkedTransferQueue(Arrays.asList(ints)); shouldThrow(); } catch (NullPointerException success) { } @@ -86,7 +91,8 @@ public class LinkedTransferQueueTest ext for (int i = 0; i < SIZE; ++i) { ints[i] = i; } - LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints)); + LinkedTransferQueue q + = new LinkedTransferQueue(Arrays.asList(ints)); for (int i = 0; i < SIZE; ++i) { assertEquals(ints[i], q.poll()); } @@ -173,8 +179,8 @@ public class LinkedTransferQueueTest ext } /** - * addAll of a collection with any null elements throws NullPointerException after - * possibly adding some elements + * addAll of a collection with any null elements throws + * NullPointerException after possibly adding some elements */ public void testAddAll3() { try { @@ -244,17 +250,10 @@ public class LinkedTransferQueueTest ext */ public void testTakeFromEmpty() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - Thread t = new Thread(new Runnable() { - public void run() { - try { - q.take(); - threadShouldThrow(); - } catch (InterruptedException success) { - } catch (Throwable ex) { - threadUnexpectedException(ex); - } + Thread t = newStartedThread(new CheckedInterruptedRunnable() { + void realRun() throws InterruptedException { + q.take(); }}); - t.start(); Thread.sleep(SHORT_DELAY_MS); t.interrupt(); t.join(); @@ -264,21 +263,14 @@ public class LinkedTransferQueueTest ext * Take removes existing elements until empty, then blocks interruptibly */ public void testBlockingTake() throws InterruptedException { - Thread t = new Thread(new Runnable() { - public void run() { - try { - LinkedTransferQueue q = populatedQueue(SIZE); - for (int i = 0; i < SIZE; ++i) { - threadAssertEquals(i, (int) q.take()); - } - q.take(); - threadShouldThrow(); - } catch (InterruptedException success) { - } catch (Throwable ex) { - threadUnexpectedException(ex); + 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); t.interrupt(); t.join(); @@ -301,9 +293,9 @@ public class LinkedTransferQueueTest ext public void testTimedPoll0() throws InterruptedException { LinkedTransferQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, (int) q.poll(0, TimeUnit.MILLISECONDS)); + assertEquals(i, (int) q.poll(0, MILLISECONDS)); } - assertNull(q.poll(0, TimeUnit.MILLISECONDS)); + assertNull(q.poll(0, MILLISECONDS)); } /** @@ -312,9 +304,9 @@ 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, TimeUnit.MILLISECONDS)); + assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS)); } - assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); + assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); } /** @@ -322,23 +314,20 @@ public class LinkedTransferQueueTest ext * returning timeout status */ public void testInterruptedTimedPoll() throws InterruptedException { - Thread t = new Thread(new Runnable() { - public void run() { - try { - LinkedTransferQueue q = populatedQueue(SIZE); - for (int i = 0; i < SIZE; ++i) { - threadAssertEquals(i, (int) q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); - } - threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); - } catch (InterruptedException success) { - } catch (Throwable ex) { - threadUnexpectedException(ex); + final LinkedTransferQueue q = populatedQueue(SIZE); + Thread t = newStartedThread(new CheckedInterruptedRunnable() { + void realRun() throws InterruptedException { + for (int i = 0; i < SIZE; ++i) { + threadAssertEquals(i, (int) q.poll(LONG_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(); + assertEquals(q.size(), 0); + assertNull(q.poll()); } /** @@ -347,21 +336,14 @@ public class LinkedTransferQueueTest ext */ public void testTimedPollWithOffer() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - Thread t = new Thread(new Runnable() { - public void run() { - try { - threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); - q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS); - q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS); - threadShouldThrow(); - } catch (InterruptedException success) { - } catch (Throwable ex) { - threadUnexpectedException(ex); - } + 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, TimeUnit.MILLISECONDS)); + assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS)); t.interrupt(); t.join(); } @@ -436,7 +418,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); } /** @@ -482,7 +464,8 @@ public class LinkedTransferQueueTest ext } /** - * retainAll(c) retains only those elements of c and reports true if changed + * retainAll(c) retains only those elements of c and reports true + * if changed */ public void testRetainAll() { LinkedTransferQueue q = populatedQueue(SIZE); @@ -501,7 +484,8 @@ public class LinkedTransferQueueTest ext } /** - * removeAll(c) removes only those elements of c and reports true if changed + * removeAll(c) removes only those elements of c and reports true + * if changed */ public void testRemoveAll() { for (int i = 1; i < SIZE; ++i) { @@ -568,9 +552,11 @@ 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); } /** @@ -596,7 +582,8 @@ public class LinkedTransferQueueTest ext * iterator ordering is FIFO */ public void testIteratorOrdering() { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q + = new LinkedTransferQueue(); assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); q.add(one); q.add(two); @@ -643,23 +630,17 @@ public class LinkedTransferQueueTest ext q.add(one); q.add(two); ExecutorService executor = Executors.newFixedThreadPool(2); - executor.execute(new Runnable() { - public void run() { - try { - threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS)); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } + + executor.execute(new CheckedRunnable() { + void realRun() { + threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, + MILLISECONDS)); }}); - executor.execute(new Runnable() { - public void run() { - try { - Thread.sleep(SMALL_DELAY_MS); - threadAssertEquals(one, q.take()); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } + executor.execute(new CheckedRunnable() { + void realRun() throws InterruptedException { + Thread.sleep(SMALL_DELAY_MS); + threadAssertEquals(one, q.take()); }}); joinPool(executor); @@ -671,25 +652,19 @@ public class LinkedTransferQueueTest ext public void testPollInExecutor() { final LinkedTransferQueue q = new LinkedTransferQueue(); ExecutorService executor = Executors.newFixedThreadPool(2); - executor.execute(new Runnable() { - public void run() { - try { - threadAssertNull(q.poll()); - threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS)); - threadAssertTrue(q.isEmpty()); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } + + executor.execute(new CheckedRunnable() { + void realRun() throws InterruptedException { + threadAssertNull(q.poll()); + threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, + MILLISECONDS)); + threadAssertTrue(q.isEmpty()); }}); - executor.execute(new Runnable() { - public void run() { - try { - Thread.sleep(SMALL_DELAY_MS); - q.put(one); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } + executor.execute(new CheckedRunnable() { + void realRun() throws InterruptedException { + Thread.sleep(SMALL_DELAY_MS); + q.put(one); }}); joinPool(executor); @@ -702,12 +677,15 @@ public class LinkedTransferQueueTest ext LinkedTransferQueue q = populatedQueue(SIZE); ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); - ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); + ObjectOutputStream out + = new ObjectOutputStream(new BufferedOutputStream(bout)); out.writeObject(q); out.close(); - ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); - ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); + ByteArrayInputStream bin + = new ByteArrayInputStream(bout.toByteArray()); + ObjectInputStream in + = new ObjectInputStream(new BufferedInputStream(bin)); LinkedTransferQueue r = (LinkedTransferQueue) in.readObject(); assertEquals(q.size(), r.size()); @@ -771,15 +749,10 @@ public class LinkedTransferQueueTest ext */ public void testDrainToWithActivePut() throws InterruptedException { final LinkedTransferQueue q = populatedQueue(SIZE); - Thread t = new Thread(new Runnable() { - public void run() { - try { - q.put(SIZE + 1); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } + Thread t = newStartedThread(new CheckedRunnable() { + void realRun() { + q.put(SIZE + 1); }}); - t.start(); ArrayList l = new ArrayList(); q.drainTo(l); assertTrue(l.size() >= SIZE); @@ -842,18 +815,19 @@ public class LinkedTransferQueueTest ext public void testWaitingConsumer() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); final ConsumerObserver waiting = new ConsumerObserver(); - new Thread(new Runnable() { - public void run() { - try { - threadAssertTrue(q.hasWaitingConsumer()); - waiting.setWaitingConsumer(q.getWaitingConsumerCount()); - threadAssertTrue(q.offer(new Object())); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } - }}).start(); - assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) != null); - assertTrue(q.getWaitingConsumerCount() < waiting.getWaitingConsumers()); + + Thread t = newStartedThread(new CheckedRunnable() { + void realRun() throws InterruptedException { + Thread.sleep(SMALL_DELAY_MS); + threadAssertTrue(q.hasWaitingConsumer()); + waiting.setWaitingConsumer(q.getWaitingConsumerCount()); + threadAssertTrue(q.offer(new Object())); + }}); + + assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null); + assertTrue(q.getWaitingConsumerCount() + < waiting.getWaitingConsumers()); + t.join(); } /** @@ -873,58 +847,44 @@ public class LinkedTransferQueueTest ext * is returned by this associated poll. */ public void testTransfer2() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q + = new LinkedTransferQueue(); - new Thread(new Runnable() { - public void run() { - try { - q.transfer(SIZE); - threadAssertTrue(q.isEmpty()); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } - }}).start(); + Thread t = newStartedThread(new CheckedRunnable() { + void realRun() throws InterruptedException { + q.transfer(SIZE); + threadAssertTrue(q.isEmpty()); + }}); Thread.sleep(SHORT_DELAY_MS); assertEquals(1, q.size()); assertEquals(SIZE, (int) q.poll()); assertTrue(q.isEmpty()); + t.join(); } /** * transfer waits until a poll occurs, and then transfers in fifo order */ public void testTransfer3() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q + = new LinkedTransferQueue(); - Thread first = - new Thread(new Runnable() { - public void run() { - try { - Integer i = SIZE + 1; - q.transfer(i); - threadAssertTrue(!q.contains(i)); - threadAssertEquals(1, q.size()); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } - }}); - first.start(); + Thread first = newStartedThread(new CheckedRunnable() { + void realRun() throws InterruptedException { + Integer i = SIZE + 1; + q.transfer(i); + threadAssertTrue(!q.contains(i)); + threadAssertEquals(1, q.size()); + }}); - Thread interruptedThread = - new Thread(new Runnable() { - public void run() { - try { - while (q.size() == 0) - Thread.yield(); - q.transfer(SIZE); - threadShouldThrow(); - } catch (InterruptedException success) { - } catch (Throwable ex) { - threadUnexpectedException(ex); - } + Thread interruptedThread = newStartedThread( + new CheckedInterruptedRunnable() { + void realRun() throws InterruptedException { + while (q.size() == 0) + Thread.yield(); + q.transfer(SIZE); }}); - interruptedThread.start(); while (q.size() < 2) Thread.yield(); @@ -944,19 +904,18 @@ public class LinkedTransferQueueTest ext */ public void testTransfer4() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new Runnable() { - public void run() { - try { - q.transfer(four); - threadAssertFalse(q.contains(four)); - threadAssertEquals(three, q.poll()); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } - }}).start(); - Thread.sleep(MEDIUM_DELAY_MS); + + Thread t = newStartedThread(new CheckedRunnable() { + void realRun() throws InterruptedException { + q.transfer(four); + threadAssertFalse(q.contains(four)); + threadAssertEquals(three, q.poll()); + }}); + + Thread.sleep(SHORT_DELAY_MS); assertTrue(q.offer(three)); assertEquals(four, q.poll()); + t.join(); } /** @@ -964,21 +923,19 @@ public class LinkedTransferQueueTest ext * is returned by this associated take. */ public void testTransfer5() throws InterruptedException { - final LinkedTransferQueue q = new LinkedTransferQueue(); + final LinkedTransferQueue q + = new LinkedTransferQueue(); - new Thread(new Runnable() { - public void run() { - try { - q.transfer(SIZE); - threadAssertTrue(q.isEmpty()); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } - }}).start(); + Thread t = newStartedThread(new CheckedRunnable() { + void realRun() throws InterruptedException { + q.transfer(SIZE); + threadAssertTrue(q.isEmpty()); + }}); Thread.sleep(SHORT_DELAY_MS); assertEquals(SIZE, (int) q.take()); assertTrue(q.isEmpty()); + t.join(); } /** @@ -988,7 +945,7 @@ public class LinkedTransferQueueTest ext try { final LinkedTransferQueue q = new LinkedTransferQueue(); q.tryTransfer(null); - this.shouldThrow(); + shouldThrow(); } catch (NullPointerException ex) { } } @@ -1012,21 +969,20 @@ public class LinkedTransferQueueTest ext public void testTryTransfer3() throws InterruptedException { final Object hotPotato = new Object(); final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new Runnable() { - public void run() { - try { - while (! q.hasWaitingConsumer()) - Thread.yield(); - threadAssertTrue(q.hasWaitingConsumer()); - threadAssertTrue(q.isEmpty()); - threadAssertTrue(q.size() == 0); - threadAssertTrue(q.tryTransfer(hotPotato)); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } - }}).start(); - assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) == hotPotato); + + Thread t = newStartedThread(new CheckedRunnable() { + void realRun() { + while (! q.hasWaitingConsumer()) + Thread.yield(); + threadAssertTrue(q.hasWaitingConsumer()); + threadAssertTrue(q.isEmpty()); + threadAssertTrue(q.size() == 0); + threadAssertTrue(q.tryTransfer(hotPotato)); + }}); + + assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato); assertTrue(q.isEmpty()); + t.join(); } /** @@ -1036,21 +992,20 @@ public class LinkedTransferQueueTest ext public void testTryTransfer4() throws InterruptedException { final Object hotPotato = new Object(); final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new Runnable() { - public void run() { - try { - while (! q.hasWaitingConsumer()) - Thread.yield(); - threadAssertTrue(q.hasWaitingConsumer()); - threadAssertTrue(q.isEmpty()); - threadAssertTrue(q.size() == 0); - threadAssertTrue(q.tryTransfer(hotPotato)); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } - }}).start(); + + Thread t = newStartedThread(new CheckedRunnable() { + void realRun() { + while (! q.hasWaitingConsumer()) + Thread.yield(); + threadAssertTrue(q.hasWaitingConsumer()); + threadAssertTrue(q.isEmpty()); + threadAssertTrue(q.size() == 0); + threadAssertTrue(q.tryTransfer(hotPotato)); + }}); + assertTrue(q.take() == hotPotato); assertTrue(q.isEmpty()); + t.join(); } /** @@ -1059,19 +1014,15 @@ public class LinkedTransferQueueTest ext */ public void testTryTransfer5() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - Thread toInterrupt = new Thread(new Runnable() { - public void run() { - try { - q.tryTransfer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS); - threadShouldThrow(); - } catch (InterruptedException success) { - } catch (Throwable ex) { - threadUnexpectedException(ex); - } + + 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(); } /** @@ -1079,16 +1030,17 @@ public class LinkedTransferQueueTest ext */ public void testTryTransfer6() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); - new Thread(new Runnable() { - public void run() { - try { - threadAssertFalse(q.tryTransfer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } - }}).start(); - Thread.sleep(LONG_DELAY_MS); + + Thread t = newStartedThread(new CheckedRunnable() { + void realRun() throws InterruptedException { + threadAssertFalse + (q.tryTransfer(new Object(), + SHORT_DELAY_MS, MILLISECONDS)); + }}); + + Thread.sleep(SMALL_DELAY_MS); assertTrue(q.isEmpty()); + t.join(); } /** @@ -1098,20 +1050,20 @@ public class LinkedTransferQueueTest ext public void testTryTransfer7() throws InterruptedException { final LinkedTransferQueue q = new LinkedTransferQueue(); assertTrue(q.offer(four)); - new Thread(new Runnable() { - public void run() { - try { - threadAssertTrue(q.tryTransfer(five, LONG_DELAY_MS, TimeUnit.MILLISECONDS)); - threadAssertTrue(q.isEmpty()); - } catch (Throwable ex) { - threadUnexpectedException(ex); - } - }}).start(); + + Thread t = newStartedThread(new CheckedRunnable() { + void realRun() throws InterruptedException { + threadAssertTrue(q.tryTransfer(five, + MEDIUM_DELAY_MS, MILLISECONDS)); + threadAssertTrue(q.isEmpty()); + }}); + Thread.sleep(SHORT_DELAY_MS); assertEquals(2, q.size()); assertEquals(four, q.poll()); assertEquals(five, q.poll()); assertTrue(q.isEmpty()); + t.join(); } /** @@ -1122,7 +1074,7 @@ public class LinkedTransferQueueTest ext final LinkedTransferQueue q = new LinkedTransferQueue(); assertTrue(q.offer(four)); assertEquals(1, q.size()); - assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); + assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS)); assertEquals(1, q.size()); assertEquals(four, q.poll()); threadAssertTrue(q.isEmpty());