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.16 by jsr166, Sat Nov 21 02:07:27 2009 UTC vs.
Revision 1.39 by jsr166, Thu Nov 18 20:21:53 2010 UTC

# Line 9 | Line 9
9   import junit.framework.*;
10   import java.util.*;
11   import java.util.concurrent.*;
12 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
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 24 | Line 41 | public class PriorityBlockingQueueTest e
41      /** Sample Comparator */
42      static class MyReverseComparator implements Comparator {
43          public int compare(Object x, Object y) {
44 <            int i = ((Integer)x).intValue();
28 <            int j = ((Integer)y).intValue();
29 <            if (i < j) return 1;
30 <            if (i > j) return -1;
31 <            return 0;
44 >            return ((Comparable)y).compareTo(x);
45          }
46      }
47  
# Line 36 | 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 57 | Line 71 | public class PriorityBlockingQueueTest e
71      }
72  
73      /**
74 <     * Constructor throws IAE if  capacity argument nonpositive
74 >     * Constructor throws IAE if capacity argument nonpositive
75       */
76      public void testConstructor2() {
77          try {
# Line 248 | 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 327 | Line 342 | public class PriorityBlockingQueueTest e
342       */
343      public void testTimedOffer() throws InterruptedException {
344          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
345 <        Thread t = new Thread(new Runnable() {
346 <                public void run() {
347 <                    try {
348 <                        q.put(new Integer(0));
349 <                        q.put(new Integer(0));
350 <                        threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
351 <                        threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
337 <                    } finally { }
338 <                }
339 <            });
345 >        Thread t = new Thread(new CheckedRunnable() {
346 >            public void realRun() {
347 >                q.put(new Integer(0));
348 >                q.put(new Integer(0));
349 >                assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
350 >                assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
351 >            }});
352  
353          t.start();
354          Thread.sleep(SMALL_DELAY_MS);
# Line 350 | Line 362 | public class PriorityBlockingQueueTest e
362      public void testTake() throws InterruptedException {
363          PriorityBlockingQueue q = populatedQueue(SIZE);
364          for (int i = 0; i < SIZE; ++i) {
365 <            assertEquals(i, ((Integer)q.take()).intValue());
365 >            assertEquals(i, q.take());
366          }
367      }
368  
369      /**
358 –     * take blocks interruptibly when empty
359 –     */
360 –    public void testTakeFromEmpty() throws InterruptedException {
361 –        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
362 –        Thread t = new Thread(new CheckedInterruptedRunnable() {
363 –            public void realRun() throws InterruptedException {
364 –                q.take();
365 –            }});
366 –
367 –        t.start();
368 –        Thread.sleep(SHORT_DELAY_MS);
369 –        t.interrupt();
370 –        t.join();
371 –    }
372 –
373 –    /**
370       * Take removes existing elements until empty, then blocks interruptibly
371       */
372      public void testBlockingTake() throws InterruptedException {
373 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
373 >        final PriorityBlockingQueue q = populatedQueue(SIZE);
374 >        Thread t = new Thread(new CheckedRunnable() {
375              public void realRun() throws InterruptedException {
379 –                PriorityBlockingQueue q = populatedQueue(SIZE);
376                  for (int i = 0; i < SIZE; ++i) {
377 <                    threadAssertEquals(i, ((Integer)q.take()).intValue());
377 >                    assertEquals(i, q.take());
378                  }
379 <                q.take();
379 >                try {
380 >                    q.take();
381 >                    shouldThrow();
382 >                } catch (InterruptedException success) {}
383              }});
384  
385          t.start();
# Line 396 | Line 395 | public class PriorityBlockingQueueTest e
395      public void testPoll() {
396          PriorityBlockingQueue q = populatedQueue(SIZE);
397          for (int i = 0; i < SIZE; ++i) {
398 <            assertEquals(i, ((Integer)q.poll()).intValue());
398 >            assertEquals(i, q.poll());
399          }
400          assertNull(q.poll());
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);
408          for (int i = 0; i < SIZE; ++i) {
409 <            assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
409 >            assertEquals(i, q.poll(0, MILLISECONDS));
410          }
411 <        assertNull(q.poll(0, TimeUnit.MILLISECONDS));
411 >        assertNull(q.poll(0, MILLISECONDS));
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);
419          for (int i = 0; i < SIZE; ++i) {
420 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
420 >            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
421          }
422 <        assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
422 >        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
423      }
424  
425      /**
# Line 432 | Line 431 | public class PriorityBlockingQueueTest e
431              public void realRun() throws InterruptedException {
432                  PriorityBlockingQueue q = populatedQueue(SIZE);
433                  for (int i = 0; i < SIZE; ++i) {
434 <                    threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
434 >                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
435                  }
436                  try {
437 <                    q.poll(SMALL_DELAY_MS, TimeUnit.MILLISECONDS);
438 <                    threadShouldThrow();
437 >                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
438 >                    shouldThrow();
439                  } catch (InterruptedException success) {}
440              }});
441  
# Line 447 | Line 446 | public class PriorityBlockingQueueTest e
446      }
447  
448      /**
450 –     *  timed poll before a delayed offer fails; after offer succeeds;
451 –     *  on interruption throws
452 –     */
453 –    public void testTimedPollWithOffer() throws InterruptedException {
454 –        final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
455 –        Thread t = new Thread(new CheckedRunnable() {
456 –            public void realRun() throws InterruptedException {
457 –                threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
458 –                threadAssertEquals(0, q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
459 –                try {
460 –                    q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
461 –                    threadShouldThrow();
462 –                } catch (InterruptedException success) {}
463 –            }});
464 –
465 –        t.start();
466 –        Thread.sleep(SMALL_DELAY_MS);
467 –        assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
468 –        t.interrupt();
469 –        t.join();
470 –    }
471 –
472 –
473 –    /**
449       * peek returns next element, or null if empty
450       */
451      public void testPeek() {
452          PriorityBlockingQueue q = populatedQueue(SIZE);
453          for (int i = 0; i < SIZE; ++i) {
454 <            assertEquals(i, ((Integer)q.peek()).intValue());
455 <            q.poll();
454 >            assertEquals(i, q.peek());
455 >            assertEquals(i, q.poll());
456              assertTrue(q.peek() == null ||
457 <                       i != ((Integer)q.peek()).intValue());
457 >                       !q.peek().equals(i));
458          }
459          assertNull(q.peek());
460      }
# Line 490 | Line 465 | public class PriorityBlockingQueueTest e
465      public void testElement() {
466          PriorityBlockingQueue q = populatedQueue(SIZE);
467          for (int i = 0; i < SIZE; ++i) {
468 <            assertEquals(i, ((Integer)q.element()).intValue());
469 <            q.poll();
468 >            assertEquals(i, q.element());
469 >            assertEquals(i, q.poll());
470          }
471          try {
472              q.element();
# Line 505 | Line 480 | public class PriorityBlockingQueueTest e
480      public void testRemove() {
481          PriorityBlockingQueue q = populatedQueue(SIZE);
482          for (int i = 0; i < SIZE; ++i) {
483 <            assertEquals(i, ((Integer)q.remove()).intValue());
483 >            assertEquals(i, q.remove());
484          }
485          try {
486              q.remove();
# Line 519 | Line 494 | public class PriorityBlockingQueueTest e
494      public void testRemoveElement() {
495          PriorityBlockingQueue q = populatedQueue(SIZE);
496          for (int i = 1; i < SIZE; i+=2) {
497 <            assertTrue(q.remove(new Integer(i)));
497 >            assertTrue(q.contains(i));
498 >            assertTrue(q.remove(i));
499 >            assertFalse(q.contains(i));
500 >            assertTrue(q.contains(i-1));
501          }
502          for (int i = 0; i < SIZE; i+=2) {
503 <            assertTrue(q.remove(new Integer(i)));
504 <            assertFalse(q.remove(new Integer(i+1)));
503 >            assertTrue(q.contains(i));
504 >            assertTrue(q.remove(i));
505 >            assertFalse(q.contains(i));
506 >            assertFalse(q.remove(i+1));
507 >            assertFalse(q.contains(i+1));
508          }
509          assertTrue(q.isEmpty());
510      }
# Line 605 | Line 586 | public class PriorityBlockingQueueTest e
586      }
587  
588      /**
589 <     *  toArray contains all elements
589 >     * toArray contains all elements
590       */
591      public void testToArray() throws InterruptedException {
592          PriorityBlockingQueue q = populatedQueue(SIZE);
593          Object[] o = q.toArray();
594          Arrays.sort(o);
595          for (int i = 0; i < o.length; i++)
596 <            assertEquals(o[i], q.take());
596 >            assertSame(o[i], q.take());
597      }
598  
599      /**
600       * toArray(a) contains all elements
601       */
602      public void testToArray2() throws InterruptedException {
603 <        PriorityBlockingQueue q = populatedQueue(SIZE);
603 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
604          Integer[] ints = new Integer[SIZE];
605 <        ints = (Integer[])q.toArray(ints);
605 >        Integer[] array = q.toArray(ints);
606 >        assertSame(ints, array);
607          Arrays.sort(ints);
608          for (int i = 0; i < ints.length; i++)
609 <            assertEquals(ints[i], q.take());
609 >            assertSame(ints[i], q.take());
610      }
611  
612      /**
613 <     * toArray(null) throws NPE
613 >     * toArray(null) throws NullPointerException
614       */
615 <    public void testToArray_BadArg() {
615 >    public void testToArray_NullArg() {
616 >        PriorityBlockingQueue q = populatedQueue(SIZE);
617          try {
618 <            PriorityBlockingQueue q = populatedQueue(SIZE);
636 <            Object o[] = q.toArray(null);
618 >            q.toArray(null);
619              shouldThrow();
620          } catch (NullPointerException success) {}
621      }
622  
623      /**
624 <     * toArray with incompatible array type throws CCE
624 >     * toArray(incompatible array type) throws ArrayStoreException
625       */
626      public void testToArray1_BadArg() {
627 +        PriorityBlockingQueue q = populatedQueue(SIZE);
628          try {
629 <            PriorityBlockingQueue q = populatedQueue(SIZE);
647 <            Object o[] = q.toArray(new String[10] );
629 >            q.toArray(new String[10]);
630              shouldThrow();
631 <        } catch (ArrayStoreException  success) {}
631 >        } catch (ArrayStoreException success) {}
632      }
633  
634      /**
# Line 666 | Line 648 | public class PriorityBlockingQueueTest e
648      /**
649       * iterator.remove removes current element
650       */
651 <    public void testIteratorRemove () {
651 >    public void testIteratorRemove() {
652          final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
653          q.add(new Integer(2));
654          q.add(new Integer(1));
# Line 702 | Line 684 | public class PriorityBlockingQueueTest e
684          ExecutorService executor = Executors.newFixedThreadPool(2);
685          executor.execute(new CheckedRunnable() {
686              public void realRun() throws InterruptedException {
687 <                threadAssertNull(q.poll());
688 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
689 <                threadAssertTrue(q.isEmpty());
687 >                assertNull(q.poll());
688 >                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
689 >                assertTrue(q.isEmpty());
690              }});
691  
692          executor.execute(new CheckedRunnable() {
693              public void realRun() throws InterruptedException {
694                  Thread.sleep(SMALL_DELAY_MS);
695 <                q.put(new Integer(1));
695 >                q.put(one);
696              }});
697  
698          joinPool(executor);
# Line 823 | Line 805 | public class PriorityBlockingQueueTest e
805      }
806  
807      /**
808 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
808 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
809       */
810      public void testDrainToN() {
811          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
# Line 832 | Line 814 | public class PriorityBlockingQueueTest e
814                  assertTrue(q.offer(new Integer(j)));
815              ArrayList l = new ArrayList();
816              q.drainTo(l, i);
817 <            int k = (i < SIZE)? i : SIZE;
817 >            int k = (i < SIZE) ? i : SIZE;
818              assertEquals(l.size(), k);
819              assertEquals(q.size(), SIZE-k);
820              for (int j = 0; j < k; ++j)

Diff Legend

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