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.33 by jsr166, Thu Oct 28 17:57:26 2010 UTC vs.
Revision 1.38 by jsr166, Fri Nov 5 00:17:22 2010 UTC

# Line 49 | 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 400 | 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 411 | 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 586 | Line 587 | public class PriorityBlockingQueueTest e
587          Object[] o = q.toArray();
588          Arrays.sort(o);
589          for (int i = 0; i < o.length; i++)
590 <            assertEquals(o[i], q.take());
590 >            assertSame(o[i], q.take());
591      }
592  
593      /**
594       * toArray(a) contains all elements
595       */
596      public void testToArray2() throws InterruptedException {
597 <        PriorityBlockingQueue q = populatedQueue(SIZE);
597 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
598          Integer[] ints = new Integer[SIZE];
599 <        ints = (Integer[])q.toArray(ints);
599 >        Integer[] array = q.toArray(ints);
600 >        assertSame(ints, array);
601          Arrays.sort(ints);
602          for (int i = 0; i < ints.length; i++)
603 <            assertEquals(ints[i], q.take());
603 >            assertSame(ints[i], q.take());
604      }
605  
606      /**
607 <     * toArray(null) throws NPE
607 >     * toArray(null) throws NullPointerException
608       */
609 <    public void testToArray_BadArg() {
609 >    public void testToArray_NullArg() {
610          PriorityBlockingQueue q = populatedQueue(SIZE);
611          try {
612 <            Object o[] = q.toArray(null);
612 >            q.toArray(null);
613              shouldThrow();
614          } catch (NullPointerException success) {}
615      }
616  
617      /**
618 <     * toArray with incompatible array type throws CCE
618 >     * toArray(incompatible array type) throws ArrayStoreException
619       */
620      public void testToArray1_BadArg() {
621          PriorityBlockingQueue q = populatedQueue(SIZE);
622          try {
623 <            Object o[] = q.toArray(new String[10]);
623 >            q.toArray(new String[10]);
624              shouldThrow();
625          } catch (ArrayStoreException success) {}
626      }

Diff Legend

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