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

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.28 by dl, Wed Sep 29 12:33:48 2010 UTC vs.
Revision 1.32 by jsr166, Tue Oct 19 00:43:49 2010 UTC

# Line 13 | Line 13 | import static java.util.concurrent.TimeU
13   import java.io.*;
14  
15   public class PriorityBlockingQueueTest extends JSR166TestCase {
16 +
17 +    public static class Generic extends BlockingQueueTest {
18 +        protected BlockingQueue emptyCollection() {
19 +            return new PriorityBlockingQueue();
20 +        }
21 +    }
22 +
23 +    public static class InitialCapacity extends BlockingQueueTest {
24 +        protected BlockingQueue emptyCollection() {
25 +            return new PriorityBlockingQueue(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(PriorityBlockingQueueTest.class);
34 >        return newTestSuite(PriorityBlockingQueueTest.class,
35 >                            new Generic().testSuite(),
36 >                            new InitialCapacity().testSuite());
37      }
38  
39      private static final int NOCAP = Integer.MAX_VALUE;
# Line 445 | Line 461 | public class PriorityBlockingQueueTest e
461      }
462  
463      /**
448 –     *  timed poll before a delayed offer fails; after offer succeeds;
449 –     *  on interruption throws
450 –     */
451 –    public void testTimedPollWithOffer() throws InterruptedException {
452 –        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
453 –        Thread t = new Thread(new CheckedRunnable() {
454 –            public void realRun() throws InterruptedException {
455 –                try {
456 –                    assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
457 –                    assertSame(zero, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
458 –                    q.poll(LONG_DELAY_MS, MILLISECONDS);
459 –                    shouldThrow();
460 –                } catch (InterruptedException success) {}
461 –            }});
462 –
463 –        t.start();
464 –        Thread.sleep(SMALL_DELAY_MS);
465 –        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
466 –        t.interrupt();
467 –        t.join();
468 –    }
469 –
470 –
471 –    /**
464       * peek returns next element, or null if empty
465       */
466      public void testPeek() {
# Line 603 | Line 595 | public class PriorityBlockingQueueTest e
595      }
596  
597      /**
598 <     *  toArray contains all elements
598 >     * toArray contains all elements
599       */
600      public void testToArray() throws InterruptedException {
601          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 821 | Line 813 | public class PriorityBlockingQueueTest e
813      }
814  
815      /**
816 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
816 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
817       */
818      public void testDrainToN() {
819          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
# Line 830 | Line 822 | public class PriorityBlockingQueueTest e
822                  assertTrue(q.offer(new Integer(j)));
823              ArrayList l = new ArrayList();
824              q.drainTo(l, i);
825 <            int k = (i < SIZE)? i : SIZE;
825 >            int k = (i < SIZE) ? i : SIZE;
826              assertEquals(l.size(), k);
827              assertEquals(q.size(), SIZE-k);
828              for (int j = 0; j < k; ++j)

Diff Legend

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