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.24 by jsr166, Sun Nov 22 18:57:17 2009 UTC vs.
Revision 1.43 by dl, Fri May 6 11:22:07 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
# 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());
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 33 | Line 49 | public class PriorityBlockingQueueTest e
49       * Create a queue of given size containing consecutive
50       * Integers 0 ... n.
51       */
52 <    private PriorityBlockingQueue populatedQueue(int n) {
53 <        PriorityBlockingQueue q = new PriorityBlockingQueue(n);
52 >    private PriorityBlockingQueue<Integer> populatedQueue(int n) {
53 >        PriorityBlockingQueue<Integer> q =
54 >            new PriorityBlockingQueue<Integer>(n);
55          assertTrue(q.isEmpty());
56          for (int i = n-1; i >= 0; i-=2)
57              assertTrue(q.offer(new Integer(i)));
# Line 245 | Line 262 | public class PriorityBlockingQueueTest e
262              shouldThrow();
263          } catch (NullPointerException success) {}
264      }
265 +
266      /**
267       * addAll of a collection with any null elements throws NPE after
268       * possibly adding some elements
# Line 278 | Line 296 | public class PriorityBlockingQueueTest e
296      /**
297       * put(null) throws NPE
298       */
299 <     public void testPutNull() {
299 >    public void testPutNull() {
300          try {
301              PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
302              q.put(null);
303              shouldThrow();
304          } catch (NullPointerException success) {}
305 <     }
305 >    }
306  
307      /**
308       * all elements successfully put are contained
309       */
310 <     public void testPut() {
311 <         PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
312 <         for (int i = 0; i < SIZE; ++i) {
313 <             Integer I = new Integer(i);
314 <             q.put(I);
315 <             assertTrue(q.contains(I));
316 <         }
317 <         assertEquals(SIZE, q.size());
310 >    public void testPut() {
311 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
312 >        for (int i = 0; i < SIZE; ++i) {
313 >            Integer I = new Integer(i);
314 >            q.put(I);
315 >            assertTrue(q.contains(I));
316 >        }
317 >        assertEquals(SIZE, q.size());
318      }
319  
320      /**
# Line 312 | Line 330 | public class PriorityBlockingQueueTest e
330              }});
331  
332          t.start();
333 <        Thread.sleep(SHORT_DELAY_MS);
333 >        delay(SHORT_DELAY_MS);
334          assertEquals(q.size(), size);
335          q.take();
336          t.interrupt();
# Line 333 | Line 351 | public class PriorityBlockingQueueTest e
351              }});
352  
353          t.start();
354 <        Thread.sleep(SMALL_DELAY_MS);
354 >        delay(SMALL_DELAY_MS);
355          t.interrupt();
356          t.join();
357      }
# Line 349 | Line 367 | public class PriorityBlockingQueueTest e
367      }
368  
369      /**
352     * take blocks interruptibly when empty
353     */
354    public void testTakeFromEmpty() throws InterruptedException {
355        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
356        Thread t = new Thread(new CheckedInterruptedRunnable() {
357            public void realRun() throws InterruptedException {
358                q.take();
359            }});
360
361        t.start();
362        Thread.sleep(SHORT_DELAY_MS);
363        t.interrupt();
364        t.join();
365    }
366
367    /**
370       * Take removes existing elements until empty, then blocks interruptibly
371       */
372      public void testBlockingTake() throws InterruptedException {
# Line 381 | Line 383 | public class PriorityBlockingQueueTest e
383              }});
384  
385          t.start();
386 <        Thread.sleep(SHORT_DELAY_MS);
386 >        delay(SHORT_DELAY_MS);
387          t.interrupt();
388          t.join();
389      }
# Line 399 | Line 401 | public class PriorityBlockingQueueTest e
401      }
402  
403      /**
404 <     * timed pool with zero timeout succeeds when non-empty, else times out
404 >     * timed poll with zero timeout succeeds when non-empty, else times out
405       */
406      public void testTimedPoll0() throws InterruptedException {
407          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 410 | Line 412 | public class PriorityBlockingQueueTest e
412      }
413  
414      /**
415 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
415 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
416       */
417      public void testTimedPoll() throws InterruptedException {
418          PriorityBlockingQueue q = populatedQueue(SIZE);
# Line 425 | Line 427 | public class PriorityBlockingQueueTest e
427       * returning timeout status
428       */
429      public void testInterruptedTimedPoll() throws InterruptedException {
430 <        Thread t = new Thread(new CheckedRunnable() {
430 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
431 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
432 >        Thread t = newStartedThread(new CheckedRunnable() {
433              public void realRun() throws InterruptedException {
430                PriorityBlockingQueue q = populatedQueue(SIZE);
434                  for (int i = 0; i < SIZE; ++i) {
435 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
435 >                    long t0 = System.nanoTime();
436 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
437 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
438                  }
439 +                long t0 = System.nanoTime();
440 +                aboutToWait.countDown();
441                  try {
442 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
442 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
443                      shouldThrow();
444 <                } catch (InterruptedException success) {}
445 <            }});
446 <
440 <        t.start();
441 <        Thread.sleep(SHORT_DELAY_MS);
442 <        t.interrupt();
443 <        t.join();
444 <    }
445 <
446 <    /**
447 <     *  timed poll before a delayed offer fails; after offer succeeds;
448 <     *  on interruption throws
449 <     */
450 <    public void testTimedPollWithOffer() throws InterruptedException {
451 <        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
452 <        Thread t = new Thread(new CheckedRunnable() {
453 <            public void realRun() throws InterruptedException {
454 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
455 <                assertSame(zero, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
456 <                try {
457 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
458 <                    shouldThrow();
459 <                } catch (InterruptedException success) {}
444 >                } catch (InterruptedException success) {
445 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
446 >                }
447              }});
448  
449 <        t.start();
450 <        Thread.sleep(SMALL_DELAY_MS);
464 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
449 >        aboutToWait.await();
450 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
451          t.interrupt();
452 <        t.join();
452 >        awaitTermination(t, MEDIUM_DELAY_MS);
453      }
454  
469
455      /**
456       * peek returns next element, or null if empty
457       */
# Line 516 | Line 501 | public class PriorityBlockingQueueTest e
501      public void testRemoveElement() {
502          PriorityBlockingQueue q = populatedQueue(SIZE);
503          for (int i = 1; i < SIZE; i+=2) {
504 <            assertTrue(q.remove(new Integer(i)));
504 >            assertTrue(q.contains(i));
505 >            assertTrue(q.remove(i));
506 >            assertFalse(q.contains(i));
507 >            assertTrue(q.contains(i-1));
508          }
509          for (int i = 0; i < SIZE; i+=2) {
510 <            assertTrue(q.remove(new Integer(i)));
511 <            assertFalse(q.remove(new Integer(i+1)));
510 >            assertTrue(q.contains(i));
511 >            assertTrue(q.remove(i));
512 >            assertFalse(q.contains(i));
513 >            assertFalse(q.remove(i+1));
514 >            assertFalse(q.contains(i+1));
515          }
516          assertTrue(q.isEmpty());
517      }
# Line 602 | Line 593 | public class PriorityBlockingQueueTest e
593      }
594  
595      /**
596 <     *  toArray contains all elements
596 >     * toArray contains all elements
597       */
598      public void testToArray() throws InterruptedException {
599          PriorityBlockingQueue q = populatedQueue(SIZE);
600          Object[] o = q.toArray();
601          Arrays.sort(o);
602          for (int i = 0; i < o.length; i++)
603 <            assertEquals(o[i], q.take());
603 >            assertSame(o[i], q.take());
604      }
605  
606      /**
607       * toArray(a) contains all elements
608       */
609      public void testToArray2() throws InterruptedException {
610 <        PriorityBlockingQueue q = populatedQueue(SIZE);
610 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
611          Integer[] ints = new Integer[SIZE];
612 <        ints = (Integer[])q.toArray(ints);
612 >        Integer[] array = q.toArray(ints);
613 >        assertSame(ints, array);
614          Arrays.sort(ints);
615          for (int i = 0; i < ints.length; i++)
616 <            assertEquals(ints[i], q.take());
616 >            assertSame(ints[i], q.take());
617      }
618  
619      /**
620 <     * toArray(null) throws NPE
620 >     * toArray(null) throws NullPointerException
621       */
622 <    public void testToArray_BadArg() {
622 >    public void testToArray_NullArg() {
623          PriorityBlockingQueue q = populatedQueue(SIZE);
624          try {
625 <            Object o[] = q.toArray(null);
625 >            q.toArray(null);
626              shouldThrow();
627          } catch (NullPointerException success) {}
628      }
629  
630      /**
631 <     * toArray with incompatible array type throws CCE
631 >     * toArray(incompatible array type) throws ArrayStoreException
632       */
633      public void testToArray1_BadArg() {
634          PriorityBlockingQueue q = populatedQueue(SIZE);
635          try {
636 <            Object o[] = q.toArray(new String[10]);
636 >            q.toArray(new String[10]);
637              shouldThrow();
638          } catch (ArrayStoreException success) {}
639      }
# Line 663 | Line 655 | public class PriorityBlockingQueueTest e
655      /**
656       * iterator.remove removes current element
657       */
658 <    public void testIteratorRemove () {
658 >    public void testIteratorRemove() {
659          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
660          q.add(new Integer(2));
661          q.add(new Integer(1));
# Line 699 | Line 691 | public class PriorityBlockingQueueTest e
691          ExecutorService executor = Executors.newFixedThreadPool(2);
692          executor.execute(new CheckedRunnable() {
693              public void realRun() throws InterruptedException {
694 <                threadAssertNull(q.poll());
695 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
696 <                threadAssertTrue(q.isEmpty());
694 >                assertNull(q.poll());
695 >                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
696 >                assertTrue(q.isEmpty());
697              }});
698  
699          executor.execute(new CheckedRunnable() {
700              public void realRun() throws InterruptedException {
701 <                Thread.sleep(SMALL_DELAY_MS);
702 <                q.put(new Integer(1));
701 >                delay(SMALL_DELAY_MS);
702 >                q.put(one);
703              }});
704  
705          joinPool(executor);
# Line 820 | Line 812 | public class PriorityBlockingQueueTest e
812      }
813  
814      /**
815 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
815 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
816       */
817      public void testDrainToN() {
818          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
# Line 829 | Line 821 | public class PriorityBlockingQueueTest e
821                  assertTrue(q.offer(new Integer(j)));
822              ArrayList l = new ArrayList();
823              q.drainTo(l, i);
824 <            int k = (i < SIZE)? i : SIZE;
824 >            int k = (i < SIZE) ? i : SIZE;
825              assertEquals(l.size(), k);
826              assertEquals(q.size(), SIZE-k);
827              for (int j = 0; j < k; ++j)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines