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

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.40 by jsr166, Thu Oct 28 17:57:26 2010 UTC vs.
Revision 1.45 by jsr166, Fri Nov 5 00:17:22 2010 UTC

# Line 109 | Line 109 | public class DelayQueueTest extends JSR1
109       * Create a queue of given size containing consecutive
110       * PDelays 0 ... n.
111       */
112 <    private DelayQueue populatedQueue(int n) {
113 <        DelayQueue q = new DelayQueue();
112 >    private DelayQueue<PDelay> populatedQueue(int n) {
113 >        DelayQueue<PDelay> q = new DelayQueue<PDelay>();
114          assertTrue(q.isEmpty());
115          for (int i = n-1; i >= 0; i-=2)
116              assertTrue(q.offer(new PDelay(i)));
# Line 448 | Line 448 | public class DelayQueueTest extends JSR1
448      }
449  
450      /**
451 <     * timed pool with zero timeout succeeds when non-empty, else times out
451 >     * timed poll with zero timeout succeeds when non-empty, else times out
452       */
453      public void testTimedPoll0() throws InterruptedException {
454          DelayQueue q = populatedQueue(SIZE);
# Line 459 | Line 459 | public class DelayQueueTest extends JSR1
459      }
460  
461      /**
462 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
462 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
463       */
464      public void testTimedPoll() throws InterruptedException {
465          DelayQueue q = populatedQueue(SIZE);
# Line 676 | Line 676 | public class DelayQueueTest extends JSR1
676          Object[] o = q.toArray();
677          Arrays.sort(o);
678          for (int i = 0; i < o.length; i++)
679 <            assertEquals(o[i], q.take());
679 >            assertSame(o[i], q.take());
680      }
681  
682      /**
683       * toArray(a) contains all elements
684       */
685 <    public void testToArray2() throws InterruptedException {
686 <        DelayQueue q = populatedQueue(SIZE);
685 >    public void testToArray2() {
686 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
687          PDelay[] ints = new PDelay[SIZE];
688 <        ints = (PDelay[])q.toArray(ints);
688 >        PDelay[] array = q.toArray(ints);
689 >        assertSame(ints, array);
690          Arrays.sort(ints);
691          for (int i = 0; i < ints.length; i++)
692 <            assertEquals(ints[i], q.take());
692 >            assertSame(ints[i], q.remove());
693      }
694  
695  
696      /**
697 <     * toArray(null) throws NPE
697 >     * toArray(null) throws NullPointerException
698       */
699 <    public void testToArray_BadArg() {
699 >    public void testToArray_NullArg() {
700          DelayQueue q = populatedQueue(SIZE);
701          try {
702 <            Object o[] = q.toArray(null);
702 >            q.toArray(null);
703              shouldThrow();
704          } catch (NullPointerException success) {}
705      }
706  
707      /**
708 <     * toArray with incompatible array type throws CCE
708 >     * toArray(incompatible array type) throws ArrayStoreException
709       */
710      public void testToArray1_BadArg() {
711          DelayQueue q = populatedQueue(SIZE);
712          try {
713 <            Object o[] = q.toArray(new String[10]);
713 >            q.toArray(new String[10]);
714              shouldThrow();
715          } catch (ArrayStoreException success) {}
716      }

Diff Legend

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