13 |
|
|
14 |
|
public class DelayQueueTest extends JSR166TestCase { |
15 |
|
public static void main(String[] args) { |
16 |
< |
junit.textui.TestRunner.run (suite()); |
16 |
> |
junit.textui.TestRunner.run(suite()); |
17 |
|
} |
18 |
|
|
19 |
|
public static Test suite() { |
24 |
|
|
25 |
|
/** |
26 |
|
* A delayed implementation for testing. |
27 |
< |
* Most tests use Pseudodelays, where delays are all elapsed |
27 |
> |
* Most tests use Pseudodelays, where delays are all elapsed |
28 |
|
* (so, no blocking solely for delays) but are still ordered |
29 |
|
*/ |
30 |
|
static class PDelay implements Delayed { |
32 |
|
PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; } |
33 |
|
public int compareTo(PDelay y) { |
34 |
|
int i = pseudodelay; |
35 |
< |
int j = ((PDelay)y).pseudodelay; |
35 |
> |
int j = y.pseudodelay; |
36 |
|
if (i < j) return -1; |
37 |
|
if (i > j) return 1; |
38 |
|
return 0; |
39 |
|
} |
40 |
|
|
41 |
|
public int compareTo(Delayed y) { |
42 |
< |
int i = pseudodelay; |
43 |
< |
int j = ((PDelay)y).pseudodelay; |
44 |
< |
if (i < j) return -1; |
45 |
< |
if (i > j) return 1; |
46 |
< |
return 0; |
42 |
> |
return compareTo((PDelay)y); |
43 |
|
} |
44 |
|
|
45 |
|
public boolean equals(Object other) { |
46 |
< |
return ((PDelay)other).pseudodelay == pseudodelay; |
46 |
> |
return equals((PDelay)other); |
47 |
|
} |
48 |
|
public boolean equals(PDelay other) { |
49 |
< |
return ((PDelay)other).pseudodelay == pseudodelay; |
49 |
> |
return other.pseudodelay == pseudodelay; |
50 |
|
} |
51 |
|
|
52 |
|
|
73 |
|
} |
74 |
|
public int compareTo(NanoDelay y) { |
75 |
|
long i = trigger; |
76 |
< |
long j = ((NanoDelay)y).trigger; |
76 |
> |
long j = y.trigger; |
77 |
|
if (i < j) return -1; |
78 |
|
if (i > j) return 1; |
79 |
|
return 0; |
80 |
|
} |
81 |
|
|
82 |
|
public int compareTo(Delayed y) { |
83 |
< |
long i = trigger; |
88 |
< |
long j = ((NanoDelay)y).trigger; |
89 |
< |
if (i < j) return -1; |
90 |
< |
if (i > j) return 1; |
91 |
< |
return 0; |
83 |
> |
return compareTo((NanoDelay)y); |
84 |
|
} |
85 |
|
|
86 |
|
public boolean equals(Object other) { |
87 |
< |
return ((NanoDelay)other).trigger == trigger; |
87 |
> |
return equals((NanoDelay)other); |
88 |
|
} |
89 |
|
public boolean equals(NanoDelay other) { |
90 |
< |
return ((NanoDelay)other).trigger == trigger; |
90 |
> |
return other.trigger == trigger; |
91 |
|
} |
92 |
|
|
93 |
|
public long getDelay(TimeUnit unit) { |
191 |
|
} |
192 |
|
|
193 |
|
/** |
194 |
< |
* remainingCapacity does not change when elementa added or removed, |
194 |
> |
* remainingCapacity does not change when elements added or removed, |
195 |
|
* but size does |
196 |
|
*/ |
197 |
|
public void testRemainingCapacity() { |
284 |
|
shouldThrow(); |
285 |
|
} catch (NullPointerException success) {} |
286 |
|
} |
287 |
+ |
|
288 |
|
/** |
289 |
|
* addAll of a collection with any null elements throws NPE after |
290 |
|
* possibly adding some elements |
368 |
|
public void realRun() throws InterruptedException { |
369 |
|
q.put(new PDelay(0)); |
370 |
|
q.put(new PDelay(0)); |
371 |
< |
threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS)); |
372 |
< |
threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS)); |
371 |
> |
assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS)); |
372 |
> |
assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS)); |
373 |
|
}}); |
374 |
|
|
375 |
|
t.start(); |
391 |
|
/** |
392 |
|
* take blocks interruptibly when empty |
393 |
|
*/ |
394 |
< |
public void testTakeFromEmpty() throws InterruptedException { |
395 |
< |
final DelayQueue q = new DelayQueue(); |
396 |
< |
Thread t = new ThreadShouldThrow(InterruptedException.class) { |
397 |
< |
public void realRun() throws InterruptedException { |
398 |
< |
q.take(); |
399 |
< |
}}; |
400 |
< |
|
401 |
< |
t.start(); |
394 |
> |
public void testTakeFromEmptyBlocksInterruptibly() |
395 |
> |
throws InterruptedException { |
396 |
> |
final BlockingQueue q = new DelayQueue(); |
397 |
> |
final CountDownLatch threadStarted = new CountDownLatch(1); |
398 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
399 |
> |
public void realRun() { |
400 |
> |
long t0 = System.nanoTime(); |
401 |
> |
threadStarted.countDown(); |
402 |
> |
try { |
403 |
> |
q.take(); |
404 |
> |
shouldThrow(); |
405 |
> |
} catch (InterruptedException expected) {} |
406 |
> |
assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS); |
407 |
> |
}}); |
408 |
> |
threadStarted.await(); |
409 |
|
Thread.sleep(SHORT_DELAY_MS); |
410 |
+ |
assertTrue(t.isAlive()); |
411 |
|
t.interrupt(); |
412 |
< |
t.join(); |
412 |
> |
awaitTermination(t, MEDIUM_DELAY_MS); |
413 |
> |
assertFalse(t.isAlive()); |
414 |
|
} |
415 |
|
|
416 |
|
/** |
417 |
|
* Take removes existing elements until empty, then blocks interruptibly |
418 |
|
*/ |
419 |
|
public void testBlockingTake() throws InterruptedException { |
420 |
< |
Thread t = new ThreadShouldThrow(InterruptedException.class) { |
420 |
> |
final DelayQueue q = populatedQueue(SIZE); |
421 |
> |
Thread t = new Thread(new CheckedRunnable() { |
422 |
|
public void realRun() throws InterruptedException { |
420 |
– |
DelayQueue q = populatedQueue(SIZE); |
423 |
|
for (int i = 0; i < SIZE; ++i) { |
424 |
< |
threadAssertEquals(new PDelay(i), ((PDelay)q.take())); |
424 |
> |
assertEquals(new PDelay(i), ((PDelay)q.take())); |
425 |
|
} |
426 |
< |
q.take(); |
427 |
< |
}}; |
426 |
> |
try { |
427 |
> |
q.take(); |
428 |
> |
shouldThrow(); |
429 |
> |
} catch (InterruptedException success) {} |
430 |
> |
}}); |
431 |
|
|
432 |
|
t.start(); |
433 |
|
Thread.sleep(SHORT_DELAY_MS); |
448 |
|
} |
449 |
|
|
450 |
|
/** |
451 |
< |
* timed pool with zero timeout succeeds when non-empty, else times out |
451 |
> |
* timed poll with zero timeout succeeds when non-empty, else times out |
452 |
|
*/ |
453 |
|
public void testTimedPoll0() throws InterruptedException { |
454 |
|
DelayQueue q = populatedQueue(SIZE); |
459 |
|
} |
460 |
|
|
461 |
|
/** |
462 |
< |
* timed pool with nonzero timeout succeeds when non-empty, else times out |
462 |
> |
* timed poll with nonzero timeout succeeds when non-empty, else times out |
463 |
|
*/ |
464 |
|
public void testTimedPoll() throws InterruptedException { |
465 |
|
DelayQueue q = populatedQueue(SIZE); |
481 |
|
assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS))); |
482 |
|
} |
483 |
|
try { |
484 |
< |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
484 |
> |
q.poll(SMALL_DELAY_MS, MILLISECONDS); |
485 |
|
shouldThrow(); |
486 |
|
} catch (InterruptedException success) {} |
487 |
|
}}); |
493 |
|
} |
494 |
|
|
495 |
|
/** |
496 |
< |
* timed poll before a delayed offer fails; after offer succeeds; |
497 |
< |
* on interruption throws |
496 |
> |
* timed poll before a delayed offer fails; after offer succeeds; |
497 |
> |
* on interruption throws |
498 |
|
*/ |
499 |
|
public void testTimedPollWithOffer() throws InterruptedException { |
500 |
|
final DelayQueue q = new DelayQueue(); |
501 |
+ |
final PDelay pdelay = new PDelay(0); |
502 |
+ |
final CheckedBarrier barrier = new CheckedBarrier(2); |
503 |
|
Thread t = new Thread(new CheckedRunnable() { |
504 |
|
public void realRun() throws InterruptedException { |
505 |
|
assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
506 |
< |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
506 |
> |
|
507 |
> |
barrier.await(); |
508 |
> |
assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); |
509 |
> |
|
510 |
> |
Thread.currentThread().interrupt(); |
511 |
> |
try { |
512 |
> |
q.poll(SHORT_DELAY_MS, MILLISECONDS); |
513 |
> |
shouldThrow(); |
514 |
> |
} catch (InterruptedException success) {} |
515 |
> |
|
516 |
> |
barrier.await(); |
517 |
|
try { |
518 |
< |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
518 |
> |
q.poll(MEDIUM_DELAY_MS, MILLISECONDS); |
519 |
|
shouldThrow(); |
520 |
|
} catch (InterruptedException success) {} |
521 |
|
}}); |
522 |
|
|
523 |
|
t.start(); |
524 |
< |
Thread.sleep(SMALL_DELAY_MS); |
525 |
< |
assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS)); |
524 |
> |
barrier.await(); |
525 |
> |
assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS)); |
526 |
> |
barrier.await(); |
527 |
> |
sleep(SHORT_DELAY_MS); |
528 |
|
t.interrupt(); |
529 |
|
t.join(); |
530 |
|
} |
537 |
|
DelayQueue q = populatedQueue(SIZE); |
538 |
|
for (int i = 0; i < SIZE; ++i) { |
539 |
|
assertEquals(new PDelay(i), ((PDelay)q.peek())); |
540 |
< |
q.poll(); |
540 |
> |
assertEquals(new PDelay(i), ((PDelay)q.poll())); |
541 |
|
if (q.isEmpty()) |
542 |
|
assertNull(q.peek()); |
543 |
|
else |
544 |
< |
assertTrue(i != ((PDelay)q.peek()).intValue()); |
544 |
> |
assertFalse(new PDelay(i).equals(q.peek())); |
545 |
|
} |
546 |
|
assertNull(q.peek()); |
547 |
|
} |
676 |
|
Object[] o = q.toArray(); |
677 |
|
Arrays.sort(o); |
678 |
|
for (int i = 0; i < o.length; i++) |
679 |
< |
assertEquals(o[i], q.take()); |
679 |
> |
assertSame(o[i], q.take()); |
680 |
|
} |
681 |
|
|
682 |
|
/** |
683 |
|
* toArray(a) contains all elements |
684 |
|
*/ |
685 |
< |
public void testToArray2() throws InterruptedException { |
685 |
> |
public void testToArray2() { |
686 |
|
DelayQueue q = populatedQueue(SIZE); |
687 |
|
PDelay[] ints = new PDelay[SIZE]; |
688 |
< |
ints = (PDelay[])q.toArray(ints); |
688 |
> |
assertSame(ints, q.toArray(ints)); |
689 |
|
Arrays.sort(ints); |
690 |
|
for (int i = 0; i < ints.length; i++) |
691 |
< |
assertEquals(ints[i], q.take()); |
691 |
> |
assertSame(ints[i], q.remove()); |
692 |
|
} |
693 |
|
|
694 |
|
|
695 |
|
/** |
696 |
< |
* toArray(null) throws NPE |
696 |
> |
* toArray(null) throws NullPointerException |
697 |
|
*/ |
698 |
< |
public void testToArray_BadArg() { |
698 |
> |
public void testToArray_NullArg() { |
699 |
> |
DelayQueue q = populatedQueue(SIZE); |
700 |
|
try { |
701 |
< |
DelayQueue q = populatedQueue(SIZE); |
682 |
< |
Object o[] = q.toArray(null); |
701 |
> |
q.toArray(null); |
702 |
|
shouldThrow(); |
703 |
|
} catch (NullPointerException success) {} |
704 |
|
} |
705 |
|
|
706 |
|
/** |
707 |
< |
* toArray with incompatible array type throws CCE |
707 |
> |
* toArray(incompatible array type) throws ArrayStoreException |
708 |
|
*/ |
709 |
|
public void testToArray1_BadArg() { |
710 |
+ |
DelayQueue q = populatedQueue(SIZE); |
711 |
|
try { |
712 |
< |
DelayQueue q = populatedQueue(SIZE); |
693 |
< |
Object o[] = q.toArray(new String[10] ); |
712 |
> |
q.toArray(new String[10]); |
713 |
|
shouldThrow(); |
714 |
|
} catch (ArrayStoreException success) {} |
715 |
|
} |
731 |
|
/** |
732 |
|
* iterator.remove removes current element |
733 |
|
*/ |
734 |
< |
public void testIteratorRemove () { |
734 |
> |
public void testIteratorRemove() { |
735 |
|
final DelayQueue q = new DelayQueue(); |
736 |
|
q.add(new PDelay(2)); |
737 |
|
q.add(new PDelay(1)); |
765 |
|
ExecutorService executor = Executors.newFixedThreadPool(2); |
766 |
|
executor.execute(new CheckedRunnable() { |
767 |
|
public void realRun() throws InterruptedException { |
768 |
< |
threadAssertNull(q.poll()); |
769 |
< |
threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); |
770 |
< |
threadAssertTrue(q.isEmpty()); |
768 |
> |
assertNull(q.poll()); |
769 |
> |
assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); |
770 |
> |
assertTrue(q.isEmpty()); |
771 |
|
}}); |
772 |
|
|
773 |
|
executor.execute(new CheckedRunnable() { |
777 |
|
}}); |
778 |
|
|
779 |
|
joinPool(executor); |
761 |
– |
|
780 |
|
} |
781 |
|
|
782 |
|
|
784 |
|
* Delayed actions do not occur until their delay elapses |
785 |
|
*/ |
786 |
|
public void testDelay() throws InterruptedException { |
787 |
< |
DelayQueue q = new DelayQueue(); |
788 |
< |
NanoDelay[] elements = new NanoDelay[SIZE]; |
789 |
< |
for (int i = 0; i < SIZE; ++i) { |
772 |
< |
elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i)); |
773 |
< |
} |
774 |
< |
for (int i = 0; i < SIZE; ++i) { |
775 |
< |
q.add(elements[i]); |
776 |
< |
} |
787 |
> |
DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>(); |
788 |
> |
for (int i = 0; i < SIZE; ++i) |
789 |
> |
q.add(new NanoDelay(1000000L * (SIZE - i))); |
790 |
|
|
791 |
|
long last = 0; |
792 |
|
for (int i = 0; i < SIZE; ++i) { |
793 |
< |
NanoDelay e = (NanoDelay)(q.take()); |
793 |
> |
NanoDelay e = q.take(); |
794 |
|
long tt = e.getTriggerTime(); |
795 |
< |
assertTrue(tt <= System.nanoTime()); |
795 |
> |
assertTrue(System.nanoTime() - tt >= 0); |
796 |
|
if (i != 0) |
797 |
|
assertTrue(tt >= last); |
798 |
|
last = tt; |
799 |
|
} |
800 |
+ |
assertTrue(q.isEmpty()); |
801 |
|
} |
802 |
|
|
803 |
|
/** |
806 |
|
public void testPeekDelayed() { |
807 |
|
DelayQueue q = new DelayQueue(); |
808 |
|
q.add(new NanoDelay(Long.MAX_VALUE)); |
809 |
< |
assert(q.peek() != null); |
809 |
> |
assertNotNull(q.peek()); |
810 |
|
} |
811 |
|
|
812 |
|
|
919 |
|
} |
920 |
|
|
921 |
|
/** |
922 |
< |
* drainTo(c, n) empties first max {n, size} elements of queue into c |
922 |
> |
* drainTo(c, n) empties first min(n, size) elements of queue into c |
923 |
|
*/ |
924 |
|
public void testDrainToN() { |
925 |
|
for (int i = 0; i < SIZE + 2; ++i) { |
926 |
|
DelayQueue q = populatedQueue(SIZE); |
927 |
|
ArrayList l = new ArrayList(); |
928 |
|
q.drainTo(l, i); |
929 |
< |
int k = (i < SIZE)? i : SIZE; |
929 |
> |
int k = (i < SIZE) ? i : SIZE; |
930 |
|
assertEquals(q.size(), SIZE-k); |
931 |
|
assertEquals(l.size(), k); |
932 |
|
} |