11 |
|
import java.util.ArrayList; |
12 |
|
import java.util.Arrays; |
13 |
|
import java.util.Collection; |
14 |
+ |
import java.util.Collections; |
15 |
|
import java.util.Iterator; |
16 |
|
import java.util.NoSuchElementException; |
17 |
|
import java.util.Queue; |
20 |
|
import java.util.concurrent.CountDownLatch; |
21 |
|
import java.util.concurrent.Executors; |
22 |
|
import java.util.concurrent.ExecutorService; |
23 |
+ |
import java.util.concurrent.ThreadLocalRandom; |
24 |
|
|
25 |
|
import junit.framework.Test; |
26 |
|
|
27 |
|
public class ArrayBlockingQueueTest extends JSR166TestCase { |
28 |
|
|
27 |
– |
public static class Fair extends BlockingQueueTest { |
28 |
– |
protected BlockingQueue emptyCollection() { |
29 |
– |
return new ArrayBlockingQueue(SIZE, true); |
30 |
– |
} |
31 |
– |
} |
32 |
– |
|
33 |
– |
public static class NonFair extends BlockingQueueTest { |
34 |
– |
protected BlockingQueue emptyCollection() { |
35 |
– |
return new ArrayBlockingQueue(SIZE, false); |
36 |
– |
} |
37 |
– |
} |
38 |
– |
|
29 |
|
public static void main(String[] args) { |
30 |
|
main(suite(), args); |
31 |
|
} |
33 |
|
public static Test suite() { |
34 |
|
class Implementation implements CollectionImplementation { |
35 |
|
public Class<?> klazz() { return ArrayBlockingQueue.class; } |
36 |
< |
public Collection emptyCollection() { return new ArrayBlockingQueue(SIZE, false); } |
36 |
> |
public Collection emptyCollection() { |
37 |
> |
boolean fair = ThreadLocalRandom.current().nextBoolean(); |
38 |
> |
return populatedQueue(0, SIZE, 2 * SIZE, fair); |
39 |
> |
} |
40 |
|
public Object makeElement(int i) { return i; } |
41 |
|
public boolean isConcurrent() { return true; } |
42 |
|
public boolean permitsNulls() { return false; } |
43 |
|
} |
44 |
< |
return newTestSuite(ArrayBlockingQueueTest.class, |
45 |
< |
new Fair().testSuite(), |
46 |
< |
new NonFair().testSuite(), |
47 |
< |
CollectionTest.testSuite(new Implementation())); |
44 |
> |
|
45 |
> |
return newTestSuite( |
46 |
> |
ArrayBlockingQueueTest.class, |
47 |
> |
new Fair().testSuite(), |
48 |
> |
new NonFair().testSuite(), |
49 |
> |
CollectionTest.testSuite(new Implementation())); |
50 |
> |
} |
51 |
> |
|
52 |
> |
public static class Fair extends BlockingQueueTest { |
53 |
> |
protected BlockingQueue emptyCollection() { |
54 |
> |
return populatedQueue(0, SIZE, 2 * SIZE, true); |
55 |
> |
} |
56 |
> |
} |
57 |
> |
|
58 |
> |
public static class NonFair extends BlockingQueueTest { |
59 |
> |
protected BlockingQueue emptyCollection() { |
60 |
> |
return populatedQueue(0, SIZE, 2 * SIZE, false); |
61 |
> |
} |
62 |
|
} |
63 |
|
|
64 |
|
/** |
65 |
|
* Returns a new queue of given size containing consecutive |
66 |
|
* Integers 0 ... n - 1. |
67 |
|
*/ |
68 |
< |
private ArrayBlockingQueue<Integer> populatedQueue(int n) { |
69 |
< |
ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n); |
68 |
> |
static ArrayBlockingQueue<Integer> populatedQueue(int n) { |
69 |
> |
return populatedQueue(n, n, n, false); |
70 |
> |
} |
71 |
> |
|
72 |
> |
/** |
73 |
> |
* Returns a new queue of given size containing consecutive |
74 |
> |
* Integers 0 ... n - 1, with given capacity range and fairness. |
75 |
> |
*/ |
76 |
> |
static ArrayBlockingQueue<Integer> populatedQueue( |
77 |
> |
int size, int minCapacity, int maxCapacity, boolean fair) { |
78 |
> |
ThreadLocalRandom rnd = ThreadLocalRandom.current(); |
79 |
> |
int capacity = rnd.nextInt(minCapacity, maxCapacity + 1); |
80 |
> |
ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity); |
81 |
|
assertTrue(q.isEmpty()); |
82 |
< |
for (int i = 0; i < n; i++) |
83 |
< |
assertTrue(q.offer(new Integer(i))); |
84 |
< |
assertFalse(q.isEmpty()); |
85 |
< |
assertEquals(0, q.remainingCapacity()); |
86 |
< |
assertEquals(n, q.size()); |
87 |
< |
assertEquals((Integer) 0, q.peek()); |
82 |
> |
// shuffle circular array elements so they wrap |
83 |
> |
{ |
84 |
> |
int n = rnd.nextInt(capacity); |
85 |
> |
for (int i = 0; i < n; i++) q.add(42); |
86 |
> |
for (int i = 0; i < n; i++) q.remove(); |
87 |
> |
} |
88 |
> |
for (int i = 0; i < size; i++) |
89 |
> |
assertTrue(q.offer((Integer) i)); |
90 |
> |
assertEquals(size == 0, q.isEmpty()); |
91 |
> |
assertEquals(capacity - size, q.remainingCapacity()); |
92 |
> |
assertEquals(size, q.size()); |
93 |
> |
if (size > 0) |
94 |
> |
assertEquals((Integer) 0, q.peek()); |
95 |
|
return q; |
96 |
|
} |
97 |
|
|
105 |
|
/** |
106 |
|
* Constructor throws IAE if capacity argument nonpositive |
107 |
|
*/ |
108 |
< |
public void testConstructor2() { |
109 |
< |
try { |
110 |
< |
new ArrayBlockingQueue(0); |
111 |
< |
shouldThrow(); |
112 |
< |
} catch (IllegalArgumentException success) {} |
108 |
> |
public void testConstructor_nonPositiveCapacity() { |
109 |
> |
for (int i : new int[] { 0, -1, Integer.MIN_VALUE }) { |
110 |
> |
try { |
111 |
> |
new ArrayBlockingQueue(i); |
112 |
> |
shouldThrow(); |
113 |
> |
} catch (IllegalArgumentException success) {} |
114 |
> |
for (boolean fair : new boolean[] { true, false }) { |
115 |
> |
try { |
116 |
> |
new ArrayBlockingQueue(i, fair); |
117 |
> |
shouldThrow(); |
118 |
> |
} catch (IllegalArgumentException success) {} |
119 |
> |
} |
120 |
> |
} |
121 |
|
} |
122 |
|
|
123 |
|
/** |
124 |
|
* Initializing from null Collection throws NPE |
125 |
|
*/ |
126 |
< |
public void testConstructor3() { |
126 |
> |
public void testConstructor_nullCollection() { |
127 |
|
try { |
128 |
|
new ArrayBlockingQueue(1, true, null); |
129 |
|
shouldThrow(); |
158 |
|
/** |
159 |
|
* Initializing from too large collection throws IAE |
160 |
|
*/ |
161 |
< |
public void testConstructor6() { |
162 |
< |
Integer[] ints = new Integer[SIZE]; |
163 |
< |
for (int i = 0; i < SIZE; ++i) |
164 |
< |
ints[i] = i; |
132 |
< |
Collection<Integer> elements = Arrays.asList(ints); |
161 |
> |
public void testConstructor_collectionTooLarge() { |
162 |
> |
// just barely fits - succeeds |
163 |
> |
new ArrayBlockingQueue(SIZE, false, |
164 |
> |
Collections.nCopies(SIZE, "")); |
165 |
|
try { |
166 |
< |
new ArrayBlockingQueue(SIZE - 1, false, elements); |
166 |
> |
new ArrayBlockingQueue(SIZE - 1, false, |
167 |
> |
Collections.nCopies(SIZE, "")); |
168 |
|
shouldThrow(); |
169 |
|
} catch (IllegalArgumentException success) {} |
170 |
|
} |
186 |
|
* Queue transitions from empty to full when elements added |
187 |
|
*/ |
188 |
|
public void testEmptyFull() { |
189 |
< |
ArrayBlockingQueue q = new ArrayBlockingQueue(2); |
189 |
> |
BlockingQueue q = populatedQueue(0, 2, 2, false); |
190 |
|
assertTrue(q.isEmpty()); |
191 |
|
assertEquals(2, q.remainingCapacity()); |
192 |
|
q.add(one); |
193 |
|
assertFalse(q.isEmpty()); |
194 |
< |
q.add(two); |
194 |
> |
assertTrue(q.offer(two)); |
195 |
|
assertFalse(q.isEmpty()); |
196 |
|
assertEquals(0, q.remainingCapacity()); |
197 |
|
assertFalse(q.offer(three)); |
201 |
|
* remainingCapacity decreases on add, increases on remove |
202 |
|
*/ |
203 |
|
public void testRemainingCapacity() { |
204 |
< |
BlockingQueue q = populatedQueue(SIZE); |
205 |
< |
for (int i = 0; i < SIZE; ++i) { |
206 |
< |
assertEquals(i, q.remainingCapacity()); |
207 |
< |
assertEquals(SIZE, q.size() + q.remainingCapacity()); |
204 |
> |
int size = ThreadLocalRandom.current().nextInt(1, SIZE); |
205 |
> |
BlockingQueue q = populatedQueue(size, size, 2 * size, false); |
206 |
> |
int spare = q.remainingCapacity(); |
207 |
> |
int capacity = spare + size; |
208 |
> |
for (int i = 0; i < size; i++) { |
209 |
> |
assertEquals(spare + i, q.remainingCapacity()); |
210 |
> |
assertEquals(capacity, q.size() + q.remainingCapacity()); |
211 |
|
assertEquals(i, q.remove()); |
212 |
|
} |
213 |
< |
for (int i = 0; i < SIZE; ++i) { |
214 |
< |
assertEquals(SIZE - i, q.remainingCapacity()); |
215 |
< |
assertEquals(SIZE, q.size() + q.remainingCapacity()); |
213 |
> |
for (int i = 0; i < size; i++) { |
214 |
> |
assertEquals(capacity - i, q.remainingCapacity()); |
215 |
> |
assertEquals(capacity, q.size() + q.remainingCapacity()); |
216 |
|
assertTrue(q.add(i)); |
217 |
|
} |
218 |
|
} |
231 |
|
*/ |
232 |
|
public void testAdd() { |
233 |
|
ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE); |
234 |
< |
for (int i = 0; i < SIZE; ++i) { |
199 |
< |
assertTrue(q.add(new Integer(i))); |
200 |
< |
} |
234 |
> |
for (int i = 0; i < SIZE; i++) assertTrue(q.add((Integer) i)); |
235 |
|
assertEquals(0, q.remainingCapacity()); |
236 |
|
try { |
237 |
< |
q.add(new Integer(SIZE)); |
237 |
> |
q.add((Integer) SIZE); |
238 |
|
shouldThrow(); |
239 |
|
} catch (IllegalStateException success) {} |
240 |
|
} |
268 |
|
/** |
269 |
|
* addAll throws ISE if not enough room |
270 |
|
*/ |
271 |
< |
public void testAddAll4() { |
272 |
< |
ArrayBlockingQueue q = new ArrayBlockingQueue(1); |
273 |
< |
Integer[] ints = new Integer[SIZE]; |
274 |
< |
for (int i = 0; i < SIZE; ++i) |
275 |
< |
ints[i] = new Integer(i); |
271 |
> |
public void testAddAll_insufficientSpace() { |
272 |
> |
int size = ThreadLocalRandom.current().nextInt(1, SIZE); |
273 |
> |
ArrayBlockingQueue q = populatedQueue(0, size, size, false); |
274 |
> |
// Just fits: |
275 |
> |
q.addAll(populatedQueue(size, size, 2 * size, false)); |
276 |
> |
assertEquals(0, q.remainingCapacity()); |
277 |
> |
assertEquals(size, q.size()); |
278 |
> |
assertEquals(0, q.peek()); |
279 |
|
try { |
280 |
< |
q.addAll(Arrays.asList(ints)); |
280 |
> |
q = populatedQueue(0, size, size, false); |
281 |
> |
q.addAll(Collections.nCopies(size + 1, 42)); |
282 |
|
shouldThrow(); |
283 |
|
} catch (IllegalStateException success) {} |
284 |
|
} |
340 |
|
}}); |
341 |
|
|
342 |
|
await(pleaseInterrupt); |
343 |
< |
assertThreadStaysAlive(t); |
343 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
344 |
|
t.interrupt(); |
345 |
|
awaitTermination(t); |
346 |
|
assertEquals(SIZE, q.size()); |
375 |
|
assertEquals(0, q.take()); |
376 |
|
|
377 |
|
await(pleaseInterrupt); |
378 |
< |
assertThreadStaysAlive(t); |
378 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
379 |
|
t.interrupt(); |
380 |
|
awaitTermination(t); |
381 |
|
assertEquals(0, q.remainingCapacity()); |
399 |
|
q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS); |
400 |
|
shouldThrow(); |
401 |
|
} catch (InterruptedException success) {} |
402 |
+ |
assertFalse(Thread.interrupted()); |
403 |
|
}}); |
404 |
|
|
405 |
|
await(pleaseInterrupt); |
406 |
< |
assertThreadStaysAlive(t); |
406 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
407 |
|
t.interrupt(); |
408 |
|
awaitTermination(t); |
409 |
|
} |
426 |
|
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
427 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
428 |
|
public void realRun() throws InterruptedException { |
429 |
< |
for (int i = 0; i < SIZE; ++i) { |
391 |
< |
assertEquals(i, q.take()); |
392 |
< |
} |
429 |
> |
for (int i = 0; i < SIZE; i++) assertEquals(i, q.take()); |
430 |
|
|
431 |
|
Thread.currentThread().interrupt(); |
432 |
|
try { |
444 |
|
}}); |
445 |
|
|
446 |
|
await(pleaseInterrupt); |
447 |
< |
assertThreadStaysAlive(t); |
447 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
448 |
|
t.interrupt(); |
449 |
|
awaitTermination(t); |
450 |
|
} |
494 |
|
*/ |
495 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
496 |
|
final BlockingQueue<Integer> q = populatedQueue(SIZE); |
497 |
< |
final CountDownLatch aboutToWait = new CountDownLatch(1); |
497 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
498 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
499 |
|
public void realRun() throws InterruptedException { |
500 |
|
long startTime = System.nanoTime(); |
501 |
< |
for (int i = 0; i < SIZE; ++i) { |
501 |
> |
for (int i = 0; i < SIZE; i++) |
502 |
|
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
503 |
< |
} |
504 |
< |
aboutToWait.countDown(); |
503 |
> |
|
504 |
> |
Thread.currentThread().interrupt(); |
505 |
|
try { |
506 |
|
q.poll(LONG_DELAY_MS, MILLISECONDS); |
507 |
|
shouldThrow(); |
508 |
< |
} catch (InterruptedException success) { |
509 |
< |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
510 |
< |
} |
508 |
> |
} catch (InterruptedException success) {} |
509 |
> |
assertFalse(Thread.interrupted()); |
510 |
> |
|
511 |
> |
pleaseInterrupt.countDown(); |
512 |
> |
try { |
513 |
> |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
514 |
> |
shouldThrow(); |
515 |
> |
} catch (InterruptedException success) {} |
516 |
> |
assertFalse(Thread.interrupted()); |
517 |
> |
|
518 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
519 |
|
}}); |
520 |
|
|
521 |
< |
await(aboutToWait); |
522 |
< |
waitForThreadToEnterWaitState(t); |
521 |
> |
await(pleaseInterrupt); |
522 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
523 |
|
t.interrupt(); |
524 |
|
awaitTermination(t); |
525 |
|
checkEmpty(q); |
572 |
|
* contains(x) reports true when elements added but not yet removed |
573 |
|
*/ |
574 |
|
public void testContains() { |
575 |
< |
ArrayBlockingQueue q = populatedQueue(SIZE); |
576 |
< |
for (int i = 0; i < SIZE; ++i) { |
575 |
> |
int size = ThreadLocalRandom.current().nextInt(1, SIZE); |
576 |
> |
ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false); |
577 |
> |
assertFalse(q.contains(null)); |
578 |
> |
for (int i = 0; i < size; ++i) { |
579 |
|
assertTrue(q.contains(new Integer(i))); |
580 |
|
assertEquals(i, q.poll()); |
581 |
|
assertFalse(q.contains(new Integer(i))); |
586 |
|
* clear removes all elements |
587 |
|
*/ |
588 |
|
public void testClear() { |
589 |
< |
ArrayBlockingQueue q = populatedQueue(SIZE); |
589 |
> |
int size = ThreadLocalRandom.current().nextInt(1, 5); |
590 |
> |
ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false); |
591 |
> |
int capacity = size + q.remainingCapacity(); |
592 |
|
q.clear(); |
593 |
|
assertTrue(q.isEmpty()); |
594 |
|
assertEquals(0, q.size()); |
595 |
< |
assertEquals(SIZE, q.remainingCapacity()); |
595 |
> |
assertEquals(capacity, q.remainingCapacity()); |
596 |
|
q.add(one); |
597 |
|
assertFalse(q.isEmpty()); |
598 |
|
assertTrue(q.contains(one)); |
649 |
|
} |
650 |
|
} |
651 |
|
|
652 |
< |
void checkToArray(ArrayBlockingQueue q) { |
652 |
> |
void checkToArray(ArrayBlockingQueue<Integer> q) { |
653 |
|
int size = q.size(); |
654 |
< |
Object[] o = q.toArray(); |
655 |
< |
assertEquals(size, o.length); |
654 |
> |
Object[] a1 = q.toArray(); |
655 |
> |
assertEquals(size, a1.length); |
656 |
> |
Integer[] a2 = q.toArray(new Integer[0]); |
657 |
> |
assertEquals(size, a2.length); |
658 |
> |
Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]); |
659 |
> |
assertEquals(size, a3.length); |
660 |
> |
Integer[] a4 = new Integer[size]; |
661 |
> |
assertSame(a4, q.toArray(a4)); |
662 |
> |
Integer[] a5 = new Integer[size + 1]; |
663 |
> |
Arrays.fill(a5, 42); |
664 |
> |
assertSame(a5, q.toArray(a5)); |
665 |
> |
Integer[] a6 = new Integer[size + 2]; |
666 |
> |
Arrays.fill(a6, 42); |
667 |
> |
assertSame(a6, q.toArray(a6)); |
668 |
> |
Object[][] as = { a1, a2, a3, a4, a5, a6 }; |
669 |
> |
for (Object[] a : as) { |
670 |
> |
if (a.length > size) assertNull(a[size]); |
671 |
> |
if (a.length > size + 1) assertEquals(42, a[size + 1]); |
672 |
> |
} |
673 |
|
Iterator it = q.iterator(); |
674 |
+ |
Integer s = q.peek(); |
675 |
|
for (int i = 0; i < size; i++) { |
676 |
|
Integer x = (Integer) it.next(); |
677 |
< |
assertEquals((Integer)o[0] + i, (int) x); |
678 |
< |
assertSame(o[i], x); |
677 |
> |
assertEquals(s + i, (int) x); |
678 |
> |
for (Object[] a : as) |
679 |
> |
assertSame(a1[i], x); |
680 |
|
} |
681 |
|
} |
682 |
|
|
683 |
|
/** |
684 |
< |
* toArray() contains all elements in FIFO order |
684 |
> |
* toArray() and toArray(a) contain all elements in FIFO order |
685 |
|
*/ |
686 |
|
public void testToArray() { |
687 |
< |
ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE); |
688 |
< |
for (int i = 0; i < SIZE; i++) { |
687 |
> |
final ThreadLocalRandom rnd = ThreadLocalRandom.current(); |
688 |
> |
final int size = rnd.nextInt(6); |
689 |
> |
final int capacity = Math.max(1, size + rnd.nextInt(size + 1)); |
690 |
> |
ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity); |
691 |
> |
for (int i = 0; i < size; i++) { |
692 |
|
checkToArray(q); |
693 |
|
q.add(i); |
694 |
|
} |
695 |
|
// Provoke wraparound |
696 |
< |
for (int i = 0; i < SIZE; i++) { |
696 |
> |
int added = size * 2; |
697 |
> |
for (int i = 0; i < added; i++) { |
698 |
|
checkToArray(q); |
699 |
< |
assertEquals(i, q.poll()); |
700 |
< |
checkToArray(q); |
629 |
< |
q.add(SIZE + i); |
630 |
< |
} |
631 |
< |
for (int i = 0; i < SIZE; i++) { |
632 |
< |
checkToArray(q); |
633 |
< |
assertEquals(SIZE + i, q.poll()); |
699 |
> |
assertEquals((Integer) i, q.poll()); |
700 |
> |
q.add(size + i); |
701 |
|
} |
635 |
– |
} |
636 |
– |
|
637 |
– |
void checkToArray2(ArrayBlockingQueue q) { |
638 |
– |
int size = q.size(); |
639 |
– |
Integer[] a1 = (size == 0) ? null : new Integer[size - 1]; |
640 |
– |
Integer[] a2 = new Integer[size]; |
641 |
– |
Integer[] a3 = new Integer[size + 2]; |
642 |
– |
if (size > 0) Arrays.fill(a1, 42); |
643 |
– |
Arrays.fill(a2, 42); |
644 |
– |
Arrays.fill(a3, 42); |
645 |
– |
Integer[] b1 = (size == 0) ? null : (Integer[]) q.toArray(a1); |
646 |
– |
Integer[] b2 = (Integer[]) q.toArray(a2); |
647 |
– |
Integer[] b3 = (Integer[]) q.toArray(a3); |
648 |
– |
assertSame(a2, b2); |
649 |
– |
assertSame(a3, b3); |
650 |
– |
Iterator it = q.iterator(); |
702 |
|
for (int i = 0; i < size; i++) { |
703 |
< |
Integer x = (Integer) it.next(); |
704 |
< |
assertSame(b1[i], x); |
654 |
< |
assertEquals(b1[0] + i, (int) x); |
655 |
< |
assertSame(b2[i], x); |
656 |
< |
assertSame(b3[i], x); |
657 |
< |
} |
658 |
< |
assertNull(a3[size]); |
659 |
< |
assertEquals(42, (int) a3[size + 1]); |
660 |
< |
if (size > 0) { |
661 |
< |
assertNotSame(a1, b1); |
662 |
< |
assertEquals(size, b1.length); |
663 |
< |
for (int i = 0; i < a1.length; i++) { |
664 |
< |
assertEquals(42, (int) a1[i]); |
665 |
< |
} |
666 |
< |
} |
667 |
< |
} |
668 |
< |
|
669 |
< |
/** |
670 |
< |
* toArray(a) contains all elements in FIFO order |
671 |
< |
*/ |
672 |
< |
public void testToArray2() { |
673 |
< |
ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE); |
674 |
< |
for (int i = 0; i < SIZE; i++) { |
675 |
< |
checkToArray2(q); |
676 |
< |
q.add(i); |
677 |
< |
} |
678 |
< |
// Provoke wraparound |
679 |
< |
for (int i = 0; i < SIZE; i++) { |
680 |
< |
checkToArray2(q); |
681 |
< |
assertEquals(i, q.poll()); |
682 |
< |
checkToArray2(q); |
683 |
< |
q.add(SIZE + i); |
684 |
< |
} |
685 |
< |
for (int i = 0; i < SIZE; i++) { |
686 |
< |
checkToArray2(q); |
687 |
< |
assertEquals(SIZE + i, q.poll()); |
703 |
> |
checkToArray(q); |
704 |
> |
assertEquals((Integer) (added + i), q.poll()); |
705 |
|
} |
706 |
|
} |
707 |
|
|
708 |
|
/** |
709 |
|
* toArray(incompatible array type) throws ArrayStoreException |
710 |
|
*/ |
711 |
< |
public void testToArray1_BadArg() { |
711 |
> |
public void testToArray_incompatibleArrayType() { |
712 |
|
ArrayBlockingQueue q = populatedQueue(SIZE); |
713 |
|
try { |
714 |
|
q.toArray(new String[10]); |
715 |
|
shouldThrow(); |
716 |
|
} catch (ArrayStoreException success) {} |
717 |
+ |
try { |
718 |
+ |
q.toArray(new String[0]); |
719 |
+ |
shouldThrow(); |
720 |
+ |
} catch (ArrayStoreException success) {} |
721 |
|
} |
722 |
|
|
723 |
|
/** |
946 |
|
*/ |
947 |
|
public void testNeverContainsNull() { |
948 |
|
Collection<?>[] qs = { |
949 |
< |
new ArrayBlockingQueue<Object>(10), |
950 |
< |
populatedQueue(2), |
949 |
> |
populatedQueue(0, 1, 10, false), |
950 |
> |
populatedQueue(2, 2, 10, true), |
951 |
|
}; |
952 |
|
|
953 |
|
for (Collection<?> q : qs) { |