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); |
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); |
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 { |
685 |
> |
public void testToArray2() { |
686 |
|
DelayQueue q = populatedQueue(SIZE); |
687 |
|
PDelay[] ints = new PDelay[SIZE]; |
688 |
< |
ints = (PDelay[])q.toArray(ints); |
688 |
> |
assertSame(ints, q.toArray(ints)); |
689 |
|
Arrays.sort(ints); |
690 |
|
for (int i = 0; i < ints.length; i++) |
691 |
< |
assertEquals(ints[i], q.take()); |
691 |
> |
assertSame(ints[i], q.remove()); |
692 |
|
} |
693 |
|
|
694 |
|
|
695 |
|
/** |
696 |
< |
* toArray(null) throws NPE |
696 |
> |
* toArray(null) throws NullPointerException |
697 |
|
*/ |
698 |
< |
public void testToArray_BadArg() { |
698 |
> |
public void testToArray_NullArg() { |
699 |
|
DelayQueue q = populatedQueue(SIZE); |
700 |
|
try { |
701 |
< |
Object o[] = q.toArray(null); |
701 |
> |
q.toArray(null); |
702 |
|
shouldThrow(); |
703 |
|
} catch (NullPointerException success) {} |
704 |
|
} |
705 |
|
|
706 |
|
/** |
707 |
< |
* toArray with incompatible array type throws CCE |
707 |
> |
* toArray(incompatible array type) throws ArrayStoreException |
708 |
|
*/ |
709 |
|
public void testToArray1_BadArg() { |
710 |
|
DelayQueue q = populatedQueue(SIZE); |
711 |
|
try { |
712 |
< |
Object o[] = q.toArray(new String[10]); |
712 |
> |
q.toArray(new String[10]); |
713 |
|
shouldThrow(); |
714 |
|
} catch (ArrayStoreException success) {} |
715 |
|
} |