ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/DelayQueueTest.java

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.27 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.43 by jsr166, Wed Nov 3 16:46:34 2010 UTC

#	Line 13 | Line 13 | import java.util.concurrent.*;
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() {
#	Line 24 | Line 24 | public class DelayQueueTest extends JSR1
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 {
#	Line 32 | Line 32 | public class DelayQueueTest extends JSR1
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
#	Line 77 | Line 73 | public class DelayQueueTest extends JSR1
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) {
#	Line 199 | Line 191 | public class DelayQueueTest extends JSR1
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() {
#	Line 292 | Line 284 | public class DelayQueueTest extends JSR1
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
#	Line 398 | Line 391 | public class DelayQueueTest extends JSR1
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		/**
#	Line 446 | Line 448 | public class DelayQueueTest extends JSR1
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);
#	Line 457 | Line 459 | public class DelayQueueTest extends JSR1
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);
#	Line 491 | Line 493 | public class DelayQueueTest extends JSR1
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	<	assertSame(pdelay, 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(LONG_DELAY_MS, MILLISECONDS);
512	>	q.poll(SHORT_DELAY_MS, MILLISECONDS);
513	>	shouldThrow();
514	>	} catch (InterruptedException success) {}
515	>
516	>	barrier.await();
517	>	try {
518	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
519		shouldThrow();
520		} catch (InterruptedException success) {}
521		}});
522
523		t.start();
524	<	Thread.sleep(SMALL_DELAY_MS);
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		}
#	Line 678 | Line 693 | public class DelayQueueTest extends JSR1
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	<	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	<	Object o[] = q.toArray(new String[10]);
712	>	q.toArray(new String[10]);
713		shouldThrow();
714		} catch (ArrayStoreException success) {}
715		}
#	Line 716 | Line 731 | public class DelayQueueTest extends JSR1
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));
#	Line 762 | Line 777 | public class DelayQueueTest extends JSR1
777		}});
778
779		joinPool(executor);
765	–
780		}
781
782
#	Line 770 | Line 784 | public class DelayQueueTest extends JSR1
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) {
776	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
777	<	}
778	<	for (int i = 0; i < SIZE; ++i) {
779	<	q.add(elements[i]);
780	<	}
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		/**
#	Line 796 | Line 806 | public class DelayQueueTest extends JSR1
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
#	Line 909 | Line 919 | public class DelayQueueTest extends JSR1
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		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines