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.28 by dl, Wed Sep 29 12:33:48 2010 UTC vs.
Revision 1.37 by jsr166, Fri Nov 5 00:17:22 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());
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 27 | Line 41 | public class LinkedBlockingQueueTest ext
41       * Create a queue of given size containing consecutive
42       * Integers 0 ... n.
43       */
44 <    private LinkedBlockingQueue populatedQueue(int n) {
45 <        LinkedBlockingQueue q = new LinkedBlockingQueue(n);
44 >    private LinkedBlockingQueue<Integer> populatedQueue(int n) {
45 >        LinkedBlockingQueue<Integer> q =
46 >            new LinkedBlockingQueue<Integer>(n);
47          assertTrue(q.isEmpty());
48          for (int i = 0; i < n; i++)
49              assertTrue(q.offer(new Integer(i)));
# Line 367 | Line 382 | public class LinkedBlockingQueueTest ext
382      }
383  
384      /**
370 –     * take blocks interruptibly when empty
371 –     */
372 –    public void testTakeFromEmpty() throws InterruptedException {
373 –        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
374 –        Thread t = new ThreadShouldThrow(InterruptedException.class) {
375 –            public void realRun() throws InterruptedException {
376 –                q.take();
377 –            }};
378 –
379 –        t.start();
380 –        Thread.sleep(SHORT_DELAY_MS);
381 –        t.interrupt();
382 –        t.join();
383 –    }
384 –
385 –    /**
385       * Take removes existing elements until empty, then blocks interruptibly
386       */
387      public void testBlockingTake() throws InterruptedException {
# Line 416 | Line 415 | public class LinkedBlockingQueueTest ext
415      }
416  
417      /**
418 <     * timed pool with zero timeout succeeds when non-empty, else times out
418 >     * timed poll with zero timeout succeeds when non-empty, else times out
419       */
420      public void testTimedPoll0() throws InterruptedException {
421          LinkedBlockingQueue q = populatedQueue(SIZE);
# Line 427 | Line 426 | public class LinkedBlockingQueueTest ext
426      }
427  
428      /**
429 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
429 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
430       */
431      public void testTimedPoll() throws InterruptedException {
432          LinkedBlockingQueue q = populatedQueue(SIZE);
# Line 461 | Line 460 | public class LinkedBlockingQueueTest ext
460      }
461  
462      /**
464 –     *  timed poll before a delayed offer fails; after offer succeeds;
465 –     *  on interruption throws
466 –     */
467 –    public void testTimedPollWithOffer() throws InterruptedException {
468 –        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
469 –        Thread t = new Thread(new CheckedRunnable() {
470 –            public void realRun() throws InterruptedException {
471 –                try {
472 –                    assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
473 –                    assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
474 –                    q.poll(LONG_DELAY_MS, MILLISECONDS);
475 –                    shouldThrow();
476 –                } catch (InterruptedException success) {}
477 –            }});
478 –
479 –        t.start();
480 –        Thread.sleep(SMALL_DELAY_MS);
481 –        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
482 –        t.interrupt();
483 –        t.join();
484 –    }
485 –
486 –    /**
463       * peek returns next element, or null if empty
464       */
465      public void testPeek() {
# Line 632 | Line 608 | public class LinkedBlockingQueueTest ext
608      }
609  
610      /**
611 <     * toArray contains all elements
611 >     * toArray contains all elements in FIFO order
612       */
613 <    public void testToArray() throws InterruptedException {
613 >    public void testToArray() {
614          LinkedBlockingQueue q = populatedQueue(SIZE);
615          Object[] o = q.toArray();
616          for (int i = 0; i < o.length; i++)
617 <            assertEquals(o[i], q.take());
617 >            assertSame(o[i], q.poll());
618      }
619  
620      /**
621 <     * toArray(a) contains all elements
621 >     * toArray(a) contains all elements in FIFO order
622       */
623      public void testToArray2() throws InterruptedException {
624 <        LinkedBlockingQueue q = populatedQueue(SIZE);
624 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
625          Integer[] ints = new Integer[SIZE];
626 <        ints = (Integer[])q.toArray(ints);
626 >        Integer[] array = q.toArray(ints);
627 >        assertSame(ints, array);
628          for (int i = 0; i < ints.length; i++)
629 <            assertEquals(ints[i], q.take());
629 >            assertSame(ints[i], q.poll());
630      }
631  
632      /**
633 <     * toArray(null) throws NPE
633 >     * toArray(null) throws NullPointerException
634       */
635 <    public void testToArray_BadArg() {
635 >    public void testToArray_NullArg() {
636          LinkedBlockingQueue q = populatedQueue(SIZE);
637          try {
638 <            Object o[] = q.toArray(null);
638 >            q.toArray(null);
639              shouldThrow();
640          } catch (NullPointerException success) {}
641      }
642  
643      /**
644 <     * toArray with incompatible array type throws CCE
644 >     * toArray(incompatible array type) throws ArrayStoreException
645       */
646      public void testToArray1_BadArg() {
647          LinkedBlockingQueue q = populatedQueue(SIZE);
648          try {
649 <            Object o[] = q.toArray(new String[10]);
649 >            q.toArray(new String[10]);
650              shouldThrow();
651          } catch (ArrayStoreException success) {}
652      }
# Line 904 | Line 881 | public class LinkedBlockingQueueTest ext
881      }
882  
883      /**
884 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
884 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
885       */
886      public void testDrainToN() {
887          LinkedBlockingQueue q = new LinkedBlockingQueue();
# Line 913 | Line 890 | public class LinkedBlockingQueueTest ext
890                  assertTrue(q.offer(new Integer(j)));
891              ArrayList l = new ArrayList();
892              q.drainTo(l, i);
893 <            int k = (i < SIZE)? i : SIZE;
893 >            int k = (i < SIZE) ? i : SIZE;
894              assertEquals(l.size(), k);
895              assertEquals(q.size(), SIZE-k);
896              for (int j = 0; j < k; ++j)

Diff Legend

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