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.57 by jsr166, Sat Nov 26 05:19:17 2011 UTC vs.
Revision 1.76 by jsr166, Tue Oct 6 00:03:55 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
10	<	import java.util.Arrays;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>
11		import java.util.ArrayList;
12	+	import java.util.Arrays;
13	+	import java.util.Collection;
14		import java.util.Iterator;
15		import java.util.NoSuchElementException;
16		import java.util.concurrent.BlockingQueue;
#	Line 18 | Line 20 | import java.util.concurrent.DelayQueue;
20		import java.util.concurrent.Executors;
21		import java.util.concurrent.ExecutorService;
22		import java.util.concurrent.TimeUnit;
23	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
23	>
24	>	import junit.framework.Test;
25
26		public class DelayQueueTest extends JSR166TestCase {
27
#	Line 32 | Line 35 | public class DelayQueueTest extends JSR1
35		}
36
37		public static void main(String[] args) {
38	<	junit.textui.TestRunner.run(suite());
38	>	main(suite(), args);
39		}
40
41		public static Test suite() {
#	Line 40 | Line 43 | public class DelayQueueTest extends JSR1
43		new Generic().testSuite());
44		}
45
43	–	private static final int NOCAP = Integer.MAX_VALUE;
44	–
46		/**
47		* A delayed implementation for testing.
48		* Most tests use Pseudodelays, where delays are all elapsed
#	Line 62 | Line 63 | public class DelayQueueTest extends JSR1
63		return (other instanceof PDelay) &&
64		this.pseudodelay == ((PDelay)other).pseudodelay;
65		}
66	+	// suppress [overrides] javac warning
67	+	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69		return Integer.MIN_VALUE + pseudodelay;
70		}
#	Line 97 | Line 100 | public class DelayQueueTest extends JSR1
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);
#	Line 112 | Line 118 | public class DelayQueueTest extends JSR1
118		}
119
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<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)
127	>	for (int i = n - 1; i >= 0; i -= 2)
128		assertTrue(q.offer(new PDelay(i)));
129	<	for (int i = (n & 1); i < n; i+=2)
129	>	for (int i = (n & 1); i < n; i += 2)
130		assertTrue(q.offer(new PDelay(i)));
131		assertFalse(q.isEmpty());
132	<	assertEquals(NOCAP, q.remainingCapacity());
132	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
133		assertEquals(n, q.size());
134		return q;
135		}
#	Line 132 | Line 138 | public class DelayQueueTest extends JSR1
138		* A new queue has unbounded capacity
139		*/
140		public void testConstructor1() {
141	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
141	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
142		}
143
144		/**
#	Line 140 | Line 146 | public class DelayQueueTest extends JSR1
146		*/
147		public void testConstructor3() {
148		try {
149	<	DelayQueue q = new DelayQueue(null);
149	>	new DelayQueue(null);
150		shouldThrow();
151		} catch (NullPointerException success) {}
152		}
#	Line 150 | Line 156 | public class DelayQueueTest extends JSR1
156		*/
157		public void testConstructor4() {
158		try {
159	<	PDelay[] ints = new PDelay[SIZE];
154	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
159	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
160		shouldThrow();
161		} catch (NullPointerException success) {}
162		}
#	Line 160 | Line 165 | public class DelayQueueTest extends JSR1
165		* Initializing from Collection with some null elements throws NPE
166		*/
167		public void testConstructor5() {
168	+	PDelay[] a = new PDelay[SIZE];
169	+	for (int i = 0; i < SIZE - 1; ++i)
170	+	a[i] = new PDelay(i);
171		try {
172	<	PDelay[] ints = new PDelay[SIZE];
165	<	for (int i = 0; i < SIZE-1; ++i)
166	<	ints[i] = new PDelay(i);
167	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
172	>	new DelayQueue(Arrays.asList(a));
173		shouldThrow();
174		} catch (NullPointerException success) {}
175		}
#	Line 187 | Line 192 | public class DelayQueueTest extends JSR1
192		public void testEmpty() {
193		DelayQueue q = new DelayQueue();
194		assertTrue(q.isEmpty());
195	<	assertEquals(NOCAP, q.remainingCapacity());
195	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
196		q.add(new PDelay(1));
197		assertFalse(q.isEmpty());
198		q.add(new PDelay(2));
#	Line 197 | Line 202 | public class DelayQueueTest extends JSR1
202		}
203
204		/**
205	<	* remainingCapacity does not change when elements added or removed,
201	<	* but size does
205	>	* remainingCapacity() always returns Integer.MAX_VALUE
206		*/
207		public void testRemainingCapacity() {
208	<	DelayQueue q = populatedQueue(SIZE);
208	>	BlockingQueue q = populatedQueue(SIZE);
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
211	<	assertEquals(SIZE-i, q.size());
212	<	q.remove();
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211	>	assertEquals(SIZE - i, q.size());
212	>	assertTrue(q.remove() instanceof PDelay);
213		}
214		for (int i = 0; i < SIZE; ++i) {
215	<	assertEquals(NOCAP, q.remainingCapacity());
215	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
216		assertEquals(i, q.size());
217	<	q.add(new PDelay(i));
217	>	assertTrue(q.add(new PDelay(i)));
218		}
219		}
220
#	Line 238 | Line 242 | public class DelayQueueTest extends JSR1
242		* addAll(this) throws IAE
243		*/
244		public void testAddAllSelf() {
245	+	DelayQueue q = populatedQueue(SIZE);
246		try {
242	–	DelayQueue q = populatedQueue(SIZE);
247		q.addAll(q);
248		shouldThrow();
249		} catch (IllegalArgumentException success) {}
#	Line 250 | Line 254 | public class DelayQueueTest extends JSR1
254		* possibly adding some elements
255		*/
256		public void testAddAll3() {
257	+	DelayQueue q = new DelayQueue();
258	+	PDelay[] a = new PDelay[SIZE];
259	+	for (int i = 0; i < SIZE - 1; ++i)
260	+	a[i] = new PDelay(i);
261		try {
262	<	DelayQueue q = new DelayQueue();
255	<	PDelay[] ints = new PDelay[SIZE];
256	<	for (int i = 0; i < SIZE-1; ++i)
257	<	ints[i] = new PDelay(i);
258	<	q.addAll(Arrays.asList(ints));
262	>	q.addAll(Arrays.asList(a));
263		shouldThrow();
264		} catch (NullPointerException success) {}
265		}
#	Line 266 | Line 270 | public class DelayQueueTest extends JSR1
270		public void testAddAll5() {
271		PDelay[] empty = new PDelay[0];
272		PDelay[] ints = new PDelay[SIZE];
273	<	for (int i = SIZE-1; i >= 0; --i)
273	>	for (int i = SIZE - 1; i >= 0; --i)
274		ints[i] = new PDelay(i);
275		DelayQueue q = new DelayQueue();
276		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 281 | Line 285 | public class DelayQueueTest extends JSR1
285		public void testPut() {
286		DelayQueue q = new DelayQueue();
287		for (int i = 0; i < SIZE; ++i) {
288	<	PDelay I = new PDelay(i);
289	<	q.put(I);
290	<	assertTrue(q.contains(I));
288	>	PDelay x = new PDelay(i);
289	>	q.put(x);
290	>	assertTrue(q.contains(x));
291		}
292		assertEquals(SIZE, q.size());
293		}
#	Line 327 | Line 331 | public class DelayQueueTest extends JSR1
331		public void testTake() throws InterruptedException {
332		DelayQueue q = populatedQueue(SIZE);
333		for (int i = 0; i < SIZE; ++i) {
334	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
334	>	assertEquals(new PDelay(i), q.take());
335		}
336		}
337
#	Line 370 | Line 374 | public class DelayQueueTest extends JSR1
374		public void testPoll() {
375		DelayQueue q = populatedQueue(SIZE);
376		for (int i = 0; i < SIZE; ++i) {
377	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
377	>	assertEquals(new PDelay(i), q.poll());
378		}
379		assertNull(q.poll());
380		}
#	Line 381 | Line 385 | public class DelayQueueTest extends JSR1
385		public void testTimedPoll0() throws InterruptedException {
386		DelayQueue q = populatedQueue(SIZE);
387		for (int i = 0; i < SIZE; ++i) {
388	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
388	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
389		}
390		assertNull(q.poll(0, MILLISECONDS));
391		}
#	Line 393 | Line 397 | public class DelayQueueTest extends JSR1
397		DelayQueue q = populatedQueue(SIZE);
398		for (int i = 0; i < SIZE; ++i) {
399		long startTime = System.nanoTime();
400	<	assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
400	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
401		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
402		}
403		long startTime = System.nanoTime();
#	Line 408 | Line 412 | public class DelayQueueTest extends JSR1
412		*/
413		public void testInterruptedTimedPoll() throws InterruptedException {
414		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
415	+	final DelayQueue q = populatedQueue(SIZE);
416		Thread t = newStartedThread(new CheckedRunnable() {
417		public void realRun() throws InterruptedException {
418	<	DelayQueue q = populatedQueue(SIZE);
418	>	long startTime = System.nanoTime();
419		for (int i = 0; i < SIZE; ++i) {
420	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
420	>	assertEquals(new PDelay(i),
421	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
422		}
423
424		Thread.currentThread().interrupt();
#	Line 428 | Line 434 | public class DelayQueueTest extends JSR1
434		shouldThrow();
435		} catch (InterruptedException success) {}
436		assertFalse(Thread.interrupted());
437	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
438		}});
439
440		await(pleaseInterrupt);
441		assertThreadStaysAlive(t);
442		t.interrupt();
443		awaitTermination(t);
444	+	checkEmpty(q);
445		}
446
447		/**
#	Line 442 | Line 450 | public class DelayQueueTest extends JSR1
450		public void testPeek() {
451		DelayQueue q = populatedQueue(SIZE);
452		for (int i = 0; i < SIZE; ++i) {
453	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
454	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
453	>	assertEquals(new PDelay(i), q.peek());
454	>	assertEquals(new PDelay(i), q.poll());
455		if (q.isEmpty())
456		assertNull(q.peek());
457		else
#	Line 458 | Line 466 | public class DelayQueueTest extends JSR1
466		public void testElement() {
467		DelayQueue q = populatedQueue(SIZE);
468		for (int i = 0; i < SIZE; ++i) {
469	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
469	>	assertEquals(new PDelay(i), q.element());
470		q.poll();
471		}
472		try {
#	Line 473 | Line 481 | public class DelayQueueTest extends JSR1
481		public void testRemove() {
482		DelayQueue q = populatedQueue(SIZE);
483		for (int i = 0; i < SIZE; ++i) {
484	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
484	>	assertEquals(new PDelay(i), q.remove());
485		}
486		try {
487		q.remove();
#	Line 501 | Line 509 | public class DelayQueueTest extends JSR1
509		q.clear();
510		assertTrue(q.isEmpty());
511		assertEquals(0, q.size());
512	<	assertEquals(NOCAP, q.remainingCapacity());
512	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
513		PDelay x = new PDelay(1);
514		q.add(x);
515		assertFalse(q.isEmpty());
#	Line 538 | Line 546 | public class DelayQueueTest extends JSR1
546		assertTrue(changed);
547
548		assertTrue(q.containsAll(p));
549	<	assertEquals(SIZE-i, q.size());
549	>	assertEquals(SIZE - i, q.size());
550		p.remove();
551		}
552		}
#	Line 551 | Line 559 | public class DelayQueueTest extends JSR1
559		DelayQueue q = populatedQueue(SIZE);
560		DelayQueue p = populatedQueue(i);
561		assertTrue(q.removeAll(p));
562	<	assertEquals(SIZE-i, q.size());
562	>	assertEquals(SIZE - i, q.size());
563		for (int j = 0; j < i; ++j) {
564	<	PDelay I = (PDelay)(p.remove());
565	<	assertFalse(q.contains(I));
564	>	PDelay x = (PDelay)(p.remove());
565	>	assertFalse(q.contains(x));
566		}
567		}
568		}
#	Line 606 | Line 614 | public class DelayQueueTest extends JSR1
614		++i;
615		}
616		assertEquals(i, SIZE);
617	+	assertIteratorExhausted(it);
618	+	}
619	+
620	+	/**
621	+	* iterator of empty collection has no elements
622	+	*/
623	+	public void testEmptyIterator() {
624	+	assertIteratorExhausted(new DelayQueue().iterator());
625		}
626
627		/**
#	Line 620 | Line 636 | public class DelayQueueTest extends JSR1
636		it.next();
637		it.remove();
638		it = q.iterator();
639	<	assertEquals(it.next(), new PDelay(2));
640	<	assertEquals(it.next(), new PDelay(3));
639	>	assertEquals(new PDelay(2), it.next());
640	>	assertEquals(new PDelay(3), it.next());
641		assertFalse(it.hasNext());
642		}
643
#	Line 641 | Line 657 | public class DelayQueueTest extends JSR1
657		public void testPollInExecutor() {
658		final DelayQueue q = new DelayQueue();
659		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
660	<	ExecutorService executor = Executors.newFixedThreadPool(2);
661	<	executor.execute(new CheckedRunnable() {
662	<	public void realRun() throws InterruptedException {
663	<	assertNull(q.poll());
664	<	threadsStarted.await();
665	<	assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
666	<	checkEmpty(q);
667	<	}});
668	<
669	<	executor.execute(new CheckedRunnable() {
670	<	public void realRun() throws InterruptedException {
671	<	threadsStarted.await();
672	<	q.put(new PDelay(1));
673	<	}});
674	<
675	<	joinPool(executor);
660	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
661	>	try (PoolCleaner cleaner = cleaner(executor)) {
662	>	executor.execute(new CheckedRunnable() {
663	>	public void realRun() throws InterruptedException {
664	>	assertNull(q.poll());
665	>	threadsStarted.await();
666	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
667	>	checkEmpty(q);
668	>	}});
669	>
670	>	executor.execute(new CheckedRunnable() {
671	>	public void realRun() throws InterruptedException {
672	>	threadsStarted.await();
673	>	q.put(new PDelay(1));
674	>	}});
675	>	}
676		}
677
678		/**
#	Line 720 | Line 736 | public class DelayQueueTest extends JSR1
736		q.drainTo(l);
737		assertEquals(0, q.size());
738		for (int i = 0; i < SIZE; ++i)
739	<	assertEquals(l.get(i), elems[i]);
739	>	assertEquals(elems[i], l.get(i));
740		q.add(elems[0]);
741		q.add(elems[1]);
742		assertFalse(q.isEmpty());
#	Line 731 | Line 747 | public class DelayQueueTest extends JSR1
747		assertEquals(0, q.size());
748		assertEquals(2, l.size());
749		for (int i = 0; i < 2; ++i)
750	<	assertEquals(l.get(i), elems[i]);
750	>	assertEquals(elems[i], l.get(i));
751		}
752
753		/**
#	Line 741 | Line 757 | public class DelayQueueTest extends JSR1
757		final DelayQueue q = populatedQueue(SIZE);
758		Thread t = new Thread(new CheckedRunnable() {
759		public void realRun() {
760	<	q.put(new PDelay(SIZE+1));
760	>	q.put(new PDelay(SIZE + 1));
761		}});
762
763		t.start();
#	Line 761 | Line 777 | public class DelayQueueTest extends JSR1
777		ArrayList l = new ArrayList();
778		q.drainTo(l, i);
779		int k = (i < SIZE) ? i : SIZE;
780	<	assertEquals(q.size(), SIZE-k);
781	<	assertEquals(l.size(), k);
780	>	assertEquals(SIZE - k, q.size());
781	>	assertEquals(k, l.size());
782		}
783		}
784
785	+	/**
786	+	* remove(null), contains(null) always return false
787	+	*/
788	+	public void testNeverContainsNull() {
789	+	Collection<?> q = populatedQueue(SIZE);
790	+	assertFalse(q.contains(null));
791	+	assertFalse(q.remove(null));
792	+	}
793		}

Diff Legend

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