97 |
|
} |
98 |
|
|
99 |
|
/** |
100 |
< |
* addAll throws ISE if no active taker |
100 |
> |
* addAll throws IllegalStateException if no active taker |
101 |
|
*/ |
102 |
|
public void testAddAll_ISE() { testAddAll_ISE(false); } |
103 |
|
public void testAddAll_ISE_fair() { testAddAll_ISE(true); } |
139 |
|
}}); |
140 |
|
|
141 |
|
await(pleaseInterrupt); |
142 |
< |
assertThreadBlocks(t, Thread.State.WAITING); |
142 |
> |
if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING); |
143 |
|
t.interrupt(); |
144 |
|
awaitTermination(t); |
145 |
|
assertEquals(0, q.remainingCapacity()); |
180 |
|
catch (InterruptedException e) { threadUnexpectedException(e); } |
181 |
|
|
182 |
|
await(pleaseInterrupt); |
183 |
< |
assertThreadBlocks(t, Thread.State.WAITING); |
183 |
> |
if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING); |
184 |
|
t.interrupt(); |
185 |
|
awaitTermination(t); |
186 |
|
assertEquals(0, q.remainingCapacity()); |
196 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
197 |
|
public void realRun() throws InterruptedException { |
198 |
|
long startTime = System.nanoTime(); |
199 |
+ |
|
200 |
|
assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS)); |
201 |
|
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
202 |
|
|
203 |
|
Thread.currentThread().interrupt(); |
204 |
|
try { |
205 |
< |
q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS); |
205 |
> |
q.offer(new Object(), randomTimeout(), randomTimeUnit()); |
206 |
|
shouldThrow(); |
207 |
|
} catch (InterruptedException success) {} |
208 |
|
assertFalse(Thread.interrupted()); |
209 |
|
|
210 |
|
pleaseInterrupt.countDown(); |
211 |
|
try { |
212 |
< |
q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS); |
212 |
> |
q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS); |
213 |
|
shouldThrow(); |
214 |
|
} catch (InterruptedException success) {} |
215 |
|
assertFalse(Thread.interrupted()); |
216 |
+ |
|
217 |
+ |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
218 |
|
}}); |
219 |
|
|
220 |
|
await(pleaseInterrupt); |
221 |
< |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
221 |
> |
if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
222 |
|
t.interrupt(); |
223 |
|
awaitTermination(t); |
224 |
|
} |
277 |
|
|
278 |
|
Thread.currentThread().interrupt(); |
279 |
|
try { |
280 |
< |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
280 |
> |
q.poll(randomTimeout(), randomTimeUnit()); |
281 |
|
shouldThrow(); |
282 |
|
} catch (InterruptedException success) {} |
283 |
|
assertFalse(Thread.interrupted()); |
299 |
|
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
300 |
|
|
301 |
|
await(pleaseInterrupt); |
302 |
< |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
302 |
> |
if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
303 |
|
t.interrupt(); |
304 |
|
awaitTermination(t); |
305 |
|
} |
440 |
|
public void testToArray_null(boolean fair) { |
441 |
|
final SynchronousQueue q = new SynchronousQueue(fair); |
442 |
|
try { |
443 |
< |
Object[] o = q.toArray(null); |
443 |
> |
Object[] o = q.toArray((Object[])null); |
444 |
|
shouldThrow(); |
445 |
|
} catch (NullPointerException success) {} |
446 |
|
} |
455 |
|
} |
456 |
|
|
457 |
|
/** |
458 |
< |
* iterator remove throws ISE |
458 |
> |
* iterator remove throws IllegalStateException |
459 |
|
*/ |
460 |
|
public void testIteratorRemove() { testIteratorRemove(false); } |
461 |
|
public void testIteratorRemove_fair() { testIteratorRemove(true); } |
533 |
|
} |
534 |
|
|
535 |
|
/** |
536 |
< |
* a deserialized serialized queue is usable |
536 |
> |
* a deserialized/reserialized queue is usable |
537 |
|
*/ |
538 |
|
public void testSerialization() { |
539 |
|
final SynchronousQueue x = new SynchronousQueue(); |