| 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.*; |
| 10 |
> |
import java.util.Arrays; |
| 11 |
> |
import java.util.ArrayList; |
| 12 |
> |
import java.util.Collection; |
| 13 |
> |
import java.util.Iterator; |
| 14 |
> |
import java.util.NoSuchElementException; |
| 15 |
> |
import java.util.concurrent.BlockingQueue; |
| 16 |
> |
import java.util.concurrent.CountDownLatch; |
| 17 |
> |
import java.util.concurrent.Delayed; |
| 18 |
> |
import java.util.concurrent.DelayQueue; |
| 19 |
> |
import java.util.concurrent.Executors; |
| 20 |
> |
import java.util.concurrent.ExecutorService; |
| 21 |
> |
import java.util.concurrent.TimeUnit; |
| 22 |
|
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
| 12 |
– |
import java.util.concurrent.*; |
| 23 |
|
|
| 24 |
|
public class DelayQueueTest extends JSR166TestCase { |
| 25 |
+ |
|
| 26 |
+ |
public static class Generic extends BlockingQueueTest { |
| 27 |
+ |
protected BlockingQueue emptyCollection() { |
| 28 |
+ |
return new DelayQueue(); |
| 29 |
+ |
} |
| 30 |
+ |
protected PDelay makeElement(int i) { |
| 31 |
+ |
return new PDelay(i); |
| 32 |
+ |
} |
| 33 |
+ |
} |
| 34 |
+ |
|
| 35 |
|
public static void main(String[] args) { |
| 36 |
< |
junit.textui.TestRunner.run (suite()); |
| 36 |
> |
junit.textui.TestRunner.run(suite()); |
| 37 |
|
} |
| 38 |
|
|
| 39 |
|
public static Test suite() { |
| 40 |
< |
return new TestSuite(DelayQueueTest.class); |
| 40 |
> |
return newTestSuite(DelayQueueTest.class, |
| 41 |
> |
new Generic().testSuite()); |
| 42 |
|
} |
| 43 |
|
|
| 44 |
|
private static final int NOCAP = Integer.MAX_VALUE; |
| 45 |
|
|
| 46 |
|
/** |
| 47 |
|
* A delayed implementation for testing. |
| 48 |
< |
* Most tests use Pseudodelays, where delays are all elapsed |
| 48 |
> |
* Most tests use Pseudodelays, where delays are all elapsed |
| 49 |
|
* (so, no blocking solely for delays) but are still ordered |
| 50 |
|
*/ |
| 51 |
|
static class PDelay implements Delayed { |
| 52 |
|
int pseudodelay; |
| 53 |
< |
PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; } |
| 54 |
< |
public int compareTo(PDelay y) { |
| 55 |
< |
int i = pseudodelay; |
| 56 |
< |
int j = ((PDelay)y).pseudodelay; |
| 57 |
< |
if (i < j) return -1; |
| 37 |
< |
if (i > j) return 1; |
| 38 |
< |
return 0; |
| 53 |
> |
PDelay(int i) { pseudodelay = i; } |
| 54 |
> |
public int compareTo(PDelay other) { |
| 55 |
> |
int a = this.pseudodelay; |
| 56 |
> |
int b = other.pseudodelay; |
| 57 |
> |
return (a < b) ? -1 : (a > b) ? 1 : 0; |
| 58 |
|
} |
| 40 |
– |
|
| 59 |
|
public int compareTo(Delayed y) { |
| 60 |
< |
int i = pseudodelay; |
| 43 |
< |
int j = ((PDelay)y).pseudodelay; |
| 44 |
< |
if (i < j) return -1; |
| 45 |
< |
if (i > j) return 1; |
| 46 |
< |
return 0; |
| 60 |
> |
return compareTo((PDelay)y); |
| 61 |
|
} |
| 48 |
– |
|
| 62 |
|
public boolean equals(Object other) { |
| 63 |
< |
return ((PDelay)other).pseudodelay == pseudodelay; |
| 63 |
> |
return (other instanceof PDelay) && |
| 64 |
> |
this.pseudodelay == ((PDelay)other).pseudodelay; |
| 65 |
|
} |
| 66 |
< |
public boolean equals(PDelay other) { |
| 67 |
< |
return ((PDelay)other).pseudodelay == pseudodelay; |
| 54 |
< |
} |
| 55 |
< |
|
| 56 |
< |
|
| 66 |
> |
// suppress [overrides] javac warning |
| 67 |
> |
public int hashCode() { return pseudodelay; } |
| 68 |
|
public long getDelay(TimeUnit ignore) { |
| 69 |
< |
return pseudodelay; |
| 59 |
< |
} |
| 60 |
< |
public int intValue() { |
| 61 |
< |
return pseudodelay; |
| 69 |
> |
return Integer.MIN_VALUE + pseudodelay; |
| 70 |
|
} |
| 63 |
– |
|
| 71 |
|
public String toString() { |
| 72 |
|
return String.valueOf(pseudodelay); |
| 73 |
|
} |
| 74 |
|
} |
| 75 |
|
|
| 69 |
– |
|
| 76 |
|
/** |
| 77 |
|
* Delayed implementation that actually delays |
| 78 |
|
*/ |
| 83 |
|
} |
| 84 |
|
public int compareTo(NanoDelay y) { |
| 85 |
|
long i = trigger; |
| 86 |
< |
long j = ((NanoDelay)y).trigger; |
| 86 |
> |
long j = y.trigger; |
| 87 |
|
if (i < j) return -1; |
| 88 |
|
if (i > j) return 1; |
| 89 |
|
return 0; |
| 90 |
|
} |
| 91 |
|
|
| 92 |
|
public int compareTo(Delayed y) { |
| 93 |
< |
long i = trigger; |
| 88 |
< |
long j = ((NanoDelay)y).trigger; |
| 89 |
< |
if (i < j) return -1; |
| 90 |
< |
if (i > j) return 1; |
| 91 |
< |
return 0; |
| 93 |
> |
return compareTo((NanoDelay)y); |
| 94 |
|
} |
| 95 |
|
|
| 96 |
|
public boolean equals(Object other) { |
| 97 |
< |
return ((NanoDelay)other).trigger == trigger; |
| 97 |
> |
return equals((NanoDelay)other); |
| 98 |
|
} |
| 99 |
|
public boolean equals(NanoDelay other) { |
| 100 |
< |
return ((NanoDelay)other).trigger == trigger; |
| 100 |
> |
return other.trigger == trigger; |
| 101 |
|
} |
| 102 |
|
|
| 103 |
+ |
// suppress [overrides] javac warning |
| 104 |
+ |
public int hashCode() { return (int) trigger; } |
| 105 |
+ |
|
| 106 |
|
public long getDelay(TimeUnit unit) { |
| 107 |
|
long n = trigger - System.nanoTime(); |
| 108 |
|
return unit.convert(n, TimeUnit.NANOSECONDS); |
| 117 |
|
} |
| 118 |
|
} |
| 119 |
|
|
| 115 |
– |
|
| 120 |
|
/** |
| 121 |
< |
* Create a queue of given size containing consecutive |
| 121 |
> |
* Returns a new queue of given size containing consecutive |
| 122 |
|
* PDelays 0 ... n. |
| 123 |
|
*/ |
| 124 |
< |
private DelayQueue populatedQueue(int n) { |
| 125 |
< |
DelayQueue q = new DelayQueue(); |
| 124 |
> |
private DelayQueue<PDelay> populatedQueue(int n) { |
| 125 |
> |
DelayQueue<PDelay> q = new DelayQueue<PDelay>(); |
| 126 |
|
assertTrue(q.isEmpty()); |
| 127 |
|
for (int i = n-1; i >= 0; i-=2) |
| 128 |
|
assertTrue(q.offer(new PDelay(i))); |
| 179 |
|
* Queue contains all elements of collection used to initialize |
| 180 |
|
*/ |
| 181 |
|
public void testConstructor6() { |
| 182 |
< |
try { |
| 183 |
< |
PDelay[] ints = new PDelay[SIZE]; |
| 184 |
< |
for (int i = 0; i < SIZE; ++i) |
| 185 |
< |
ints[i] = new PDelay(i); |
| 186 |
< |
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
| 187 |
< |
for (int i = 0; i < SIZE; ++i) |
| 184 |
< |
assertEquals(ints[i], q.poll()); |
| 185 |
< |
} |
| 186 |
< |
finally {} |
| 182 |
> |
PDelay[] ints = new PDelay[SIZE]; |
| 183 |
> |
for (int i = 0; i < SIZE; ++i) |
| 184 |
> |
ints[i] = new PDelay(i); |
| 185 |
> |
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
| 186 |
> |
for (int i = 0; i < SIZE; ++i) |
| 187 |
> |
assertEquals(ints[i], q.poll()); |
| 188 |
|
} |
| 189 |
|
|
| 190 |
|
/** |
| 203 |
|
} |
| 204 |
|
|
| 205 |
|
/** |
| 206 |
< |
* remainingCapacity does not change when elementa added or removed, |
| 206 |
> |
* remainingCapacity does not change when elements added or removed, |
| 207 |
|
* but size does |
| 208 |
|
*/ |
| 209 |
|
public void testRemainingCapacity() { |
| 221 |
|
} |
| 222 |
|
|
| 223 |
|
/** |
| 223 |
– |
* offer(null) throws NPE |
| 224 |
– |
*/ |
| 225 |
– |
public void testOfferNull() { |
| 226 |
– |
try { |
| 227 |
– |
DelayQueue q = new DelayQueue(); |
| 228 |
– |
q.offer(null); |
| 229 |
– |
shouldThrow(); |
| 230 |
– |
} catch (NullPointerException success) {} |
| 231 |
– |
} |
| 232 |
– |
|
| 233 |
– |
/** |
| 234 |
– |
* add(null) throws NPE |
| 235 |
– |
*/ |
| 236 |
– |
public void testAddNull() { |
| 237 |
– |
try { |
| 238 |
– |
DelayQueue q = new DelayQueue(); |
| 239 |
– |
q.add(null); |
| 240 |
– |
shouldThrow(); |
| 241 |
– |
} catch (NullPointerException success) {} |
| 242 |
– |
} |
| 243 |
– |
|
| 244 |
– |
/** |
| 224 |
|
* offer non-null succeeds |
| 225 |
|
*/ |
| 226 |
|
public void testOffer() { |
| 241 |
|
} |
| 242 |
|
|
| 243 |
|
/** |
| 265 |
– |
* addAll(null) throws NPE |
| 266 |
– |
*/ |
| 267 |
– |
public void testAddAll1() { |
| 268 |
– |
try { |
| 269 |
– |
DelayQueue q = new DelayQueue(); |
| 270 |
– |
q.addAll(null); |
| 271 |
– |
shouldThrow(); |
| 272 |
– |
} catch (NullPointerException success) {} |
| 273 |
– |
} |
| 274 |
– |
|
| 275 |
– |
|
| 276 |
– |
/** |
| 244 |
|
* addAll(this) throws IAE |
| 245 |
|
*/ |
| 246 |
|
public void testAddAllSelf() { |
| 252 |
|
} |
| 253 |
|
|
| 254 |
|
/** |
| 288 |
– |
* addAll of a collection with null elements throws NPE |
| 289 |
– |
*/ |
| 290 |
– |
public void testAddAll2() { |
| 291 |
– |
try { |
| 292 |
– |
DelayQueue q = new DelayQueue(); |
| 293 |
– |
PDelay[] ints = new PDelay[SIZE]; |
| 294 |
– |
q.addAll(Arrays.asList(ints)); |
| 295 |
– |
shouldThrow(); |
| 296 |
– |
} catch (NullPointerException success) {} |
| 297 |
– |
} |
| 298 |
– |
/** |
| 255 |
|
* addAll of a collection with any null elements throws NPE after |
| 256 |
|
* possibly adding some elements |
| 257 |
|
*/ |
| 270 |
|
* Queue contains all elements of successful addAll |
| 271 |
|
*/ |
| 272 |
|
public void testAddAll5() { |
| 273 |
< |
try { |
| 274 |
< |
PDelay[] empty = new PDelay[0]; |
| 275 |
< |
PDelay[] ints = new PDelay[SIZE]; |
| 276 |
< |
for (int i = SIZE-1; i >= 0; --i) |
| 277 |
< |
ints[i] = new PDelay(i); |
| 278 |
< |
DelayQueue q = new DelayQueue(); |
| 279 |
< |
assertFalse(q.addAll(Arrays.asList(empty))); |
| 280 |
< |
assertTrue(q.addAll(Arrays.asList(ints))); |
| 281 |
< |
for (int i = 0; i < SIZE; ++i) |
| 326 |
< |
assertEquals(ints[i], q.poll()); |
| 327 |
< |
} |
| 328 |
< |
finally {} |
| 273 |
> |
PDelay[] empty = new PDelay[0]; |
| 274 |
> |
PDelay[] ints = new PDelay[SIZE]; |
| 275 |
> |
for (int i = SIZE-1; i >= 0; --i) |
| 276 |
> |
ints[i] = new PDelay(i); |
| 277 |
> |
DelayQueue q = new DelayQueue(); |
| 278 |
> |
assertFalse(q.addAll(Arrays.asList(empty))); |
| 279 |
> |
assertTrue(q.addAll(Arrays.asList(ints))); |
| 280 |
> |
for (int i = 0; i < SIZE; ++i) |
| 281 |
> |
assertEquals(ints[i], q.poll()); |
| 282 |
|
} |
| 283 |
|
|
| 284 |
|
/** |
| 332 |
– |
* put(null) throws NPE |
| 333 |
– |
*/ |
| 334 |
– |
public void testPutNull() { |
| 335 |
– |
try { |
| 336 |
– |
DelayQueue q = new DelayQueue(); |
| 337 |
– |
q.put(null); |
| 338 |
– |
shouldThrow(); |
| 339 |
– |
} catch (NullPointerException success) {} |
| 340 |
– |
} |
| 341 |
– |
|
| 342 |
– |
/** |
| 285 |
|
* all elements successfully put are contained |
| 286 |
|
*/ |
| 287 |
< |
public void testPut() { |
| 288 |
< |
DelayQueue q = new DelayQueue(); |
| 289 |
< |
for (int i = 0; i < SIZE; ++i) { |
| 290 |
< |
PDelay I = new PDelay(i); |
| 291 |
< |
q.put(I); |
| 292 |
< |
assertTrue(q.contains(I)); |
| 293 |
< |
} |
| 294 |
< |
assertEquals(SIZE, q.size()); |
| 287 |
> |
public void testPut() { |
| 288 |
> |
DelayQueue q = new DelayQueue(); |
| 289 |
> |
for (int i = 0; i < SIZE; ++i) { |
| 290 |
> |
PDelay I = new PDelay(i); |
| 291 |
> |
q.put(I); |
| 292 |
> |
assertTrue(q.contains(I)); |
| 293 |
> |
} |
| 294 |
> |
assertEquals(SIZE, q.size()); |
| 295 |
|
} |
| 296 |
|
|
| 297 |
|
/** |
| 299 |
|
*/ |
| 300 |
|
public void testPutWithTake() throws InterruptedException { |
| 301 |
|
final DelayQueue q = new DelayQueue(); |
| 302 |
< |
Thread t = new Thread(new CheckedRunnable() { |
| 302 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
| 303 |
|
public void realRun() { |
| 304 |
|
q.put(new PDelay(0)); |
| 305 |
|
q.put(new PDelay(0)); |
| 307 |
|
q.put(new PDelay(0)); |
| 308 |
|
}}); |
| 309 |
|
|
| 310 |
< |
t.start(); |
| 311 |
< |
Thread.sleep(SHORT_DELAY_MS); |
| 370 |
< |
q.take(); |
| 371 |
< |
t.interrupt(); |
| 372 |
< |
t.join(); |
| 310 |
> |
awaitTermination(t); |
| 311 |
> |
assertEquals(4, q.size()); |
| 312 |
|
} |
| 313 |
|
|
| 314 |
|
/** |
| 316 |
|
*/ |
| 317 |
|
public void testTimedOffer() throws InterruptedException { |
| 318 |
|
final DelayQueue q = new DelayQueue(); |
| 319 |
< |
Thread t = new Thread(new CheckedRunnable() { |
| 319 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
| 320 |
|
public void realRun() throws InterruptedException { |
| 321 |
|
q.put(new PDelay(0)); |
| 322 |
|
q.put(new PDelay(0)); |
| 323 |
< |
threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS)); |
| 324 |
< |
threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS)); |
| 323 |
> |
assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS)); |
| 324 |
> |
assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS)); |
| 325 |
|
}}); |
| 326 |
|
|
| 327 |
< |
t.start(); |
| 389 |
< |
Thread.sleep(SMALL_DELAY_MS); |
| 390 |
< |
t.interrupt(); |
| 391 |
< |
t.join(); |
| 327 |
> |
awaitTermination(t); |
| 328 |
|
} |
| 329 |
|
|
| 330 |
|
/** |
| 338 |
|
} |
| 339 |
|
|
| 340 |
|
/** |
| 405 |
– |
* take blocks interruptibly when empty |
| 406 |
– |
*/ |
| 407 |
– |
public void testTakeFromEmpty() throws InterruptedException { |
| 408 |
– |
final DelayQueue q = new DelayQueue(); |
| 409 |
– |
Thread t = new ThreadShouldThrow(InterruptedException.class) { |
| 410 |
– |
public void realRun() throws InterruptedException { |
| 411 |
– |
q.take(); |
| 412 |
– |
}}; |
| 413 |
– |
|
| 414 |
– |
t.start(); |
| 415 |
– |
Thread.sleep(SHORT_DELAY_MS); |
| 416 |
– |
t.interrupt(); |
| 417 |
– |
t.join(); |
| 418 |
– |
} |
| 419 |
– |
|
| 420 |
– |
/** |
| 341 |
|
* Take removes existing elements until empty, then blocks interruptibly |
| 342 |
|
*/ |
| 343 |
|
public void testBlockingTake() throws InterruptedException { |
| 344 |
< |
Thread t = new ThreadShouldThrow(InterruptedException.class) { |
| 344 |
> |
final DelayQueue q = populatedQueue(SIZE); |
| 345 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
| 346 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
| 347 |
|
public void realRun() throws InterruptedException { |
| 426 |
– |
DelayQueue q = populatedQueue(SIZE); |
| 348 |
|
for (int i = 0; i < SIZE; ++i) { |
| 349 |
< |
threadAssertEquals(new PDelay(i), ((PDelay)q.take())); |
| 349 |
> |
assertEquals(new PDelay(i), ((PDelay)q.take())); |
| 350 |
|
} |
| 430 |
– |
q.take(); |
| 431 |
– |
}}; |
| 351 |
|
|
| 352 |
< |
t.start(); |
| 353 |
< |
Thread.sleep(SHORT_DELAY_MS); |
| 352 |
> |
Thread.currentThread().interrupt(); |
| 353 |
> |
try { |
| 354 |
> |
q.take(); |
| 355 |
> |
shouldThrow(); |
| 356 |
> |
} catch (InterruptedException success) {} |
| 357 |
> |
assertFalse(Thread.interrupted()); |
| 358 |
> |
|
| 359 |
> |
pleaseInterrupt.countDown(); |
| 360 |
> |
try { |
| 361 |
> |
q.take(); |
| 362 |
> |
shouldThrow(); |
| 363 |
> |
} catch (InterruptedException success) {} |
| 364 |
> |
assertFalse(Thread.interrupted()); |
| 365 |
> |
}}); |
| 366 |
> |
|
| 367 |
> |
await(pleaseInterrupt); |
| 368 |
> |
assertThreadStaysAlive(t); |
| 369 |
|
t.interrupt(); |
| 370 |
< |
t.join(); |
| 370 |
> |
awaitTermination(t); |
| 371 |
|
} |
| 372 |
|
|
| 439 |
– |
|
| 373 |
|
/** |
| 374 |
|
* poll succeeds unless empty |
| 375 |
|
*/ |
| 382 |
|
} |
| 383 |
|
|
| 384 |
|
/** |
| 385 |
< |
* timed pool with zero timeout succeeds when non-empty, else times out |
| 385 |
> |
* timed poll with zero timeout succeeds when non-empty, else times out |
| 386 |
|
*/ |
| 387 |
|
public void testTimedPoll0() throws InterruptedException { |
| 388 |
|
DelayQueue q = populatedQueue(SIZE); |
| 393 |
|
} |
| 394 |
|
|
| 395 |
|
/** |
| 396 |
< |
* timed pool with nonzero timeout succeeds when non-empty, else times out |
| 396 |
> |
* timed poll with nonzero timeout succeeds when non-empty, else times out |
| 397 |
|
*/ |
| 398 |
|
public void testTimedPoll() throws InterruptedException { |
| 399 |
|
DelayQueue q = populatedQueue(SIZE); |
| 400 |
|
for (int i = 0; i < SIZE; ++i) { |
| 401 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS))); |
| 402 |
< |
} |
| 403 |
< |
assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
| 401 |
> |
long startTime = System.nanoTime(); |
| 402 |
> |
assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS))); |
| 403 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
| 404 |
> |
} |
| 405 |
> |
long startTime = System.nanoTime(); |
| 406 |
> |
assertNull(q.poll(timeoutMillis(), MILLISECONDS)); |
| 407 |
> |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
| 408 |
> |
checkEmpty(q); |
| 409 |
|
} |
| 410 |
|
|
| 411 |
|
/** |
| 413 |
|
* returning timeout status |
| 414 |
|
*/ |
| 415 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
| 416 |
< |
Thread t = new Thread(new CheckedRunnable() { |
| 416 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
| 417 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
| 418 |
|
public void realRun() throws InterruptedException { |
| 419 |
|
DelayQueue q = populatedQueue(SIZE); |
| 420 |
|
for (int i = 0; i < SIZE; ++i) { |
| 421 |
|
assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS))); |
| 422 |
|
} |
| 423 |
+ |
|
| 424 |
+ |
Thread.currentThread().interrupt(); |
| 425 |
|
try { |
| 426 |
|
q.poll(LONG_DELAY_MS, MILLISECONDS); |
| 427 |
|
shouldThrow(); |
| 428 |
|
} catch (InterruptedException success) {} |
| 429 |
< |
}}); |
| 429 |
> |
assertFalse(Thread.interrupted()); |
| 430 |
|
|
| 431 |
< |
t.start(); |
| 491 |
< |
Thread.sleep(SHORT_DELAY_MS); |
| 492 |
< |
t.interrupt(); |
| 493 |
< |
t.join(); |
| 494 |
< |
} |
| 495 |
< |
|
| 496 |
< |
/** |
| 497 |
< |
* timed poll before a delayed offer fails; after offer succeeds; |
| 498 |
< |
* on interruption throws |
| 499 |
< |
*/ |
| 500 |
< |
public void testTimedPollWithOffer() throws InterruptedException { |
| 501 |
< |
final DelayQueue q = new DelayQueue(); |
| 502 |
< |
Thread t = new Thread(new CheckedRunnable() { |
| 503 |
< |
public void realRun() throws InterruptedException { |
| 504 |
< |
assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
| 505 |
< |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
| 431 |
> |
pleaseInterrupt.countDown(); |
| 432 |
|
try { |
| 433 |
|
q.poll(LONG_DELAY_MS, MILLISECONDS); |
| 434 |
|
shouldThrow(); |
| 435 |
|
} catch (InterruptedException success) {} |
| 436 |
+ |
assertFalse(Thread.interrupted()); |
| 437 |
|
}}); |
| 438 |
|
|
| 439 |
< |
t.start(); |
| 440 |
< |
Thread.sleep(SMALL_DELAY_MS); |
| 514 |
< |
assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS)); |
| 439 |
> |
await(pleaseInterrupt); |
| 440 |
> |
assertThreadStaysAlive(t); |
| 441 |
|
t.interrupt(); |
| 442 |
< |
t.join(); |
| 442 |
> |
awaitTermination(t); |
| 443 |
|
} |
| 444 |
|
|
| 519 |
– |
|
| 445 |
|
/** |
| 446 |
|
* peek returns next element, or null if empty |
| 447 |
|
*/ |
| 449 |
|
DelayQueue q = populatedQueue(SIZE); |
| 450 |
|
for (int i = 0; i < SIZE; ++i) { |
| 451 |
|
assertEquals(new PDelay(i), ((PDelay)q.peek())); |
| 452 |
< |
q.poll(); |
| 452 |
> |
assertEquals(new PDelay(i), ((PDelay)q.poll())); |
| 453 |
|
if (q.isEmpty()) |
| 454 |
|
assertNull(q.peek()); |
| 455 |
|
else |
| 456 |
< |
assertTrue(i != ((PDelay)q.peek()).intValue()); |
| 456 |
> |
assertFalse(new PDelay(i).equals(q.peek())); |
| 457 |
|
} |
| 458 |
|
assertNull(q.peek()); |
| 459 |
|
} |
| 488 |
|
} |
| 489 |
|
|
| 490 |
|
/** |
| 566 |
– |
* remove(x) removes x and returns true if present |
| 567 |
– |
*/ |
| 568 |
– |
public void testRemoveElement() { |
| 569 |
– |
DelayQueue q = populatedQueue(SIZE); |
| 570 |
– |
for (int i = 1; i < SIZE; i+=2) { |
| 571 |
– |
assertTrue(q.remove(new PDelay(i))); |
| 572 |
– |
} |
| 573 |
– |
for (int i = 0; i < SIZE; i+=2) { |
| 574 |
– |
assertTrue(q.remove(new PDelay(i))); |
| 575 |
– |
assertFalse(q.remove(new PDelay(i+1))); |
| 576 |
– |
} |
| 577 |
– |
assertTrue(q.isEmpty()); |
| 578 |
– |
} |
| 579 |
– |
|
| 580 |
– |
/** |
| 491 |
|
* contains(x) reports true when elements added but not yet removed |
| 492 |
|
*/ |
| 493 |
|
public void testContains() { |
| 573 |
|
Object[] o = q.toArray(); |
| 574 |
|
Arrays.sort(o); |
| 575 |
|
for (int i = 0; i < o.length; i++) |
| 576 |
< |
assertEquals(o[i], q.take()); |
| 576 |
> |
assertSame(o[i], q.take()); |
| 577 |
|
} |
| 578 |
|
|
| 579 |
|
/** |
| 580 |
|
* toArray(a) contains all elements |
| 581 |
|
*/ |
| 582 |
< |
public void testToArray2() throws InterruptedException { |
| 583 |
< |
DelayQueue q = populatedQueue(SIZE); |
| 582 |
> |
public void testToArray2() { |
| 583 |
> |
DelayQueue<PDelay> q = populatedQueue(SIZE); |
| 584 |
|
PDelay[] ints = new PDelay[SIZE]; |
| 585 |
< |
ints = (PDelay[])q.toArray(ints); |
| 585 |
> |
PDelay[] array = q.toArray(ints); |
| 586 |
> |
assertSame(ints, array); |
| 587 |
|
Arrays.sort(ints); |
| 588 |
|
for (int i = 0; i < ints.length; i++) |
| 589 |
< |
assertEquals(ints[i], q.take()); |
| 589 |
> |
assertSame(ints[i], q.remove()); |
| 590 |
|
} |
| 591 |
|
|
| 681 |
– |
|
| 592 |
|
/** |
| 593 |
< |
* toArray(null) throws NPE |
| 684 |
< |
*/ |
| 685 |
< |
public void testToArray_BadArg() { |
| 686 |
< |
try { |
| 687 |
< |
DelayQueue q = populatedQueue(SIZE); |
| 688 |
< |
Object o[] = q.toArray(null); |
| 689 |
< |
shouldThrow(); |
| 690 |
< |
} catch (NullPointerException success) {} |
| 691 |
< |
} |
| 692 |
< |
|
| 693 |
< |
/** |
| 694 |
< |
* toArray with incompatible array type throws CCE |
| 593 |
> |
* toArray(incompatible array type) throws ArrayStoreException |
| 594 |
|
*/ |
| 595 |
|
public void testToArray1_BadArg() { |
| 596 |
+ |
DelayQueue q = populatedQueue(SIZE); |
| 597 |
|
try { |
| 598 |
< |
DelayQueue q = populatedQueue(SIZE); |
| 699 |
< |
Object o[] = q.toArray(new String[10] ); |
| 598 |
> |
q.toArray(new String[10]); |
| 599 |
|
shouldThrow(); |
| 600 |
|
} catch (ArrayStoreException success) {} |
| 601 |
|
} |
| 617 |
|
/** |
| 618 |
|
* iterator.remove removes current element |
| 619 |
|
*/ |
| 620 |
< |
public void testIteratorRemove () { |
| 620 |
> |
public void testIteratorRemove() { |
| 621 |
|
final DelayQueue q = new DelayQueue(); |
| 622 |
|
q.add(new PDelay(2)); |
| 623 |
|
q.add(new PDelay(1)); |
| 626 |
|
it.next(); |
| 627 |
|
it.remove(); |
| 628 |
|
it = q.iterator(); |
| 629 |
< |
assertEquals(it.next(), new PDelay(2)); |
| 630 |
< |
assertEquals(it.next(), new PDelay(3)); |
| 629 |
> |
assertEquals(new PDelay(2), it.next()); |
| 630 |
> |
assertEquals(new PDelay(3), it.next()); |
| 631 |
|
assertFalse(it.hasNext()); |
| 632 |
|
} |
| 633 |
|
|
| 735 |
– |
|
| 634 |
|
/** |
| 635 |
|
* toString contains toStrings of elements |
| 636 |
|
*/ |
| 637 |
|
public void testToString() { |
| 638 |
|
DelayQueue q = populatedQueue(SIZE); |
| 639 |
|
String s = q.toString(); |
| 640 |
< |
for (int i = 0; i < SIZE; ++i) { |
| 641 |
< |
assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0); |
| 744 |
< |
} |
| 640 |
> |
for (Object e : q) |
| 641 |
> |
assertTrue(s.contains(e.toString())); |
| 642 |
|
} |
| 643 |
|
|
| 644 |
|
/** |
| 645 |
< |
* offer transfers elements across Executor tasks |
| 645 |
> |
* timed poll transfers elements across Executor tasks |
| 646 |
|
*/ |
| 647 |
|
public void testPollInExecutor() { |
| 648 |
|
final DelayQueue q = new DelayQueue(); |
| 649 |
+ |
final CheckedBarrier threadsStarted = new CheckedBarrier(2); |
| 650 |
|
ExecutorService executor = Executors.newFixedThreadPool(2); |
| 651 |
|
executor.execute(new CheckedRunnable() { |
| 652 |
|
public void realRun() throws InterruptedException { |
| 653 |
< |
threadAssertNull(q.poll()); |
| 654 |
< |
threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); |
| 655 |
< |
threadAssertTrue(q.isEmpty()); |
| 653 |
> |
assertNull(q.poll()); |
| 654 |
> |
threadsStarted.await(); |
| 655 |
> |
assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS)); |
| 656 |
> |
checkEmpty(q); |
| 657 |
|
}}); |
| 658 |
|
|
| 659 |
|
executor.execute(new CheckedRunnable() { |
| 660 |
|
public void realRun() throws InterruptedException { |
| 661 |
< |
Thread.sleep(SHORT_DELAY_MS); |
| 661 |
> |
threadsStarted.await(); |
| 662 |
|
q.put(new PDelay(1)); |
| 663 |
|
}}); |
| 664 |
|
|
| 665 |
|
joinPool(executor); |
| 767 |
– |
|
| 666 |
|
} |
| 667 |
|
|
| 770 |
– |
|
| 668 |
|
/** |
| 669 |
|
* Delayed actions do not occur until their delay elapses |
| 670 |
|
*/ |
| 671 |
|
public void testDelay() throws InterruptedException { |
| 672 |
< |
DelayQueue q = new DelayQueue(); |
| 673 |
< |
NanoDelay[] elements = new NanoDelay[SIZE]; |
| 674 |
< |
for (int i = 0; i < SIZE; ++i) { |
| 778 |
< |
elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i)); |
| 779 |
< |
} |
| 780 |
< |
for (int i = 0; i < SIZE; ++i) { |
| 781 |
< |
q.add(elements[i]); |
| 782 |
< |
} |
| 672 |
> |
DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>(); |
| 673 |
> |
for (int i = 0; i < SIZE; ++i) |
| 674 |
> |
q.add(new NanoDelay(1000000L * (SIZE - i))); |
| 675 |
|
|
| 676 |
|
long last = 0; |
| 677 |
|
for (int i = 0; i < SIZE; ++i) { |
| 678 |
< |
NanoDelay e = (NanoDelay)(q.take()); |
| 678 |
> |
NanoDelay e = q.take(); |
| 679 |
|
long tt = e.getTriggerTime(); |
| 680 |
< |
assertTrue(tt <= System.nanoTime()); |
| 680 |
> |
assertTrue(System.nanoTime() - tt >= 0); |
| 681 |
|
if (i != 0) |
| 682 |
|
assertTrue(tt >= last); |
| 683 |
|
last = tt; |
| 684 |
|
} |
| 685 |
+ |
assertTrue(q.isEmpty()); |
| 686 |
|
} |
| 687 |
|
|
| 688 |
|
/** |
| 691 |
|
public void testPeekDelayed() { |
| 692 |
|
DelayQueue q = new DelayQueue(); |
| 693 |
|
q.add(new NanoDelay(Long.MAX_VALUE)); |
| 694 |
< |
assert(q.peek() != null); |
| 694 |
> |
assertNotNull(q.peek()); |
| 695 |
|
} |
| 696 |
|
|
| 804 |
– |
|
| 697 |
|
/** |
| 698 |
|
* poll of a non-empty queue returns null if no expired elements. |
| 699 |
|
*/ |
| 709 |
|
public void testTimedPollDelayed() throws InterruptedException { |
| 710 |
|
DelayQueue q = new DelayQueue(); |
| 711 |
|
q.add(new NanoDelay(LONG_DELAY_MS * 1000000L)); |
| 712 |
< |
assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
| 821 |
< |
} |
| 822 |
< |
|
| 823 |
< |
/** |
| 824 |
< |
* drainTo(null) throws NPE |
| 825 |
< |
*/ |
| 826 |
< |
public void testDrainToNull() { |
| 827 |
< |
DelayQueue q = populatedQueue(SIZE); |
| 828 |
< |
try { |
| 829 |
< |
q.drainTo(null); |
| 830 |
< |
shouldThrow(); |
| 831 |
< |
} catch (NullPointerException success) {} |
| 832 |
< |
} |
| 833 |
< |
|
| 834 |
< |
/** |
| 835 |
< |
* drainTo(this) throws IAE |
| 836 |
< |
*/ |
| 837 |
< |
public void testDrainToSelf() { |
| 838 |
< |
DelayQueue q = populatedQueue(SIZE); |
| 839 |
< |
try { |
| 840 |
< |
q.drainTo(q); |
| 841 |
< |
shouldThrow(); |
| 842 |
< |
} catch (IllegalArgumentException success) {} |
| 712 |
> |
assertNull(q.poll(timeoutMillis(), MILLISECONDS)); |
| 713 |
|
} |
| 714 |
|
|
| 715 |
|
/** |
| 724 |
|
} |
| 725 |
|
ArrayList l = new ArrayList(); |
| 726 |
|
q.drainTo(l); |
| 727 |
< |
assertEquals(q.size(), 0); |
| 727 |
> |
assertEquals(0, q.size()); |
| 728 |
|
for (int i = 0; i < SIZE; ++i) |
| 729 |
< |
assertEquals(l.get(i), elems[i]); |
| 729 |
> |
assertEquals(elems[i], l.get(i)); |
| 730 |
|
q.add(elems[0]); |
| 731 |
|
q.add(elems[1]); |
| 732 |
|
assertFalse(q.isEmpty()); |
| 734 |
|
assertTrue(q.contains(elems[1])); |
| 735 |
|
l.clear(); |
| 736 |
|
q.drainTo(l); |
| 737 |
< |
assertEquals(q.size(), 0); |
| 738 |
< |
assertEquals(l.size(), 2); |
| 737 |
> |
assertEquals(0, q.size()); |
| 738 |
> |
assertEquals(2, l.size()); |
| 739 |
|
for (int i = 0; i < 2; ++i) |
| 740 |
< |
assertEquals(l.get(i), elems[i]); |
| 740 |
> |
assertEquals(elems[i], l.get(i)); |
| 741 |
|
} |
| 742 |
|
|
| 743 |
|
/** |
| 759 |
|
} |
| 760 |
|
|
| 761 |
|
/** |
| 762 |
< |
* drainTo(null, n) throws NPE |
| 893 |
< |
*/ |
| 894 |
< |
public void testDrainToNullN() { |
| 895 |
< |
DelayQueue q = populatedQueue(SIZE); |
| 896 |
< |
try { |
| 897 |
< |
q.drainTo(null, 0); |
| 898 |
< |
shouldThrow(); |
| 899 |
< |
} catch (NullPointerException success) {} |
| 900 |
< |
} |
| 901 |
< |
|
| 902 |
< |
/** |
| 903 |
< |
* drainTo(this, n) throws IAE |
| 904 |
< |
*/ |
| 905 |
< |
public void testDrainToSelfN() { |
| 906 |
< |
DelayQueue q = populatedQueue(SIZE); |
| 907 |
< |
try { |
| 908 |
< |
q.drainTo(q, 0); |
| 909 |
< |
shouldThrow(); |
| 910 |
< |
} catch (IllegalArgumentException success) {} |
| 911 |
< |
} |
| 912 |
< |
|
| 913 |
< |
/** |
| 914 |
< |
* drainTo(c, n) empties first max {n, size} elements of queue into c |
| 762 |
> |
* drainTo(c, n) empties first min(n, size) elements of queue into c |
| 763 |
|
*/ |
| 764 |
|
public void testDrainToN() { |
| 765 |
|
for (int i = 0; i < SIZE + 2; ++i) { |
| 766 |
|
DelayQueue q = populatedQueue(SIZE); |
| 767 |
|
ArrayList l = new ArrayList(); |
| 768 |
|
q.drainTo(l, i); |
| 769 |
< |
int k = (i < SIZE)? i : SIZE; |
| 770 |
< |
assertEquals(q.size(), SIZE-k); |
| 771 |
< |
assertEquals(l.size(), k); |
| 769 |
> |
int k = (i < SIZE) ? i : SIZE; |
| 770 |
> |
assertEquals(SIZE-k, q.size()); |
| 771 |
> |
assertEquals(k, l.size()); |
| 772 |
|
} |
| 773 |
|
} |
| 774 |
|
|
| 775 |
< |
|
| 775 |
> |
/** |
| 776 |
> |
* remove(null), contains(null) always return false |
| 777 |
> |
*/ |
| 778 |
> |
public void testNeverContainsNull() { |
| 779 |
> |
Collection<?> q = populatedQueue(SIZE); |
| 780 |
> |
assertFalse(q.contains(null)); |
| 781 |
> |
assertFalse(q.remove(null)); |
| 782 |
> |
} |
| 783 |
|
} |
