--- jsr166/src/test/tck/SynchronousQueueTest.java 2003/09/07 20:39:11 1.2 +++ jsr166/src/test/tck/SynchronousQueueTest.java 2003/09/20 18:20:08 1.4 @@ -10,12 +10,7 @@ import java.util.*; import java.util.concurrent.*; import java.io.*; -public class SynchronousQueueTest extends TestCase { - - private final static int N = 1; - private static long SHORT_DELAY_MS = 100; - private static long MEDIUM_DELAY_MS = 1000; - private static long LONG_DELAY_MS = 10000; +public class SynchronousQueueTest extends JSR166TestCase { public static void main(String[] args) { junit.textui.TestRunner.run (suite()); @@ -25,6 +20,9 @@ public class SynchronousQueueTest extend return new TestSuite(SynchronousQueueTest.class); } + /** + * + */ public void testEmptyFull() { SynchronousQueue q = new SynchronousQueue(); assertTrue(q.isEmpty()); @@ -33,20 +31,29 @@ public class SynchronousQueueTest extend assertFalse(q.offer(new Integer(3))); } - public void testOfferNull(){ + /** + * + */ + public void testOfferNull() { try { SynchronousQueue q = new SynchronousQueue(); q.offer(null); - fail("should throw NPE"); + shouldThrow(); } catch (NullPointerException success) { } } - public void testOffer(){ + /** + * + */ + public void testOffer() { SynchronousQueue q = new SynchronousQueue(); assertFalse(q.offer(new Integer(1))); } - public void testAdd(){ + /** + * + */ + public void testAdd() { try { SynchronousQueue q = new SynchronousQueue(); assertEquals(0, q.remainingCapacity()); @@ -55,55 +62,70 @@ public class SynchronousQueueTest extend } } - public void testAddAll1(){ + /** + * + */ + public void testAddAll1() { try { SynchronousQueue q = new SynchronousQueue(); q.addAll(null); - fail("Cannot add null collection"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testAddAll2(){ + /** + * + */ + public void testAddAll2() { try { SynchronousQueue q = new SynchronousQueue(); - Integer[] ints = new Integer[N]; + Integer[] ints = new Integer[1]; q.addAll(Arrays.asList(ints)); - fail("Cannot add null elements"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testAddAll4(){ + /** + * + */ + public void testAddAll4() { try { SynchronousQueue q = new SynchronousQueue(); - Integer[] ints = new Integer[N]; - for (int i = 0; i < N; ++i) + Integer[] ints = new Integer[1]; + for (int i = 0; i < 1; ++i) ints[i] = new Integer(i); q.addAll(Arrays.asList(ints)); - fail("Cannot add with insufficient capacity"); + shouldThrow(); } catch (IllegalStateException success) {} } + /** + * + */ public void testPutNull() { try { SynchronousQueue q = new SynchronousQueue(); q.put(null); - fail("put should throw NPE"); + shouldThrow(); } catch (NullPointerException success){ } catch (InterruptedException ie) { - fail("Unexpected exception"); + unexpectedException(); } } - public void testBlockingPut(){ + /** + * + */ + public void testBlockingPut() { Thread t = new Thread(new Runnable() { public void run() { try { SynchronousQueue q = new SynchronousQueue(); q.put(new Integer(0)); - fail("put should block"); + threadShouldThrow(); } catch (InterruptedException ie){ } }}); @@ -114,14 +136,17 @@ public class SynchronousQueueTest extend t.join(); } catch (InterruptedException ie) { - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testPutWithTake() { final SynchronousQueue q = new SynchronousQueue(); Thread t = new Thread(new Runnable() { - public void run(){ + public void run() { int added = 0; try { q.put(new Object()); @@ -132,7 +157,7 @@ public class SynchronousQueueTest extend ++added; q.put(new Object()); ++added; - fail("Should block"); + threadShouldThrow(); } catch (InterruptedException e){ assertTrue(added >= 1); } @@ -146,41 +171,47 @@ public class SynchronousQueueTest extend t.interrupt(); t.join(); } catch (Exception e){ - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testTimedOffer() { final SynchronousQueue q = new SynchronousQueue(); Thread t = new Thread(new Runnable() { - public void run(){ + public void run() { try { - assertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, TimeUnit.MILLISECONDS)); + threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); q.offer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS); - fail("Should block"); + threadShouldThrow(); } catch (InterruptedException success){} } }); try { t.start(); - Thread.sleep(SHORT_DELAY_MS); + Thread.sleep(SMALL_DELAY_MS); t.interrupt(); t.join(); } catch (Exception e){ - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testTakeFromEmpty() { final SynchronousQueue q = new SynchronousQueue(); Thread t = new Thread(new Runnable() { - public void run(){ + public void run() { try { q.take(); - fail("Should block"); + threadShouldThrow(); } catch (InterruptedException success){ } } }); @@ -190,34 +221,46 @@ public class SynchronousQueueTest extend t.interrupt(); t.join(); } catch (Exception e){ - fail("Unexpected exception"); + unexpectedException(); } } - public void testPoll(){ + /** + * + */ + public void testPoll() { SynchronousQueue q = new SynchronousQueue(); assertNull(q.poll()); } + /** + * + */ public void testTimedPoll0() { try { SynchronousQueue q = new SynchronousQueue(); assertNull(q.poll(0, TimeUnit.MILLISECONDS)); } catch (InterruptedException e){ - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testTimedPoll() { try { SynchronousQueue q = new SynchronousQueue(); assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); } catch (InterruptedException e){ - fail("Unexpected exception"); + unexpectedException(); } } - public void testInterruptedTimedPoll(){ + /** + * + */ + public void testInterruptedTimedPoll() { Thread t = new Thread(new Runnable() { public void run() { try { @@ -233,145 +276,186 @@ public class SynchronousQueueTest extend t.join(); } catch (InterruptedException ie) { - fail("Unexpected exception"); + unexpectedException(); } } - public void testTimedPollWithOffer(){ + /** + * + */ + public void testTimedPollWithOffer() { final SynchronousQueue q = new SynchronousQueue(); Thread t = new Thread(new Runnable() { - public void run(){ + public void run() { try { - assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); + threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS); q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS); - fail("Should block"); + threadShouldThrow(); } catch (InterruptedException success) { } } }); try { t.start(); - Thread.sleep(SHORT_DELAY_MS * 2); + Thread.sleep(SMALL_DELAY_MS); assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); t.interrupt(); t.join(); } catch (Exception e){ - fail("Unexpected exception"); + unexpectedException(); } } - public void testPeek(){ + /** + * + */ + public void testPeek() { SynchronousQueue q = new SynchronousQueue(); assertNull(q.peek()); } - public void testElement(){ + /** + * + */ + public void testElement() { SynchronousQueue q = new SynchronousQueue(); try { q.element(); - fail("no such element"); + shouldThrow(); } catch (NoSuchElementException success) {} } - public void testRemove(){ + /** + * + */ + public void testRemove() { SynchronousQueue q = new SynchronousQueue(); try { q.remove(); - fail("remove should throw"); + shouldThrow(); } catch (NoSuchElementException success){ } } - public void testRemoveElement(){ + /** + * + */ + public void testRemoveElement() { SynchronousQueue q = new SynchronousQueue(); - for (int i = 1; i < N; i+=2) { - assertFalse(q.remove(new Integer(i))); - } + assertFalse(q.remove(new Integer(0))); assertTrue(q.isEmpty()); } - public void testContains(){ - SynchronousQueue q = new SynchronousQueue(); - for (int i = 0; i < N; ++i) { - assertFalse(q.contains(new Integer(i))); - } + /** + * + */ + public void testContains() { + SynchronousQueue q = new SynchronousQueue(); + assertFalse(q.contains(new Integer(0))); } - public void testClear(){ + /** + * + */ + public void testClear() { SynchronousQueue q = new SynchronousQueue(); q.clear(); assertTrue(q.isEmpty()); } - public void testContainsAll(){ + /** + * + */ + public void testContainsAll() { SynchronousQueue q = new SynchronousQueue(); Integer[] empty = new Integer[0]; Integer[] ints = new Integer[1]; ints[0] = new Integer(0); - // assertTrue(q.containsAll(Arrays.asList(empty))); assertFalse(q.containsAll(Arrays.asList(ints))); } - public void testRetainAll(){ + /** + * + */ + public void testRetainAll() { SynchronousQueue q = new SynchronousQueue(); Integer[] empty = new Integer[0]; Integer[] ints = new Integer[1]; ints[0] = new Integer(0); q.retainAll(Arrays.asList(ints)); - // assertTrue(q.containsAll(Arrays.asList(empty))); assertFalse(q.containsAll(Arrays.asList(ints))); } - public void testRemoveAll(){ + /** + * + */ + public void testRemoveAll() { SynchronousQueue q = new SynchronousQueue(); Integer[] empty = new Integer[0]; Integer[] ints = new Integer[1]; ints[0] = new Integer(0); q.removeAll(Arrays.asList(ints)); - // assertTrue(q.containsAll(Arrays.asList(empty))); assertFalse(q.containsAll(Arrays.asList(ints))); } - public void testToArray(){ + /** + * + */ + public void testToArray() { SynchronousQueue q = new SynchronousQueue(); Object[] o = q.toArray(); assertEquals(o.length, 0); } - public void testToArray2(){ + /** + * + */ + public void testToArray2() { SynchronousQueue q = new SynchronousQueue(); Integer[] ints = new Integer[1]; assertNull(ints[0]); } - public void testIterator(){ + /** + * + */ + public void testIterator() { SynchronousQueue q = new SynchronousQueue(); Iterator it = q.iterator(); assertFalse(it.hasNext()); try { Object x = it.next(); - fail("should throw"); + shouldThrow(); } catch (NoSuchElementException success) {} } - public void testIteratorRemove(){ + /** + * + */ + public void testIteratorRemove() { SynchronousQueue q = new SynchronousQueue(); Iterator it = q.iterator(); try { it.remove(); - fail("should throw"); + shouldThrow(); } catch (IllegalStateException success) {} } - public void testToString(){ + /** + * + */ + public void testToString() { SynchronousQueue q = new SynchronousQueue(); String s = q.toString(); assertTrue(s != null); } + /** + * + */ public void testOfferInExecutor() { final SynchronousQueue q = new SynchronousQueue(); ExecutorService executor = Executors.newFixedThreadPool(2); @@ -379,13 +463,13 @@ public class SynchronousQueueTest extend executor.execute(new Runnable() { public void run() { - assertFalse(q.offer(one)); + threadAssertFalse(q.offer(one)); try { - assertTrue(q.offer(one, MEDIUM_DELAY_MS * 2, TimeUnit.MILLISECONDS)); - assertEquals(0, q.remainingCapacity()); + threadAssertTrue(q.offer(one, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS)); + threadAssertEquals(0, q.remainingCapacity()); } catch (InterruptedException e) { - fail("should not be interrupted"); + threadUnexpectedException(); } } }); @@ -393,19 +477,22 @@ public class SynchronousQueueTest extend executor.execute(new Runnable() { public void run() { try { - Thread.sleep(MEDIUM_DELAY_MS); - assertEquals(one, q.take()); + Thread.sleep(SMALL_DELAY_MS); + threadAssertEquals(one, q.take()); } catch (InterruptedException e) { - fail("should not be interrupted"); + threadUnexpectedException(); } } }); - executor.shutdown(); + joinPool(executor); } + /** + * + */ public void testPollInExecutor() { final SynchronousQueue q = new SynchronousQueue(); @@ -414,13 +501,13 @@ public class SynchronousQueueTest extend executor.execute(new Runnable() { public void run() { - assertNull(q.poll()); + threadAssertNull(q.poll()); try { - assertTrue(null != q.poll(MEDIUM_DELAY_MS * 2, TimeUnit.MILLISECONDS)); - assertTrue(q.isEmpty()); + threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS)); + threadAssertTrue(q.isEmpty()); } catch (InterruptedException e) { - fail("should not be interrupted"); + threadUnexpectedException(); } } }); @@ -428,19 +515,22 @@ public class SynchronousQueueTest extend executor.execute(new Runnable() { public void run() { try { - Thread.sleep(MEDIUM_DELAY_MS); + Thread.sleep(SMALL_DELAY_MS); q.put(new Integer(1)); } catch (InterruptedException e) { - fail("should not be interrupted"); + threadUnexpectedException(); } } }); - executor.shutdown(); + joinPool(executor); } + /** + * + */ public void testSerialization() { SynchronousQueue q = new SynchronousQueue(); try { @@ -456,7 +546,7 @@ public class SynchronousQueueTest extend while (!q.isEmpty()) assertEquals(q.remove(), r.remove()); } catch(Exception e){ - fail("unexpected exception"); + unexpectedException(); } }