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 |
|
*/ |
8 |
|
|
9 |
– |
import junit.framework.*; |
10 |
– |
import java.util.*; |
11 |
– |
import java.util.concurrent.*; |
9 |
|
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
10 |
< |
import java.io.*; |
10 |
> |
|
11 |
> |
import java.util.ArrayList; |
12 |
> |
import java.util.Arrays; |
13 |
> |
import java.util.Collection; |
14 |
> |
import java.util.Comparator; |
15 |
> |
import java.util.Iterator; |
16 |
> |
import java.util.NoSuchElementException; |
17 |
> |
import java.util.Queue; |
18 |
> |
import java.util.concurrent.BlockingQueue; |
19 |
> |
import java.util.concurrent.CountDownLatch; |
20 |
> |
import java.util.concurrent.Executors; |
21 |
> |
import java.util.concurrent.ExecutorService; |
22 |
> |
import java.util.concurrent.PriorityBlockingQueue; |
23 |
> |
|
24 |
> |
import junit.framework.Test; |
25 |
|
|
26 |
|
public class PriorityBlockingQueueTest extends JSR166TestCase { |
27 |
|
|
33 |
|
|
34 |
|
public static class InitialCapacity extends BlockingQueueTest { |
35 |
|
protected BlockingQueue emptyCollection() { |
36 |
< |
return new PriorityBlockingQueue(20); |
36 |
> |
return new PriorityBlockingQueue(SIZE); |
37 |
|
} |
38 |
|
} |
39 |
|
|
40 |
|
public static void main(String[] args) { |
41 |
< |
junit.textui.TestRunner.run(suite()); |
41 |
> |
main(suite(), args); |
42 |
|
} |
43 |
|
|
44 |
|
public static Test suite() { |
45 |
+ |
class Implementation implements CollectionImplementation { |
46 |
+ |
public Class<?> klazz() { return PriorityBlockingQueue.class; } |
47 |
+ |
public Collection emptyCollection() { return new PriorityBlockingQueue(); } |
48 |
+ |
public Object makeElement(int i) { return i; } |
49 |
+ |
public boolean isConcurrent() { return true; } |
50 |
+ |
public boolean permitsNulls() { return false; } |
51 |
+ |
} |
52 |
|
return newTestSuite(PriorityBlockingQueueTest.class, |
53 |
|
new Generic().testSuite(), |
54 |
< |
new InitialCapacity().testSuite()); |
54 |
> |
new InitialCapacity().testSuite(), |
55 |
> |
CollectionTest.testSuite(new Implementation())); |
56 |
|
} |
57 |
|
|
39 |
– |
private static final int NOCAP = Integer.MAX_VALUE; |
40 |
– |
|
58 |
|
/** Sample Comparator */ |
59 |
|
static class MyReverseComparator implements Comparator { |
60 |
|
public int compare(Object x, Object y) { |
63 |
|
} |
64 |
|
|
65 |
|
/** |
66 |
< |
* Create a queue of given size containing consecutive |
67 |
< |
* Integers 0 ... n. |
66 |
> |
* Returns a new queue of given size containing consecutive |
67 |
> |
* Integers 0 ... n - 1. |
68 |
|
*/ |
69 |
< |
private PriorityBlockingQueue populatedQueue(int n) { |
70 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(n); |
69 |
> |
private static PriorityBlockingQueue<Integer> populatedQueue(int n) { |
70 |
> |
PriorityBlockingQueue<Integer> q = |
71 |
> |
new PriorityBlockingQueue<Integer>(n); |
72 |
|
assertTrue(q.isEmpty()); |
73 |
< |
for (int i = n-1; i >= 0; i-=2) |
73 |
> |
for (int i = n - 1; i >= 0; i -= 2) |
74 |
|
assertTrue(q.offer(new Integer(i))); |
75 |
< |
for (int i = (n & 1); i < n; i+=2) |
75 |
> |
for (int i = (n & 1); i < n; i += 2) |
76 |
|
assertTrue(q.offer(new Integer(i))); |
77 |
|
assertFalse(q.isEmpty()); |
78 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
78 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
79 |
|
assertEquals(n, q.size()); |
80 |
+ |
assertEquals((Integer) 0, q.peek()); |
81 |
|
return q; |
82 |
|
} |
83 |
|
|
85 |
|
* A new queue has unbounded capacity |
86 |
|
*/ |
87 |
|
public void testConstructor1() { |
88 |
< |
assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity()); |
88 |
> |
assertEquals(Integer.MAX_VALUE, |
89 |
> |
new PriorityBlockingQueue(SIZE).remainingCapacity()); |
90 |
|
} |
91 |
|
|
92 |
|
/** |
94 |
|
*/ |
95 |
|
public void testConstructor2() { |
96 |
|
try { |
97 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(0); |
97 |
> |
new PriorityBlockingQueue(0); |
98 |
|
shouldThrow(); |
99 |
|
} catch (IllegalArgumentException success) {} |
100 |
|
} |
104 |
|
*/ |
105 |
|
public void testConstructor3() { |
106 |
|
try { |
107 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(null); |
107 |
> |
new PriorityBlockingQueue(null); |
108 |
|
shouldThrow(); |
109 |
|
} catch (NullPointerException success) {} |
110 |
|
} |
113 |
|
* Initializing from Collection of null elements throws NPE |
114 |
|
*/ |
115 |
|
public void testConstructor4() { |
116 |
+ |
Collection<Integer> elements = Arrays.asList(new Integer[SIZE]); |
117 |
|
try { |
118 |
< |
Integer[] ints = new Integer[SIZE]; |
98 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints)); |
118 |
> |
new PriorityBlockingQueue(elements); |
119 |
|
shouldThrow(); |
120 |
|
} catch (NullPointerException success) {} |
121 |
|
} |
124 |
|
* Initializing from Collection with some null elements throws NPE |
125 |
|
*/ |
126 |
|
public void testConstructor5() { |
127 |
+ |
Integer[] ints = new Integer[SIZE]; |
128 |
+ |
for (int i = 0; i < SIZE - 1; ++i) |
129 |
+ |
ints[i] = i; |
130 |
+ |
Collection<Integer> elements = Arrays.asList(ints); |
131 |
|
try { |
132 |
< |
Integer[] ints = new Integer[SIZE]; |
109 |
< |
for (int i = 0; i < SIZE-1; ++i) |
110 |
< |
ints[i] = new Integer(i); |
111 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints)); |
132 |
> |
new PriorityBlockingQueue(elements); |
133 |
|
shouldThrow(); |
134 |
|
} catch (NullPointerException success) {} |
135 |
|
} |
140 |
|
public void testConstructor6() { |
141 |
|
Integer[] ints = new Integer[SIZE]; |
142 |
|
for (int i = 0; i < SIZE; ++i) |
143 |
< |
ints[i] = new Integer(i); |
143 |
> |
ints[i] = i; |
144 |
|
PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints)); |
145 |
|
for (int i = 0; i < SIZE; ++i) |
146 |
|
assertEquals(ints[i], q.poll()); |
157 |
|
for (int i = 0; i < SIZE; ++i) |
158 |
|
ints[i] = new Integer(i); |
159 |
|
q.addAll(Arrays.asList(ints)); |
160 |
< |
for (int i = SIZE-1; i >= 0; --i) |
160 |
> |
for (int i = SIZE - 1; i >= 0; --i) |
161 |
|
assertEquals(ints[i], q.poll()); |
162 |
|
} |
163 |
|
|
167 |
|
public void testEmpty() { |
168 |
|
PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
169 |
|
assertTrue(q.isEmpty()); |
170 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
170 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
171 |
|
q.add(one); |
172 |
|
assertFalse(q.isEmpty()); |
173 |
|
q.add(two); |
177 |
|
} |
178 |
|
|
179 |
|
/** |
180 |
< |
* remainingCapacity does not change when elements added or removed, |
160 |
< |
* but size does |
180 |
> |
* remainingCapacity() always returns Integer.MAX_VALUE |
181 |
|
*/ |
182 |
|
public void testRemainingCapacity() { |
183 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
183 |
> |
BlockingQueue q = populatedQueue(SIZE); |
184 |
|
for (int i = 0; i < SIZE; ++i) { |
185 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
186 |
< |
assertEquals(SIZE-i, q.size()); |
187 |
< |
q.remove(); |
185 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
186 |
> |
assertEquals(SIZE - i, q.size()); |
187 |
> |
assertEquals(i, q.remove()); |
188 |
|
} |
189 |
|
for (int i = 0; i < SIZE; ++i) { |
190 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
190 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
191 |
|
assertEquals(i, q.size()); |
192 |
< |
q.add(new Integer(i)); |
192 |
> |
assertTrue(q.add(i)); |
193 |
|
} |
194 |
|
} |
195 |
|
|
196 |
|
/** |
177 |
– |
* offer(null) throws NPE |
178 |
– |
*/ |
179 |
– |
public void testOfferNull() { |
180 |
– |
try { |
181 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(1); |
182 |
– |
q.offer(null); |
183 |
– |
shouldThrow(); |
184 |
– |
} catch (NullPointerException success) {} |
185 |
– |
} |
186 |
– |
|
187 |
– |
/** |
188 |
– |
* add(null) throws NPE |
189 |
– |
*/ |
190 |
– |
public void testAddNull() { |
191 |
– |
try { |
192 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(1); |
193 |
– |
q.add(null); |
194 |
– |
shouldThrow(); |
195 |
– |
} catch (NullPointerException success) {} |
196 |
– |
} |
197 |
– |
|
198 |
– |
/** |
197 |
|
* Offer of comparable element succeeds |
198 |
|
*/ |
199 |
|
public void testOffer() { |
206 |
|
* Offer of non-Comparable throws CCE |
207 |
|
*/ |
208 |
|
public void testOfferNonComparable() { |
209 |
+ |
PriorityBlockingQueue q = new PriorityBlockingQueue(1); |
210 |
|
try { |
212 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(1); |
213 |
– |
q.offer(new Object()); |
214 |
– |
q.offer(new Object()); |
211 |
|
q.offer(new Object()); |
212 |
|
shouldThrow(); |
213 |
< |
} catch (ClassCastException success) {} |
213 |
> |
} catch (ClassCastException success) { |
214 |
> |
assertTrue(q.isEmpty()); |
215 |
> |
assertEquals(0, q.size()); |
216 |
> |
assertNull(q.poll()); |
217 |
> |
} |
218 |
|
} |
219 |
|
|
220 |
|
/** |
229 |
|
} |
230 |
|
|
231 |
|
/** |
232 |
– |
* addAll(null) throws NPE |
233 |
– |
*/ |
234 |
– |
public void testAddAll1() { |
235 |
– |
try { |
236 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(1); |
237 |
– |
q.addAll(null); |
238 |
– |
shouldThrow(); |
239 |
– |
} catch (NullPointerException success) {} |
240 |
– |
} |
241 |
– |
|
242 |
– |
/** |
232 |
|
* addAll(this) throws IAE |
233 |
|
*/ |
234 |
|
public void testAddAllSelf() { |
235 |
+ |
PriorityBlockingQueue q = populatedQueue(SIZE); |
236 |
|
try { |
247 |
– |
PriorityBlockingQueue q = populatedQueue(SIZE); |
237 |
|
q.addAll(q); |
238 |
|
shouldThrow(); |
239 |
|
} catch (IllegalArgumentException success) {} |
240 |
|
} |
241 |
|
|
242 |
|
/** |
254 |
– |
* addAll of a collection with null elements throws NPE |
255 |
– |
*/ |
256 |
– |
public void testAddAll2() { |
257 |
– |
try { |
258 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
259 |
– |
Integer[] ints = new Integer[SIZE]; |
260 |
– |
q.addAll(Arrays.asList(ints)); |
261 |
– |
shouldThrow(); |
262 |
– |
} catch (NullPointerException success) {} |
263 |
– |
} |
264 |
– |
|
265 |
– |
/** |
243 |
|
* addAll of a collection with any null elements throws NPE after |
244 |
|
* possibly adding some elements |
245 |
|
*/ |
246 |
|
public void testAddAll3() { |
247 |
+ |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
248 |
+ |
Integer[] ints = new Integer[SIZE]; |
249 |
+ |
for (int i = 0; i < SIZE - 1; ++i) |
250 |
+ |
ints[i] = new Integer(i); |
251 |
|
try { |
271 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
272 |
– |
Integer[] ints = new Integer[SIZE]; |
273 |
– |
for (int i = 0; i < SIZE-1; ++i) |
274 |
– |
ints[i] = new Integer(i); |
252 |
|
q.addAll(Arrays.asList(ints)); |
253 |
|
shouldThrow(); |
254 |
|
} catch (NullPointerException success) {} |
260 |
|
public void testAddAll5() { |
261 |
|
Integer[] empty = new Integer[0]; |
262 |
|
Integer[] ints = new Integer[SIZE]; |
263 |
< |
for (int i = SIZE-1; i >= 0; --i) |
263 |
> |
for (int i = SIZE - 1; i >= 0; --i) |
264 |
|
ints[i] = new Integer(i); |
265 |
|
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
266 |
|
assertFalse(q.addAll(Arrays.asList(empty))); |
270 |
|
} |
271 |
|
|
272 |
|
/** |
296 |
– |
* put(null) throws NPE |
297 |
– |
*/ |
298 |
– |
public void testPutNull() { |
299 |
– |
try { |
300 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
301 |
– |
q.put(null); |
302 |
– |
shouldThrow(); |
303 |
– |
} catch (NullPointerException success) {} |
304 |
– |
} |
305 |
– |
|
306 |
– |
/** |
273 |
|
* all elements successfully put are contained |
274 |
|
*/ |
275 |
< |
public void testPut() { |
276 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
277 |
< |
for (int i = 0; i < SIZE; ++i) { |
278 |
< |
Integer I = new Integer(i); |
279 |
< |
q.put(I); |
280 |
< |
assertTrue(q.contains(I)); |
281 |
< |
} |
282 |
< |
assertEquals(SIZE, q.size()); |
275 |
> |
public void testPut() { |
276 |
> |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
277 |
> |
for (int i = 0; i < SIZE; ++i) { |
278 |
> |
Integer x = new Integer(i); |
279 |
> |
q.put(x); |
280 |
> |
assertTrue(q.contains(x)); |
281 |
> |
} |
282 |
> |
assertEquals(SIZE, q.size()); |
283 |
|
} |
284 |
|
|
285 |
|
/** |
288 |
|
public void testPutWithTake() throws InterruptedException { |
289 |
|
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
290 |
|
final int size = 4; |
291 |
< |
Thread t = new Thread(new CheckedRunnable() { |
291 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
292 |
|
public void realRun() { |
293 |
|
for (int i = 0; i < size; i++) |
294 |
|
q.put(new Integer(0)); |
295 |
|
}}); |
296 |
|
|
297 |
< |
t.start(); |
298 |
< |
Thread.sleep(SHORT_DELAY_MS); |
333 |
< |
assertEquals(q.size(), size); |
297 |
> |
awaitTermination(t); |
298 |
> |
assertEquals(size, q.size()); |
299 |
|
q.take(); |
335 |
– |
t.interrupt(); |
336 |
– |
t.join(); |
300 |
|
} |
301 |
|
|
302 |
|
/** |
304 |
|
*/ |
305 |
|
public void testTimedOffer() throws InterruptedException { |
306 |
|
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
307 |
< |
Thread t = new Thread(new CheckedRunnable() { |
307 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
308 |
|
public void realRun() { |
309 |
|
q.put(new Integer(0)); |
310 |
|
q.put(new Integer(0)); |
312 |
|
assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS)); |
313 |
|
}}); |
314 |
|
|
315 |
< |
t.start(); |
353 |
< |
Thread.sleep(SMALL_DELAY_MS); |
354 |
< |
t.interrupt(); |
355 |
< |
t.join(); |
315 |
> |
awaitTermination(t); |
316 |
|
} |
317 |
|
|
318 |
|
/** |
326 |
|
} |
327 |
|
|
328 |
|
/** |
369 |
– |
* take blocks interruptibly when empty |
370 |
– |
*/ |
371 |
– |
public void testTakeFromEmpty() throws InterruptedException { |
372 |
– |
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
373 |
– |
Thread t = new Thread(new CheckedInterruptedRunnable() { |
374 |
– |
public void realRun() throws InterruptedException { |
375 |
– |
q.take(); |
376 |
– |
}}); |
377 |
– |
|
378 |
– |
t.start(); |
379 |
– |
Thread.sleep(SHORT_DELAY_MS); |
380 |
– |
t.interrupt(); |
381 |
– |
t.join(); |
382 |
– |
} |
383 |
– |
|
384 |
– |
/** |
329 |
|
* Take removes existing elements until empty, then blocks interruptibly |
330 |
|
*/ |
331 |
|
public void testBlockingTake() throws InterruptedException { |
332 |
|
final PriorityBlockingQueue q = populatedQueue(SIZE); |
333 |
< |
Thread t = new Thread(new CheckedRunnable() { |
333 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
334 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
335 |
|
public void realRun() throws InterruptedException { |
336 |
|
for (int i = 0; i < SIZE; ++i) { |
337 |
|
assertEquals(i, q.take()); |
338 |
|
} |
339 |
+ |
|
340 |
+ |
Thread.currentThread().interrupt(); |
341 |
+ |
try { |
342 |
+ |
q.take(); |
343 |
+ |
shouldThrow(); |
344 |
+ |
} catch (InterruptedException success) {} |
345 |
+ |
assertFalse(Thread.interrupted()); |
346 |
+ |
|
347 |
+ |
pleaseInterrupt.countDown(); |
348 |
|
try { |
349 |
|
q.take(); |
350 |
|
shouldThrow(); |
351 |
|
} catch (InterruptedException success) {} |
352 |
+ |
assertFalse(Thread.interrupted()); |
353 |
|
}}); |
354 |
|
|
355 |
< |
t.start(); |
356 |
< |
Thread.sleep(SHORT_DELAY_MS); |
355 |
> |
await(pleaseInterrupt); |
356 |
> |
assertThreadStaysAlive(t); |
357 |
|
t.interrupt(); |
358 |
< |
t.join(); |
358 |
> |
awaitTermination(t); |
359 |
|
} |
360 |
|
|
406 |
– |
|
361 |
|
/** |
362 |
|
* poll succeeds unless empty |
363 |
|
*/ |
370 |
|
} |
371 |
|
|
372 |
|
/** |
373 |
< |
* timed pool with zero timeout succeeds when non-empty, else times out |
373 |
> |
* timed poll with zero timeout succeeds when non-empty, else times out |
374 |
|
*/ |
375 |
|
public void testTimedPoll0() throws InterruptedException { |
376 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
381 |
|
} |
382 |
|
|
383 |
|
/** |
384 |
< |
* timed pool with nonzero timeout succeeds when non-empty, else times out |
384 |
> |
* timed poll with nonzero timeout succeeds when non-empty, else times out |
385 |
|
*/ |
386 |
|
public void testTimedPoll() throws InterruptedException { |
387 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
387 |
> |
PriorityBlockingQueue<Integer> q = populatedQueue(SIZE); |
388 |
|
for (int i = 0; i < SIZE; ++i) { |
389 |
< |
assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
390 |
< |
} |
391 |
< |
assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
389 |
> |
long startTime = System.nanoTime(); |
390 |
> |
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
391 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
392 |
> |
} |
393 |
> |
long startTime = System.nanoTime(); |
394 |
> |
assertNull(q.poll(timeoutMillis(), MILLISECONDS)); |
395 |
> |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
396 |
> |
checkEmpty(q); |
397 |
|
} |
398 |
|
|
399 |
|
/** |
401 |
|
* returning timeout status |
402 |
|
*/ |
403 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
404 |
< |
Thread t = new Thread(new CheckedRunnable() { |
404 |
> |
final BlockingQueue<Integer> q = populatedQueue(SIZE); |
405 |
> |
final CountDownLatch aboutToWait = new CountDownLatch(1); |
406 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
407 |
|
public void realRun() throws InterruptedException { |
408 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
408 |
> |
long startTime = System.nanoTime(); |
409 |
|
for (int i = 0; i < SIZE; ++i) { |
410 |
< |
assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
410 |
> |
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
411 |
|
} |
412 |
+ |
aboutToWait.countDown(); |
413 |
|
try { |
414 |
< |
q.poll(SMALL_DELAY_MS, MILLISECONDS); |
414 |
> |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
415 |
|
shouldThrow(); |
416 |
< |
} catch (InterruptedException success) {} |
416 |
> |
} catch (InterruptedException success) { |
417 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
418 |
> |
} |
419 |
|
}}); |
420 |
|
|
421 |
< |
t.start(); |
422 |
< |
Thread.sleep(SHORT_DELAY_MS); |
421 |
> |
aboutToWait.await(); |
422 |
> |
waitForThreadToEnterWaitState(t); |
423 |
|
t.interrupt(); |
424 |
< |
t.join(); |
424 |
> |
awaitTermination(t); |
425 |
|
} |
426 |
|
|
427 |
|
/** |
468 |
|
} |
469 |
|
|
470 |
|
/** |
507 |
– |
* remove(x) removes x and returns true if present |
508 |
– |
*/ |
509 |
– |
public void testRemoveElement() { |
510 |
– |
PriorityBlockingQueue q = populatedQueue(SIZE); |
511 |
– |
for (int i = 1; i < SIZE; i+=2) { |
512 |
– |
assertTrue(q.remove(new Integer(i))); |
513 |
– |
} |
514 |
– |
for (int i = 0; i < SIZE; i+=2) { |
515 |
– |
assertTrue(q.remove(new Integer(i))); |
516 |
– |
assertFalse(q.remove(new Integer(i+1))); |
517 |
– |
} |
518 |
– |
assertTrue(q.isEmpty()); |
519 |
– |
} |
520 |
– |
|
521 |
– |
/** |
471 |
|
* contains(x) reports true when elements added but not yet removed |
472 |
|
*/ |
473 |
|
public void testContains() { |
522 |
|
assertTrue(changed); |
523 |
|
|
524 |
|
assertTrue(q.containsAll(p)); |
525 |
< |
assertEquals(SIZE-i, q.size()); |
525 |
> |
assertEquals(SIZE - i, q.size()); |
526 |
|
p.remove(); |
527 |
|
} |
528 |
|
} |
535 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
536 |
|
PriorityBlockingQueue p = populatedQueue(i); |
537 |
|
assertTrue(q.removeAll(p)); |
538 |
< |
assertEquals(SIZE-i, q.size()); |
538 |
> |
assertEquals(SIZE - i, q.size()); |
539 |
|
for (int j = 0; j < i; ++j) { |
540 |
< |
Integer I = (Integer)(p.remove()); |
541 |
< |
assertFalse(q.contains(I)); |
540 |
> |
Integer x = (Integer)(p.remove()); |
541 |
> |
assertFalse(q.contains(x)); |
542 |
|
} |
543 |
|
} |
544 |
|
} |
551 |
|
Object[] o = q.toArray(); |
552 |
|
Arrays.sort(o); |
553 |
|
for (int i = 0; i < o.length; i++) |
554 |
< |
assertEquals(o[i], q.take()); |
554 |
> |
assertSame(o[i], q.take()); |
555 |
|
} |
556 |
|
|
557 |
|
/** |
558 |
|
* toArray(a) contains all elements |
559 |
|
*/ |
560 |
|
public void testToArray2() throws InterruptedException { |
561 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
561 |
> |
PriorityBlockingQueue<Integer> q = populatedQueue(SIZE); |
562 |
|
Integer[] ints = new Integer[SIZE]; |
563 |
< |
ints = (Integer[])q.toArray(ints); |
563 |
> |
Integer[] array = q.toArray(ints); |
564 |
> |
assertSame(ints, array); |
565 |
|
Arrays.sort(ints); |
566 |
|
for (int i = 0; i < ints.length; i++) |
567 |
< |
assertEquals(ints[i], q.take()); |
567 |
> |
assertSame(ints[i], q.take()); |
568 |
|
} |
569 |
|
|
570 |
|
/** |
571 |
< |
* toArray(null) throws NPE |
622 |
< |
*/ |
623 |
< |
public void testToArray_BadArg() { |
624 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
625 |
< |
try { |
626 |
< |
Object o[] = q.toArray(null); |
627 |
< |
shouldThrow(); |
628 |
< |
} catch (NullPointerException success) {} |
629 |
< |
} |
630 |
< |
|
631 |
< |
/** |
632 |
< |
* toArray with incompatible array type throws CCE |
571 |
> |
* toArray(incompatible array type) throws ArrayStoreException |
572 |
|
*/ |
573 |
|
public void testToArray1_BadArg() { |
574 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
575 |
|
try { |
576 |
< |
Object o[] = q.toArray(new String[10]); |
576 |
> |
q.toArray(new String[10]); |
577 |
|
shouldThrow(); |
578 |
|
} catch (ArrayStoreException success) {} |
579 |
|
} |
583 |
|
*/ |
584 |
|
public void testIterator() { |
585 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
647 |
– |
int i = 0; |
586 |
|
Iterator it = q.iterator(); |
587 |
< |
while (it.hasNext()) { |
587 |
> |
int i; |
588 |
> |
for (i = 0; it.hasNext(); i++) |
589 |
|
assertTrue(q.contains(it.next())); |
651 |
– |
++i; |
652 |
– |
} |
590 |
|
assertEquals(i, SIZE); |
591 |
+ |
assertIteratorExhausted(it); |
592 |
+ |
} |
593 |
+ |
|
594 |
+ |
/** |
595 |
+ |
* iterator of empty collection has no elements |
596 |
+ |
*/ |
597 |
+ |
public void testEmptyIterator() { |
598 |
+ |
assertIteratorExhausted(new PriorityBlockingQueue().iterator()); |
599 |
|
} |
600 |
|
|
601 |
|
/** |
617 |
|
assertFalse(it.hasNext()); |
618 |
|
} |
619 |
|
|
675 |
– |
|
620 |
|
/** |
621 |
|
* toString contains toStrings of elements |
622 |
|
*/ |
624 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
625 |
|
String s = q.toString(); |
626 |
|
for (int i = 0; i < SIZE; ++i) { |
627 |
< |
assertTrue(s.indexOf(String.valueOf(i)) >= 0); |
627 |
> |
assertTrue(s.contains(String.valueOf(i))); |
628 |
|
} |
629 |
|
} |
630 |
|
|
631 |
|
/** |
632 |
< |
* offer transfers elements across Executor tasks |
632 |
> |
* timed poll transfers elements across Executor tasks |
633 |
|
*/ |
634 |
|
public void testPollInExecutor() { |
635 |
|
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
636 |
< |
ExecutorService executor = Executors.newFixedThreadPool(2); |
637 |
< |
executor.execute(new CheckedRunnable() { |
638 |
< |
public void realRun() throws InterruptedException { |
639 |
< |
assertNull(q.poll()); |
640 |
< |
assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); |
641 |
< |
assertTrue(q.isEmpty()); |
642 |
< |
}}); |
643 |
< |
|
644 |
< |
executor.execute(new CheckedRunnable() { |
645 |
< |
public void realRun() throws InterruptedException { |
646 |
< |
Thread.sleep(SMALL_DELAY_MS); |
647 |
< |
q.put(one); |
648 |
< |
}}); |
649 |
< |
|
650 |
< |
joinPool(executor); |
636 |
> |
final CheckedBarrier threadsStarted = new CheckedBarrier(2); |
637 |
> |
final ExecutorService executor = Executors.newFixedThreadPool(2); |
638 |
> |
try (PoolCleaner cleaner = cleaner(executor)) { |
639 |
> |
executor.execute(new CheckedRunnable() { |
640 |
> |
public void realRun() throws InterruptedException { |
641 |
> |
assertNull(q.poll()); |
642 |
> |
threadsStarted.await(); |
643 |
> |
assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS)); |
644 |
> |
checkEmpty(q); |
645 |
> |
}}); |
646 |
> |
|
647 |
> |
executor.execute(new CheckedRunnable() { |
648 |
> |
public void realRun() throws InterruptedException { |
649 |
> |
threadsStarted.await(); |
650 |
> |
q.put(one); |
651 |
> |
}}); |
652 |
> |
} |
653 |
|
} |
654 |
|
|
655 |
|
/** |
656 |
|
* A deserialized serialized queue has same elements |
657 |
|
*/ |
658 |
|
public void testSerialization() throws Exception { |
659 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
660 |
< |
ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); |
715 |
< |
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); |
716 |
< |
out.writeObject(q); |
717 |
< |
out.close(); |
659 |
> |
Queue x = populatedQueue(SIZE); |
660 |
> |
Queue y = serialClone(x); |
661 |
|
|
662 |
< |
ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); |
663 |
< |
ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); |
664 |
< |
PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject(); |
665 |
< |
assertEquals(q.size(), r.size()); |
666 |
< |
while (!q.isEmpty()) |
667 |
< |
assertEquals(q.remove(), r.remove()); |
668 |
< |
} |
726 |
< |
|
727 |
< |
/** |
728 |
< |
* drainTo(null) throws NPE |
729 |
< |
*/ |
730 |
< |
public void testDrainToNull() { |
731 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
732 |
< |
try { |
733 |
< |
q.drainTo(null); |
734 |
< |
shouldThrow(); |
735 |
< |
} catch (NullPointerException success) {} |
736 |
< |
} |
737 |
< |
|
738 |
< |
/** |
739 |
< |
* drainTo(this) throws IAE |
740 |
< |
*/ |
741 |
< |
public void testDrainToSelf() { |
742 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
743 |
< |
try { |
744 |
< |
q.drainTo(q); |
745 |
< |
shouldThrow(); |
746 |
< |
} catch (IllegalArgumentException success) {} |
662 |
> |
assertNotSame(x, y); |
663 |
> |
assertEquals(x.size(), y.size()); |
664 |
> |
while (!x.isEmpty()) { |
665 |
> |
assertFalse(y.isEmpty()); |
666 |
> |
assertEquals(x.remove(), y.remove()); |
667 |
> |
} |
668 |
> |
assertTrue(y.isEmpty()); |
669 |
|
} |
670 |
|
|
671 |
|
/** |
675 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
676 |
|
ArrayList l = new ArrayList(); |
677 |
|
q.drainTo(l); |
678 |
< |
assertEquals(q.size(), 0); |
679 |
< |
assertEquals(l.size(), SIZE); |
678 |
> |
assertEquals(0, q.size()); |
679 |
> |
assertEquals(SIZE, l.size()); |
680 |
|
for (int i = 0; i < SIZE; ++i) |
681 |
|
assertEquals(l.get(i), new Integer(i)); |
682 |
|
q.add(zero); |
686 |
|
assertTrue(q.contains(one)); |
687 |
|
l.clear(); |
688 |
|
q.drainTo(l); |
689 |
< |
assertEquals(q.size(), 0); |
690 |
< |
assertEquals(l.size(), 2); |
689 |
> |
assertEquals(0, q.size()); |
690 |
> |
assertEquals(2, l.size()); |
691 |
|
for (int i = 0; i < 2; ++i) |
692 |
|
assertEquals(l.get(i), new Integer(i)); |
693 |
|
} |
699 |
|
final PriorityBlockingQueue q = populatedQueue(SIZE); |
700 |
|
Thread t = new Thread(new CheckedRunnable() { |
701 |
|
public void realRun() { |
702 |
< |
q.put(new Integer(SIZE+1)); |
702 |
> |
q.put(new Integer(SIZE + 1)); |
703 |
|
}}); |
704 |
|
|
705 |
|
t.start(); |
713 |
|
} |
714 |
|
|
715 |
|
/** |
794 |
– |
* drainTo(null, n) throws NPE |
795 |
– |
*/ |
796 |
– |
public void testDrainToNullN() { |
797 |
– |
PriorityBlockingQueue q = populatedQueue(SIZE); |
798 |
– |
try { |
799 |
– |
q.drainTo(null, 0); |
800 |
– |
shouldThrow(); |
801 |
– |
} catch (NullPointerException success) {} |
802 |
– |
} |
803 |
– |
|
804 |
– |
/** |
805 |
– |
* drainTo(this, n) throws IAE |
806 |
– |
*/ |
807 |
– |
public void testDrainToSelfN() { |
808 |
– |
PriorityBlockingQueue q = populatedQueue(SIZE); |
809 |
– |
try { |
810 |
– |
q.drainTo(q, 0); |
811 |
– |
shouldThrow(); |
812 |
– |
} catch (IllegalArgumentException success) {} |
813 |
– |
} |
814 |
– |
|
815 |
– |
/** |
716 |
|
* drainTo(c, n) empties first min(n, size) elements of queue into c |
717 |
|
*/ |
718 |
|
public void testDrainToN() { |
719 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2); |
719 |
> |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2); |
720 |
|
for (int i = 0; i < SIZE + 2; ++i) { |
721 |
|
for (int j = 0; j < SIZE; j++) |
722 |
|
assertTrue(q.offer(new Integer(j))); |
723 |
|
ArrayList l = new ArrayList(); |
724 |
|
q.drainTo(l, i); |
725 |
|
int k = (i < SIZE) ? i : SIZE; |
726 |
< |
assertEquals(l.size(), k); |
727 |
< |
assertEquals(q.size(), SIZE-k); |
726 |
> |
assertEquals(k, l.size()); |
727 |
> |
assertEquals(SIZE - k, q.size()); |
728 |
|
for (int j = 0; j < k; ++j) |
729 |
|
assertEquals(l.get(j), new Integer(j)); |
730 |
< |
while (q.poll() != null) ; |
730 |
> |
do {} while (q.poll() != null); |
731 |
> |
} |
732 |
> |
} |
733 |
> |
|
734 |
> |
/** |
735 |
> |
* remove(null), contains(null) always return false |
736 |
> |
*/ |
737 |
> |
public void testNeverContainsNull() { |
738 |
> |
Collection<?>[] qs = { |
739 |
> |
new PriorityBlockingQueue<Object>(), |
740 |
> |
populatedQueue(2), |
741 |
> |
}; |
742 |
> |
|
743 |
> |
for (Collection<?> q : qs) { |
744 |
> |
assertFalse(q.contains(null)); |
745 |
> |
assertFalse(q.remove(null)); |
746 |
|
} |
747 |
|
} |
748 |
|
|