--- jsr166/src/test/tck/SynchronousQueueTest.java 2003/09/20 18:20:08 1.4 +++ jsr166/src/test/tck/SynchronousQueueTest.java 2003/10/05 23:00:40 1.6 @@ -21,18 +21,18 @@ public class SynchronousQueueTest extend } /** - * + * A SynchronousQueue is both empty and full */ public void testEmptyFull() { SynchronousQueue q = new SynchronousQueue(); assertTrue(q.isEmpty()); assertEquals(0, q.size()); assertEquals(0, q.remainingCapacity()); - assertFalse(q.offer(new Integer(3))); + assertFalse(q.offer(zero)); } /** - * + * offer(null) throws NPE */ public void testOfferNull() { try { @@ -43,27 +43,39 @@ public class SynchronousQueueTest extend } /** - * + * add(null) throws NPE + */ + public void testAddNull() { + try { + SynchronousQueue q = new SynchronousQueue(); + q.add(null); + shouldThrow(); + } catch (NullPointerException success) { } + } + + /** + * offer fails if no active taker */ public void testOffer() { SynchronousQueue q = new SynchronousQueue(); - assertFalse(q.offer(new Integer(1))); + assertFalse(q.offer(one)); } /** - * + * add throws ISE if no active taker */ public void testAdd() { try { SynchronousQueue q = new SynchronousQueue(); assertEquals(0, q.remainingCapacity()); - q.add(new Integer(0)); + q.add(one); + shouldThrow(); } catch (IllegalStateException success){ } } /** - * + * addAll(null) throws NPE */ public void testAddAll1() { try { @@ -73,8 +85,21 @@ public class SynchronousQueueTest extend } catch (NullPointerException success) {} } + /** - * + * addAll(this) throws IAE + */ + public void testAddAllSelf() { + try { + SynchronousQueue q = new SynchronousQueue(); + q.addAll(q); + shouldThrow(); + } + catch (IllegalArgumentException success) {} + } + + /** + * addAll of a collection with null elements throws NPE */ public void testAddAll2() { try { @@ -86,7 +111,7 @@ public class SynchronousQueueTest extend catch (NullPointerException success) {} } /** - * + * addAll throws ISE if no active taker */ public void testAddAll4() { try { @@ -101,7 +126,7 @@ public class SynchronousQueueTest extend } /** - * + * put(null) throws NPE */ public void testPutNull() { try { @@ -117,14 +142,14 @@ public class SynchronousQueueTest extend } /** - * + * put blocks interruptibly if no active taker */ public void testBlockingPut() { Thread t = new Thread(new Runnable() { public void run() { try { SynchronousQueue q = new SynchronousQueue(); - q.put(new Integer(0)); + q.put(zero); threadShouldThrow(); } catch (InterruptedException ie){ } @@ -141,7 +166,7 @@ public class SynchronousQueueTest extend } /** - * + * put blocks waiting for take */ public void testPutWithTake() { final SynchronousQueue q = new SynchronousQueue(); @@ -176,7 +201,7 @@ public class SynchronousQueueTest extend } /** - * + * timed offer times out if elements not taken */ public void testTimedOffer() { final SynchronousQueue q = new SynchronousQueue(); @@ -203,7 +228,7 @@ public class SynchronousQueueTest extend /** - * + * take blocks interruptibly when empty */ public void testTakeFromEmpty() { final SynchronousQueue q = new SynchronousQueue(); @@ -226,7 +251,7 @@ public class SynchronousQueueTest extend } /** - * + * poll fails unless active taker */ public void testPoll() { SynchronousQueue q = new SynchronousQueue(); @@ -234,7 +259,7 @@ public class SynchronousQueueTest extend } /** - * + * timed pool with zero timeout times out if no active taker */ public void testTimedPoll0() { try { @@ -246,7 +271,7 @@ public class SynchronousQueueTest extend } /** - * + * timed pool with nonzero timeout times out if no active taker */ public void testTimedPoll() { try { @@ -258,7 +283,8 @@ public class SynchronousQueueTest extend } /** - * + * Interrupted timed poll throws InterruptedException instead of + * returning timeout status */ public void testInterruptedTimedPoll() { Thread t = new Thread(new Runnable() { @@ -281,7 +307,8 @@ public class SynchronousQueueTest extend } /** - * + * timed poll before a delayed offer fails; after offer succeeds; + * on interruption throws */ public void testTimedPollWithOffer() { final SynchronousQueue q = new SynchronousQueue(); @@ -298,7 +325,7 @@ public class SynchronousQueueTest extend try { t.start(); Thread.sleep(SMALL_DELAY_MS); - assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); + assertTrue(q.offer(zero, SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); t.interrupt(); t.join(); } catch (Exception e){ @@ -308,7 +335,7 @@ public class SynchronousQueueTest extend /** - * + * peek returns null */ public void testPeek() { SynchronousQueue q = new SynchronousQueue(); @@ -316,7 +343,7 @@ public class SynchronousQueueTest extend } /** - * + * element throws NSEE */ public void testElement() { SynchronousQueue q = new SynchronousQueue(); @@ -328,7 +355,7 @@ public class SynchronousQueueTest extend } /** - * + * remove throws NSEE if no active taker */ public void testRemove() { SynchronousQueue q = new SynchronousQueue(); @@ -340,24 +367,24 @@ public class SynchronousQueueTest extend } /** - * + * remove(x) returns false */ public void testRemoveElement() { SynchronousQueue q = new SynchronousQueue(); - assertFalse(q.remove(new Integer(0))); + assertFalse(q.remove(zero)); assertTrue(q.isEmpty()); } /** - * + * contains returns false */ public void testContains() { SynchronousQueue q = new SynchronousQueue(); - assertFalse(q.contains(new Integer(0))); + assertFalse(q.contains(zero)); } /** - * + * clear ensures isEmpty */ public void testClear() { SynchronousQueue q = new SynchronousQueue(); @@ -366,40 +393,41 @@ public class SynchronousQueueTest extend } /** - * + * containsAll returns false unless empty */ 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))); + Integer[] ints = new Integer[1]; ints[0] = zero; assertFalse(q.containsAll(Arrays.asList(ints))); } /** - * + * retainAll returns false */ 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)); - assertFalse(q.containsAll(Arrays.asList(ints))); + assertFalse(q.retainAll(Arrays.asList(empty))); + Integer[] ints = new Integer[1]; ints[0] = zero; + assertFalse(q.retainAll(Arrays.asList(ints))); } /** - * + * removeAll returns false */ 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)); + assertFalse(q.removeAll(Arrays.asList(empty))); + Integer[] ints = new Integer[1]; ints[0] = zero; assertFalse(q.containsAll(Arrays.asList(ints))); } /** - * + * toArray is empty */ public void testToArray() { SynchronousQueue q = new SynchronousQueue(); @@ -408,7 +436,7 @@ public class SynchronousQueueTest extend } /** - * + * toArray(a) is nulled at position 0 */ public void testToArray2() { SynchronousQueue q = new SynchronousQueue(); @@ -417,7 +445,19 @@ 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){} + } + + + /** + * iterator does not traverse any elements */ public void testIterator() { SynchronousQueue q = new SynchronousQueue(); @@ -431,7 +471,7 @@ public class SynchronousQueueTest extend } /** - * + * iterator remove throws ISE */ public void testIteratorRemove() { SynchronousQueue q = new SynchronousQueue(); @@ -444,17 +484,17 @@ public class SynchronousQueueTest extend } /** - * + * toString returns a non-null string */ public void testToString() { SynchronousQueue q = new SynchronousQueue(); String s = q.toString(); - assertTrue(s != null); + assertNotNull(s); } /** - * + * offer transfers elements across Executor tasks */ public void testOfferInExecutor() { final SynchronousQueue q = new SynchronousQueue(); @@ -491,14 +531,11 @@ public class SynchronousQueueTest extend } /** - * + * poll retrieves elements across Executor threads */ public void testPollInExecutor() { - final SynchronousQueue q = new SynchronousQueue(); - ExecutorService executor = Executors.newFixedThreadPool(2); - executor.execute(new Runnable() { public void run() { threadAssertNull(q.poll()); @@ -525,11 +562,10 @@ public class SynchronousQueueTest extend }); joinPool(executor); - } /** - * + * a deserialized serialized queue is usable */ public void testSerialization() { SynchronousQueue q = new SynchronousQueue(); @@ -550,4 +586,135 @@ public class SynchronousQueueTest extend } } + /** + * drainTo(null) throws NPE + */ + public void testDrainToNull() { + SynchronousQueue q = new SynchronousQueue(); + try { + q.drainTo(null); + shouldThrow(); + } catch(NullPointerException success) { + } + } + + /** + * drainTo(this) throws IAE + */ + public void testDrainToSelf() { + SynchronousQueue q = new SynchronousQueue(); + try { + q.drainTo(q); + shouldThrow(); + } catch(IllegalArgumentException success) { + } + } + + /** + * drainTo(c) of empty queue doesn't transfer elements + */ + public void testDrainTo() { + SynchronousQueue q = new SynchronousQueue(); + ArrayList l = new ArrayList(); + q.drainTo(l); + assertEquals(q.size(), 0); + assertEquals(l.size(), 0); + } + + /** + * drainTo empties queue, unblocking a waiting put. + */ + public void testDrainToWithActivePut() { + final SynchronousQueue q = new SynchronousQueue(); + Thread t = new Thread(new Runnable() { + public void run() { + try { + q.put(new Integer(1)); + } catch (InterruptedException ie){ + threadUnexpectedException(); + } + } + }); + try { + t.start(); + ArrayList l = new ArrayList(); + Thread.sleep(SHORT_DELAY_MS); + q.drainTo(l); + assertTrue(l.size() <= 1); + if (l.size() > 0) + assertEquals(l.get(0), new Integer(1)); + t.join(); + assertTrue(l.size() <= 1); + } catch(Exception e){ + unexpectedException(); + } + } + + /** + * drainTo(null, n) throws NPE + */ + public void testDrainToNullN() { + SynchronousQueue q = new SynchronousQueue(); + try { + q.drainTo(null, 0); + shouldThrow(); + } catch(NullPointerException success) { + } + } + + /** + * drainTo(this, n) throws IAE + */ + public void testDrainToSelfN() { + SynchronousQueue q = new SynchronousQueue(); + try { + q.drainTo(q, 0); + shouldThrow(); + } catch(IllegalArgumentException success) { + } + } + + /** + * drainTo(c, n) empties up to n elements of queue into c + */ + public void testDrainToN() { + final SynchronousQueue q = new SynchronousQueue(); + Thread t1 = new Thread(new Runnable() { + public void run() { + try { + q.put(one); + } catch (InterruptedException ie){ + threadUnexpectedException(); + } + } + }); + Thread t2 = new Thread(new Runnable() { + public void run() { + try { + q.put(two); + } catch (InterruptedException ie){ + threadUnexpectedException(); + } + } + }); + + try { + t1.start(); + t2.start(); + ArrayList l = new ArrayList(); + Thread.sleep(SHORT_DELAY_MS); + q.drainTo(l, 1); + assertTrue(l.size() == 1); + q.drainTo(l, 1); + assertTrue(l.size() == 2); + assertTrue(l.contains(one)); + assertTrue(l.contains(two)); + t1.join(); + t2.join(); + } catch(Exception e){ + unexpectedException(); + } + } + + }