ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/LinkedBlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.25 by jsr166, Tue Dec 1 09:56:28 2009 UTC vs.
Revision 1.35 by jsr166, Wed Nov 3 16:46:34 2010 UTC

# Line 14 | Line 14 | import java.io.*;
14  
15   public class LinkedBlockingQueueTest extends JSR166TestCase {
16  
17 +    public static class Unbounded extends BlockingQueueTest {
18 +        protected BlockingQueue emptyCollection() {
19 +            return new LinkedBlockingQueue();
20 +        }
21 +    }
22 +
23 +    public static class Bounded extends BlockingQueueTest {
24 +        protected BlockingQueue emptyCollection() {
25 +            return new LinkedBlockingQueue(20);
26 +        }
27 +    }
28 +
29      public static void main(String[] args) {
30 <        junit.textui.TestRunner.run (suite());
30 >        junit.textui.TestRunner.run(suite());
31      }
32  
33      public static Test suite() {
34 <        return new TestSuite(LinkedBlockingQueueTest.class);
34 >        return newTestSuite(LinkedBlockingQueueTest.class,
35 >                            new Unbounded().testSuite(),
36 >                            new Bounded().testSuite());
37      }
38  
39  
# Line 214 | Line 228 | public class LinkedBlockingQueueTest ext
228              shouldThrow();
229          } catch (NullPointerException success) {}
230      }
231 +
232      /**
233       * addAll of a collection with any null elements throws NPE after
234       * possibly adding some elements
# Line 228 | Line 243 | public class LinkedBlockingQueueTest ext
243              shouldThrow();
244          } catch (NullPointerException success) {}
245      }
246 +
247      /**
248       * addAll throws ISE if not enough room
249       */
# Line 241 | Line 257 | public class LinkedBlockingQueueTest ext
257              shouldThrow();
258          } catch (IllegalStateException success) {}
259      }
260 +
261      /**
262       * Queue contains all elements, in traversal order, of successful addAll
263       */
# Line 364 | Line 381 | public class LinkedBlockingQueueTest ext
381      }
382  
383      /**
367 –     * take blocks interruptibly when empty
368 –     */
369 –    public void testTakeFromEmpty() throws InterruptedException {
370 –        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
371 –        Thread t = new ThreadShouldThrow(InterruptedException.class) {
372 –            public void realRun() throws InterruptedException {
373 –                q.take();
374 –            }};
375 –
376 –        t.start();
377 –        Thread.sleep(SHORT_DELAY_MS);
378 –        t.interrupt();
379 –        t.join();
380 –    }
381 –
382 –    /**
384       * Take removes existing elements until empty, then blocks interruptibly
385       */
386      public void testBlockingTake() throws InterruptedException {
# Line 413 | Line 414 | public class LinkedBlockingQueueTest ext
414      }
415  
416      /**
417 <     * timed pool with zero timeout succeeds when non-empty, else times out
417 >     * timed poll with zero timeout succeeds when non-empty, else times out
418       */
419      public void testTimedPoll0() throws InterruptedException {
420          LinkedBlockingQueue q = populatedQueue(SIZE);
# Line 424 | Line 425 | public class LinkedBlockingQueueTest ext
425      }
426  
427      /**
428 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
428 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
429       */
430      public void testTimedPoll() throws InterruptedException {
431          LinkedBlockingQueue q = populatedQueue(SIZE);
# Line 458 | Line 459 | public class LinkedBlockingQueueTest ext
459      }
460  
461      /**
461 –     *  timed poll before a delayed offer fails; after offer succeeds;
462 –     *  on interruption throws
463 –     */
464 –    public void testTimedPollWithOffer() throws InterruptedException {
465 –        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
466 –        Thread t = new Thread(new CheckedRunnable() {
467 –            public void realRun() throws InterruptedException {
468 –                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
469 –                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
470 –                try {
471 –                    q.poll(LONG_DELAY_MS, MILLISECONDS);
472 –                    shouldThrow();
473 –                } catch (InterruptedException success) {}
474 –            }});
475 –
476 –        t.start();
477 –        Thread.sleep(SMALL_DELAY_MS);
478 –        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
479 –        t.interrupt();
480 –        t.join();
481 –    }
482 –
483 –    /**
462       * peek returns next element, or null if empty
463       */
464      public void testPeek() {
# Line 650 | Line 628 | public class LinkedBlockingQueueTest ext
628      }
629  
630      /**
631 <     * toArray(null) throws NPE
631 >     * toArray(null) throws NullPointerException
632       */
633 <    public void testToArray_BadArg() {
633 >    public void testToArray_NullArg() {
634          LinkedBlockingQueue q = populatedQueue(SIZE);
635          try {
636 <            Object o[] = q.toArray(null);
636 >            q.toArray(null);
637              shouldThrow();
638          } catch (NullPointerException success) {}
639      }
640  
641      /**
642 <     * toArray with incompatible array type throws CCE
642 >     * toArray(incompatible array type) throws ArrayStoreException
643       */
644      public void testToArray1_BadArg() {
645          LinkedBlockingQueue q = populatedQueue(SIZE);
646          try {
647 <            Object o[] = q.toArray(new String[10]);
647 >            q.toArray(new String[10]);
648              shouldThrow();
649          } catch (ArrayStoreException success) {}
650      }
# Line 686 | Line 664 | public class LinkedBlockingQueueTest ext
664      /**
665       * iterator.remove removes current element
666       */
667 <    public void testIteratorRemove () {
667 >    public void testIteratorRemove() {
668          final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
669          q.add(two);
670          q.add(one);
# Line 722 | Line 700 | public class LinkedBlockingQueueTest ext
700      /**
701       * Modifications do not cause iterators to fail
702       */
703 <    public void testWeaklyConsistentIteration () {
703 >    public void testWeaklyConsistentIteration() {
704          final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
705          q.add(one);
706          q.add(two);
# Line 901 | Line 879 | public class LinkedBlockingQueueTest ext
879      }
880  
881      /**
882 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
882 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
883       */
884      public void testDrainToN() {
885          LinkedBlockingQueue q = new LinkedBlockingQueue();
# Line 910 | Line 888 | public class LinkedBlockingQueueTest ext
888                  assertTrue(q.offer(new Integer(j)));
889              ArrayList l = new ArrayList();
890              q.drainTo(l, i);
891 <            int k = (i < SIZE)? i : SIZE;
891 >            int k = (i < SIZE) ? i : SIZE;
892              assertEquals(l.size(), k);
893              assertEquals(q.size(), SIZE-k);
894              for (int j = 0; j < k; ++j)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines