--- jsr166/src/test/tck/SynchronousQueueTest.java 2009/11/19 01:15:42 1.13 +++ jsr166/src/test/tck/SynchronousQueueTest.java 2009/12/01 06:03:49 1.19 @@ -15,11 +15,11 @@ import java.io.*; public class SynchronousQueueTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); + junit.textui.TestRunner.run (suite()); } public static Test suite() { - return new TestSuite(SynchronousQueueTest.class); + return new TestSuite(SynchronousQueueTest.class); } /** @@ -28,7 +28,7 @@ public class SynchronousQueueTest extend public void testEmptyFull() { SynchronousQueue q = new SynchronousQueue(); assertTrue(q.isEmpty()); - assertEquals(0, q.size()); + assertEquals(0, q.size()); assertEquals(0, q.remainingCapacity()); assertFalse(q.offer(zero)); } @@ -39,7 +39,7 @@ public class SynchronousQueueTest extend public void testFairEmptyFull() { SynchronousQueue q = new SynchronousQueue(true); assertTrue(q.isEmpty()); - assertEquals(0, q.size()); + assertEquals(0, q.size()); assertEquals(0, q.remainingCapacity()); assertFalse(q.offer(zero)); } @@ -48,7 +48,7 @@ public class SynchronousQueueTest extend * offer(null) throws NPE */ public void testOfferNull() { - try { + try { SynchronousQueue q = new SynchronousQueue(); q.offer(null); shouldThrow(); @@ -59,7 +59,7 @@ public class SynchronousQueueTest extend * add(null) throws NPE */ public void testAddNull() { - try { + try { SynchronousQueue q = new SynchronousQueue(); q.add(null); shouldThrow(); @@ -78,7 +78,7 @@ public class SynchronousQueueTest extend * add throws ISE if no active taker */ public void testAdd() { - try { + try { SynchronousQueue q = new SynchronousQueue(); assertEquals(0, q.remainingCapacity()); q.add(one); @@ -137,7 +137,7 @@ public class SynchronousQueueTest extend * put(null) throws NPE */ public void testPutNull() throws InterruptedException { - try { + try { SynchronousQueue q = new SynchronousQueue(); q.put(null); shouldThrow(); @@ -148,8 +148,8 @@ public class SynchronousQueueTest extend * put blocks interruptibly if no active taker */ public void testBlockingPut() throws InterruptedException { - Thread t = new Thread(new CheckedInterruptedRunnable() { - public void realRun() throws InterruptedException { + Thread t = new Thread(new CheckedInterruptedRunnable() { + public void realRun() throws InterruptedException { SynchronousQueue q = new SynchronousQueue(); q.put(zero); }}); @@ -165,27 +165,22 @@ public class SynchronousQueueTest extend */ public void testPutWithTake() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { + Thread t = new Thread(new CheckedRunnable() { + public void realRun() throws InterruptedException { int added = 0; try { - q.put(new Object()); - ++added; - q.put(new Object()); - ++added; - q.put(new Object()); - ++added; - q.put(new Object()); - ++added; - threadShouldThrow(); + while (true) { + q.put(added); + ++added; + } } catch (InterruptedException success) { - assertTrue(added >= 1); + assertTrue(added == 1); } }}); t.start(); Thread.sleep(SHORT_DELAY_MS); - q.take(); + assertEquals(0, q.take()); Thread.sleep(SHORT_DELAY_MS); t.interrupt(); t.join(); @@ -196,9 +191,9 @@ public class SynchronousQueueTest extend */ public void testTimedOffer() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(); - Thread t = new Thread(new CheckedInterruptedRunnable() { - public void realRun() throws InterruptedException { - threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS)); + Thread t = new Thread(new CheckedInterruptedRunnable() { + public void realRun() throws InterruptedException { + assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS)); q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS); }}); @@ -214,8 +209,8 @@ public class SynchronousQueueTest extend */ public void testTakeFromEmpty() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(); - Thread t = new Thread(new CheckedInterruptedRunnable() { - public void realRun() throws InterruptedException { + Thread t = new Thread(new CheckedInterruptedRunnable() { + public void realRun() throws InterruptedException { q.take(); }}); @@ -230,8 +225,8 @@ public class SynchronousQueueTest extend * put blocks interruptibly if no active taker */ public void testFairBlockingPut() throws InterruptedException { - Thread t = new Thread(new CheckedInterruptedRunnable() { - public void realRun() throws InterruptedException { + Thread t = new Thread(new CheckedInterruptedRunnable() { + public void realRun() throws InterruptedException { SynchronousQueue q = new SynchronousQueue(true); q.put(zero); }}); @@ -247,27 +242,22 @@ public class SynchronousQueueTest extend */ public void testFairPutWithTake() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(true); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { + Thread t = new Thread(new CheckedRunnable() { + public void realRun() throws InterruptedException { int added = 0; try { - q.put(new Object()); - ++added; - q.put(new Object()); - ++added; - q.put(new Object()); - ++added; - q.put(new Object()); - ++added; - threadShouldThrow(); + while (true) { + q.put(added); + ++added; + } } catch (InterruptedException success) { - assertTrue(added >= 1); + assertTrue(added == 1); } }}); t.start(); Thread.sleep(SHORT_DELAY_MS); - q.take(); + assertEquals(0, q.take()); Thread.sleep(SHORT_DELAY_MS); t.interrupt(); t.join(); @@ -278,9 +268,9 @@ public class SynchronousQueueTest extend */ public void testFairTimedOffer() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(true); - Thread t = new Thread(new CheckedInterruptedRunnable() { - public void realRun() throws InterruptedException { - threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS)); + Thread t = new Thread(new CheckedInterruptedRunnable() { + public void realRun() throws InterruptedException { + assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS)); q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS); }}); @@ -296,8 +286,8 @@ public class SynchronousQueueTest extend */ public void testFairTakeFromEmpty() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(true); - Thread t = new Thread(new CheckedInterruptedRunnable() { - public void realRun() throws InterruptedException { + Thread t = new Thread(new CheckedInterruptedRunnable() { + public void realRun() throws InterruptedException { q.take(); }}); @@ -312,7 +302,7 @@ public class SynchronousQueueTest extend */ public void testPoll() { SynchronousQueue q = new SynchronousQueue(); - assertNull(q.poll()); + assertNull(q.poll()); } /** @@ -336,9 +326,9 @@ public class SynchronousQueueTest extend * returning timeout status */ public void testInterruptedTimedPoll() throws InterruptedException { - Thread t = new Thread(new CheckedInterruptedRunnable() { - public void realRun() throws InterruptedException { - SynchronousQueue q = new SynchronousQueue(); + final SynchronousQueue q = new SynchronousQueue(); + Thread t = new Thread(new CheckedInterruptedRunnable() { + public void realRun() throws InterruptedException { q.poll(SMALL_DELAY_MS, MILLISECONDS); }}); @@ -354,13 +344,13 @@ public class SynchronousQueueTest extend */ public void testTimedPollWithOffer() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); + 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)); try { q.poll(LONG_DELAY_MS, MILLISECONDS); - threadShouldThrow(); + shouldThrow(); } catch (InterruptedException success) {} }}); @@ -376,8 +366,8 @@ public class SynchronousQueueTest extend * returning timeout status */ public void testFairInterruptedTimedPoll() throws InterruptedException { - Thread t = new Thread(new CheckedInterruptedRunnable() { - public void realRun() throws InterruptedException { + Thread t = new Thread(new CheckedInterruptedRunnable() { + public void realRun() throws InterruptedException { SynchronousQueue q = new SynchronousQueue(true); q.poll(SMALL_DELAY_MS, MILLISECONDS); }}); @@ -394,9 +384,9 @@ public class SynchronousQueueTest extend */ public void testFairTimedPollWithOffer() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(true); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { - threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); + 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)); try { q.poll(LONG_DELAY_MS, MILLISECONDS); @@ -417,7 +407,7 @@ public class SynchronousQueueTest extend */ public void testPeek() { SynchronousQueue q = new SynchronousQueue(); - assertNull(q.peek()); + assertNull(q.peek()); } /** @@ -439,8 +429,7 @@ public class SynchronousQueueTest extend try { q.remove(); shouldThrow(); - } catch (NoSuchElementException success) { - } + } catch (NoSuchElementException success) {} } /** @@ -508,7 +497,7 @@ public class SynchronousQueueTest extend */ public void testToArray() { SynchronousQueue q = new SynchronousQueue(); - Object[] o = q.toArray(); + Object[] o = q.toArray(); assertEquals(o.length, 0); } @@ -517,7 +506,7 @@ public class SynchronousQueueTest extend */ public void testToArray2() { SynchronousQueue q = new SynchronousQueue(); - Integer[] ints = new Integer[1]; + Integer[] ints = new Integer[1]; assertNull(ints[0]); } @@ -525,11 +514,11 @@ public class SynchronousQueueTest extend * toArray(null) throws NPE */ public void testToArray_BadArg() { - try { - SynchronousQueue q = new SynchronousQueue(); - Object o[] = q.toArray(null); - shouldThrow(); - } catch (NullPointerException success) {} + SynchronousQueue q = new SynchronousQueue(); + try { + Object o[] = q.toArray(null); + shouldThrow(); + } catch (NullPointerException success) {} } @@ -538,7 +527,7 @@ public class SynchronousQueueTest extend */ public void testIterator() { SynchronousQueue q = new SynchronousQueue(); - Iterator it = q.iterator(); + Iterator it = q.iterator(); assertFalse(it.hasNext()); try { Object x = it.next(); @@ -551,7 +540,7 @@ public class SynchronousQueueTest extend */ public void testIteratorRemove() { SynchronousQueue q = new SynchronousQueue(); - Iterator it = q.iterator(); + Iterator it = q.iterator(); try { it.remove(); shouldThrow(); @@ -574,19 +563,18 @@ public class SynchronousQueueTest extend public void testOfferInExecutor() { final SynchronousQueue q = new SynchronousQueue(); ExecutorService executor = Executors.newFixedThreadPool(2); - final Integer one = new Integer(1); executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - threadAssertFalse(q.offer(one)); - threadAssertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS)); - threadAssertEquals(0, q.remainingCapacity()); + public void realRun() throws InterruptedException { + assertFalse(q.offer(one)); + assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS)); + assertEquals(0, q.remainingCapacity()); }}); executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { + public void realRun() throws InterruptedException { Thread.sleep(SMALL_DELAY_MS); - threadAssertEquals(one, q.take()); + assertSame(one, q.take()); }}); joinPool(executor); @@ -600,16 +588,16 @@ public class SynchronousQueueTest extend final SynchronousQueue q = new SynchronousQueue(); 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()); + public void realRun() throws InterruptedException { + assertNull(q.poll()); + assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); + assertTrue(q.isEmpty()); }}); executor.execute(new CheckedRunnable() { - public void realRun() throws InterruptedException { - Thread.sleep(SMALL_DELAY_MS); - q.put(new Integer(1)); + public void realRun() throws InterruptedException { + Thread.sleep(SHORT_DELAY_MS); + q.put(one); }}); joinPool(executor); @@ -671,8 +659,8 @@ public class SynchronousQueueTest extend */ public void testDrainToWithActivePut() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(); - Thread t = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { + Thread t = new Thread(new CheckedRunnable() { + public void realRun() throws InterruptedException { q.put(new Integer(1)); }}); @@ -706,8 +694,7 @@ public class SynchronousQueueTest extend try { q.drainTo(q, 0); shouldThrow(); - } catch (IllegalArgumentException success) { - } + } catch (IllegalArgumentException success) {} } /** @@ -715,13 +702,13 @@ public class SynchronousQueueTest extend */ public void testDrainToN() throws InterruptedException { final SynchronousQueue q = new SynchronousQueue(); - Thread t1 = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { + Thread t1 = new Thread(new CheckedRunnable() { + public void realRun() throws InterruptedException { q.put(one); }}); - Thread t2 = new Thread(new CheckedRunnable() { - public void realRun() throws InterruptedException { + Thread t2 = new Thread(new CheckedRunnable() { + public void realRun() throws InterruptedException { q.put(two); }});