161 |
|
} |
162 |
|
|
163 |
|
/** |
164 |
< |
* offer(null) throws NPE |
164 |
> |
* offer(null) throws NPE |
165 |
|
*/ |
166 |
|
public void testOfferNull() { |
167 |
|
try { |
172 |
|
} |
173 |
|
|
174 |
|
/** |
175 |
< |
* add(null) throws NPE |
175 |
> |
* add(null) throws NPE |
176 |
|
*/ |
177 |
|
public void testAddNull() { |
178 |
|
try { |
207 |
|
} |
208 |
|
|
209 |
|
/** |
210 |
< |
* addAll(null) throws NPE |
210 |
> |
* addAll(null) throws NPE |
211 |
|
*/ |
212 |
|
public void testAddAll1() { |
213 |
|
try { |
230 |
|
|
231 |
|
|
232 |
|
/** |
233 |
< |
* addAll of a collection with null elements throws NPE |
233 |
> |
* addAll of a collection with null elements throws NPE |
234 |
|
*/ |
235 |
|
public void testAddAll2() { |
236 |
|
try { |
286 |
|
} |
287 |
|
|
288 |
|
/** |
289 |
< |
* put(null) throws NPE |
289 |
> |
* put(null) throws NPE |
290 |
|
*/ |
291 |
|
public void testPutNull() throws InterruptedException { |
292 |
|
try { |
393 |
|
} |
394 |
|
|
395 |
|
/** |
396 |
– |
* take blocks interruptibly when empty |
397 |
– |
*/ |
398 |
– |
public void testTakeFromEmpty() throws InterruptedException { |
399 |
– |
final ArrayBlockingQueue q = new ArrayBlockingQueue(2); |
400 |
– |
Thread t = new ThreadShouldThrow(InterruptedException.class) { |
401 |
– |
public void realRun() throws InterruptedException { |
402 |
– |
q.take(); |
403 |
– |
}}; |
404 |
– |
|
405 |
– |
t.start(); |
406 |
– |
Thread.sleep(SHORT_DELAY_MS); |
407 |
– |
t.interrupt(); |
408 |
– |
t.join(); |
409 |
– |
} |
410 |
– |
|
411 |
– |
/** |
396 |
|
* Take removes existing elements until empty, then blocks interruptibly |
397 |
|
*/ |
398 |
|
public void testBlockingTake() throws InterruptedException { |
427 |
|
} |
428 |
|
|
429 |
|
/** |
430 |
< |
* timed pool with zero timeout succeeds when non-empty, else times out |
430 |
> |
* timed poll with zero timeout succeeds when non-empty, else times out |
431 |
|
*/ |
432 |
|
public void testTimedPoll0() throws InterruptedException { |
433 |
|
ArrayBlockingQueue q = populatedQueue(SIZE); |
438 |
|
} |
439 |
|
|
440 |
|
/** |
441 |
< |
* timed pool with nonzero timeout succeeds when non-empty, else times out |
441 |
> |
* timed poll with nonzero timeout succeeds when non-empty, else times out |
442 |
|
*/ |
443 |
|
public void testTimedPoll() throws InterruptedException { |
444 |
|
ArrayBlockingQueue q = populatedQueue(SIZE); |
607 |
|
} |
608 |
|
|
609 |
|
/** |
610 |
< |
* toArray contains all elements |
610 |
> |
* toArray contains all elements |
611 |
|
*/ |
612 |
|
public void testToArray() throws InterruptedException { |
613 |
|
ArrayBlockingQueue q = populatedQueue(SIZE); |
628 |
|
} |
629 |
|
|
630 |
|
/** |
631 |
< |
* toArray(null) throws NPE |
631 |
> |
* toArray(null) throws NullPointerException |
632 |
|
*/ |
633 |
< |
public void testToArray_BadArg() { |
633 |
> |
public void testToArray_NullArg() { |
634 |
|
ArrayBlockingQueue q = populatedQueue(SIZE); |
635 |
|
try { |
636 |
< |
Object o[] = q.toArray(null); |
636 |
> |
q.toArray(null); |
637 |
|
shouldThrow(); |
638 |
|
} catch (NullPointerException success) {} |
639 |
|
} |
640 |
|
|
641 |
|
/** |
642 |
< |
* toArray with incompatible array type throws CCE |
642 |
> |
* toArray(incompatible array type) throws ArrayStoreException |
643 |
|
*/ |
644 |
|
public void testToArray1_BadArg() { |
645 |
|
ArrayBlockingQueue q = populatedQueue(SIZE); |
646 |
|
try { |
647 |
< |
Object o[] = q.toArray(new String[10]); |
647 |
> |
q.toArray(new String[10]); |
648 |
|
shouldThrow(); |
649 |
|
} catch (ArrayStoreException success) {} |
650 |
|
} |
880 |
|
} |
881 |
|
|
882 |
|
/** |
883 |
< |
* drainTo(c, n) empties first max {n, size} elements of queue into c |
883 |
> |
* drainTo(c, n) empties first min(n, size) elements of queue into c |
884 |
|
*/ |
885 |
|
public void testDrainToN() { |
886 |
|
ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2); |
889 |
|
assertTrue(q.offer(new Integer(j))); |
890 |
|
ArrayList l = new ArrayList(); |
891 |
|
q.drainTo(l, i); |
892 |
< |
int k = (i < SIZE)? i : SIZE; |
892 |
> |
int k = (i < SIZE) ? i : SIZE; |
893 |
|
assertEquals(l.size(), k); |
894 |
|
assertEquals(q.size(), SIZE-k); |
895 |
|
for (int j = 0; j < k; ++j) |