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.43 by jsr166, Wed Nov 3 16:46:34 2010 UTC vs.
Revision 1.47 by jsr166, Tue Mar 15 19:47:06 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 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 402 | Line 402 | public class DelayQueueTest extends JSR1
402                  try {
403                      q.take();
404                      shouldThrow();
405 <                } catch (InterruptedException expected) {}
405 >                } catch (InterruptedException success) {}
406                  assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
407              }});
408          threadStarted.await();
# 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  

Diff Legend

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