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.40 by jsr166, Thu Oct 28 17:57:26 2010 UTC vs.
Revision 1.81 by jsr166, Wed Jan 4 06:09:58 2017 UTC

#	Line 1 | Line 1
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.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.util.concurrent.*;
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;
17	>	import java.util.concurrent.CountDownLatch;
18	>	import java.util.concurrent.Delayed;
19	>	import java.util.concurrent.DelayQueue;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.TimeUnit;
23	>
24	>	import junit.framework.Test;
25
26		public class DelayQueueTest extends JSR166TestCase {
27	+
28	+	public static class Generic extends BlockingQueueTest {
29	+	protected BlockingQueue emptyCollection() {
30	+	return new DelayQueue();
31	+	}
32	+	protected PDelay makeElement(int i) {
33	+	return new PDelay(i);
34	+	}
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() {
42	<	return new TestSuite(DelayQueueTest.class);
42	>	class Implementation implements CollectionImplementation {
43	>	public Class<?> klazz() { return DelayQueue.class; }
44	>	public Collection emptyCollection() { return new DelayQueue(); }
45	>	public Object makeElement(int i) { return new PDelay(i); }
46	>	public boolean isConcurrent() { return true; }
47	>	public boolean permitsNulls() { return false; }
48	>	}
49	>	return newTestSuite(DelayQueueTest.class,
50	>	new Generic().testSuite(),
51	>	CollectionTest.testSuite(new Implementation()));
52		}
53
23	–	private static final int NOCAP = Integer.MAX_VALUE;
24	–
54		/**
55	<	* A delayed implementation for testing.
56	<	* Most tests use Pseudodelays, where delays are all elapsed
55	>	* A fake Delayed implementation for testing.
56	>	* Most tests use PDelays, where delays are all elapsed
57		* (so, no blocking solely for delays) but are still ordered
58		*/
59		static class PDelay implements Delayed {
60	<	int pseudodelay;
61	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
33	<	public int compareTo(PDelay y) {
34	<	int i = pseudodelay;
35	<	int j = y.pseudodelay;
36	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
39	<	}
40	<
60	>	final int pseudodelay;
61	>	PDelay(int pseudodelay) { this.pseudodelay = pseudodelay; }
62		public int compareTo(Delayed y) {
63	<	return compareTo((PDelay)y);
63	>	return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64		}
44	–
65		public boolean equals(Object other) {
66	<	return equals((PDelay)other);
67	<	}
48	<	public boolean equals(PDelay other) {
49	<	return other.pseudodelay == pseudodelay;
66	>	return (other instanceof PDelay) &&
67	>	this.pseudodelay == ((PDelay)other).pseudodelay;
68		}
69	<
70	<
69	>	// suppress [overrides] javac warning
70	>	public int hashCode() { return pseudodelay; }
71		public long getDelay(TimeUnit ignore) {
72	<	return pseudodelay;
55	<	}
56	<	public int intValue() {
57	<	return pseudodelay;
72	>	return Integer.MIN_VALUE + pseudodelay;
73		}
59	–
74		public String toString() {
75		return String.valueOf(pseudodelay);
76		}
77		}
78
65	–
79		/**
80		* Delayed implementation that actually delays
81		*/
82		static class NanoDelay implements Delayed {
83	<	long trigger;
83	>	final long trigger;
84		NanoDelay(long i) {
85		trigger = System.nanoTime() + i;
86		}
74	–	public int compareTo(NanoDelay y) {
75	–	long i = trigger;
76	–	long j = y.trigger;
77	–	if (i < j) return -1;
78	–	if (i > j) return 1;
79	–	return 0;
80	–	}
87
88		public int compareTo(Delayed y) {
89	<	return compareTo((NanoDelay)y);
89	>	return Long.compare(trigger, ((NanoDelay)y).trigger);
90		}
91
92		public boolean equals(Object other) {
93	<	return equals((NanoDelay)other);
94	<	}
89	<	public boolean equals(NanoDelay other) {
90	<	return other.trigger == trigger;
93	>	return (other instanceof NanoDelay) &&
94	>	this.trigger == ((NanoDelay)other).trigger;
95		}
96
97	+	// suppress [overrides] javac warning
98	+	public int hashCode() { return (int) trigger; }
99	+
100		public long getDelay(TimeUnit unit) {
101		long n = trigger - System.nanoTime();
102		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 104 | Line 111 | public class DelayQueueTest extends JSR1
111		}
112		}
113
107	–
114		/**
115	<	* Create a queue of given size containing consecutive
116	<	* PDelays 0 ... n.
115	>	* Returns a new queue of given size containing consecutive
116	>	* PDelays 0 ... n - 1.
117		*/
118	<	private DelayQueue populatedQueue(int n) {
119	<	DelayQueue q = new DelayQueue();
118	>	private DelayQueue<PDelay> populatedQueue(int n) {
119	>	DelayQueue<PDelay> q = new DelayQueue<>();
120		assertTrue(q.isEmpty());
121	<	for (int i = n-1; i >= 0; i-=2)
121	>	for (int i = n - 1; i >= 0; i -= 2)
122		assertTrue(q.offer(new PDelay(i)));
123	<	for (int i = (n & 1); i < n; i+=2)
123	>	for (int i = (n & 1); i < n; i += 2)
124		assertTrue(q.offer(new PDelay(i)));
125		assertFalse(q.isEmpty());
126	<	assertEquals(NOCAP, q.remainingCapacity());
126	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
127		assertEquals(n, q.size());
128	+	assertEquals(new PDelay(0), q.peek());
129		return q;
130		}
131
#	Line 126 | Line 133 | public class DelayQueueTest extends JSR1
133		* A new queue has unbounded capacity
134		*/
135		public void testConstructor1() {
136	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
136	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
137		}
138
139		/**
#	Line 134 | Line 141 | public class DelayQueueTest extends JSR1
141		*/
142		public void testConstructor3() {
143		try {
144	<	DelayQueue q = new DelayQueue(null);
144	>	new DelayQueue(null);
145		shouldThrow();
146		} catch (NullPointerException success) {}
147		}
#	Line 144 | Line 151 | public class DelayQueueTest extends JSR1
151		*/
152		public void testConstructor4() {
153		try {
154	<	PDelay[] ints = new PDelay[SIZE];
148	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
154	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
155		shouldThrow();
156		} catch (NullPointerException success) {}
157		}
#	Line 154 | Line 160 | public class DelayQueueTest extends JSR1
160		* Initializing from Collection with some null elements throws NPE
161		*/
162		public void testConstructor5() {
163	+	PDelay[] a = new PDelay[SIZE];
164	+	for (int i = 0; i < SIZE - 1; ++i)
165	+	a[i] = new PDelay(i);
166		try {
167	<	PDelay[] ints = new PDelay[SIZE];
159	<	for (int i = 0; i < SIZE-1; ++i)
160	<	ints[i] = new PDelay(i);
161	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
167	>	new DelayQueue(Arrays.asList(a));
168		shouldThrow();
169		} catch (NullPointerException success) {}
170		}
#	Line 181 | Line 187 | public class DelayQueueTest extends JSR1
187		public void testEmpty() {
188		DelayQueue q = new DelayQueue();
189		assertTrue(q.isEmpty());
190	<	assertEquals(NOCAP, q.remainingCapacity());
190	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
191		q.add(new PDelay(1));
192		assertFalse(q.isEmpty());
193		q.add(new PDelay(2));
#	Line 191 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elements added or removed,
195	<	* but size does
200	>	* remainingCapacity() always returns Integer.MAX_VALUE
201		*/
202		public void testRemainingCapacity() {
203	<	DelayQueue q = populatedQueue(SIZE);
203	>	BlockingQueue q = populatedQueue(SIZE);
204		for (int i = 0; i < SIZE; ++i) {
205	<	assertEquals(NOCAP, q.remainingCapacity());
206	<	assertEquals(SIZE-i, q.size());
207	<	q.remove();
205	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
206	>	assertEquals(SIZE - i, q.size());
207	>	assertTrue(q.remove() instanceof PDelay);
208		}
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211		assertEquals(i, q.size());
212	<	q.add(new PDelay(i));
212	>	assertTrue(q.add(new PDelay(i)));
213		}
214		}
215
216		/**
212	–	* offer(null) throws NPE
213	–	*/
214	–	public void testOfferNull() {
215	–	try {
216	–	DelayQueue q = new DelayQueue();
217	–	q.offer(null);
218	–	shouldThrow();
219	–	} catch (NullPointerException success) {}
220	–	}
221	–
222	–	/**
223	–	* add(null) throws NPE
224	–	*/
225	–	public void testAddNull() {
226	–	try {
227	–	DelayQueue q = new DelayQueue();
228	–	q.add(null);
229	–	shouldThrow();
230	–	} catch (NullPointerException success) {}
231	–	}
232	–
233	–	/**
217		* offer non-null succeeds
218		*/
219		public void testOffer() {
#	Line 251 | Line 234 | public class DelayQueueTest extends JSR1
234		}
235
236		/**
254	–	* addAll(null) throws NPE
255	–	*/
256	–	public void testAddAll1() {
257	–	try {
258	–	DelayQueue q = new DelayQueue();
259	–	q.addAll(null);
260	–	shouldThrow();
261	–	} catch (NullPointerException success) {}
262	–	}
263	–
264	–
265	–	/**
237		* addAll(this) throws IAE
238		*/
239		public void testAddAllSelf() {
240	+	DelayQueue q = populatedQueue(SIZE);
241		try {
270	–	DelayQueue q = populatedQueue(SIZE);
242		q.addAll(q);
243		shouldThrow();
244		} catch (IllegalArgumentException success) {}
245		}
246
247		/**
277	–	* addAll of a collection with null elements throws NPE
278	–	*/
279	–	public void testAddAll2() {
280	–	try {
281	–	DelayQueue q = new DelayQueue();
282	–	PDelay[] ints = new PDelay[SIZE];
283	–	q.addAll(Arrays.asList(ints));
284	–	shouldThrow();
285	–	} catch (NullPointerException success) {}
286	–	}
287	–
288	–	/**
248		* addAll of a collection with any null elements throws NPE after
249		* possibly adding some elements
250		*/
251		public void testAddAll3() {
252	+	DelayQueue q = new DelayQueue();
253	+	PDelay[] a = new PDelay[SIZE];
254	+	for (int i = 0; i < SIZE - 1; ++i)
255	+	a[i] = new PDelay(i);
256		try {
257	<	DelayQueue q = new DelayQueue();
295	<	PDelay[] ints = new PDelay[SIZE];
296	<	for (int i = 0; i < SIZE-1; ++i)
297	<	ints[i] = new PDelay(i);
298	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259		} catch (NullPointerException success) {}
260		}
#	Line 306 | Line 265 | public class DelayQueueTest extends JSR1
265		public void testAddAll5() {
266		PDelay[] empty = new PDelay[0];
267		PDelay[] ints = new PDelay[SIZE];
268	<	for (int i = SIZE-1; i >= 0; --i)
268	>	for (int i = SIZE - 1; i >= 0; --i)
269		ints[i] = new PDelay(i);
270		DelayQueue q = new DelayQueue();
271		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 316 | Line 275 | public class DelayQueueTest extends JSR1
275		}
276
277		/**
319	–	* put(null) throws NPE
320	–	*/
321	–	public void testPutNull() {
322	–	try {
323	–	DelayQueue q = new DelayQueue();
324	–	q.put(null);
325	–	shouldThrow();
326	–	} catch (NullPointerException success) {}
327	–	}
328	–
329	–	/**
278		* all elements successfully put are contained
279		*/
280	<	public void testPut() {
281	<	DelayQueue q = new DelayQueue();
282	<	for (int i = 0; i < SIZE; ++i) {
283	<	PDelay I = new PDelay(i);
284	<	q.put(I);
285	<	assertTrue(q.contains(I));
286	<	}
287	<	assertEquals(SIZE, q.size());
280	>	public void testPut() {
281	>	DelayQueue q = new DelayQueue();
282	>	for (int i = 0; i < SIZE; ++i) {
283	>	PDelay x = new PDelay(i);
284	>	q.put(x);
285	>	assertTrue(q.contains(x));
286	>	}
287	>	assertEquals(SIZE, q.size());
288		}
289
290		/**
#	Line 344 | Line 292 | public class DelayQueueTest extends JSR1
292		*/
293		public void testPutWithTake() throws InterruptedException {
294		final DelayQueue q = new DelayQueue();
295	<	Thread t = new Thread(new CheckedRunnable() {
295	>	Thread t = newStartedThread(new CheckedRunnable() {
296		public void realRun() {
297		q.put(new PDelay(0));
298		q.put(new PDelay(0));
#	Line 352 | Line 300 | public class DelayQueueTest extends JSR1
300		q.put(new PDelay(0));
301		}});
302
303	<	t.start();
304	<	Thread.sleep(SHORT_DELAY_MS);
357	<	q.take();
358	<	t.interrupt();
359	<	t.join();
303	>	awaitTermination(t);
304	>	assertEquals(4, q.size());
305		}
306
307		/**
#	Line 364 | Line 309 | public class DelayQueueTest extends JSR1
309		*/
310		public void testTimedOffer() throws InterruptedException {
311		final DelayQueue q = new DelayQueue();
312	<	Thread t = new Thread(new CheckedRunnable() {
312	>	Thread t = newStartedThread(new CheckedRunnable() {
313		public void realRun() throws InterruptedException {
314		q.put(new PDelay(0));
315		q.put(new PDelay(0));
#	Line 372 | Line 317 | public class DelayQueueTest extends JSR1
317		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
318		}});
319
320	<	t.start();
376	<	Thread.sleep(SMALL_DELAY_MS);
377	<	t.interrupt();
378	<	t.join();
320	>	awaitTermination(t);
321		}
322
323		/**
#	Line 384 | Line 326 | public class DelayQueueTest extends JSR1
326		public void testTake() throws InterruptedException {
327		DelayQueue q = populatedQueue(SIZE);
328		for (int i = 0; i < SIZE; ++i) {
329	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
329	>	assertEquals(new PDelay(i), q.take());
330		}
331		}
332
333		/**
392	–	* take blocks interruptibly when empty
393	–	*/
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	–	awaitTermination(t, MEDIUM_DELAY_MS);
413	–	assertFalse(t.isAlive());
414	–	}
415	–
416	–	/**
334		* Take removes existing elements until empty, then blocks interruptibly
335		*/
336		public void testBlockingTake() throws InterruptedException {
337		final DelayQueue q = populatedQueue(SIZE);
338	<	Thread t = new Thread(new CheckedRunnable() {
338	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
339	>	Thread t = newStartedThread(new CheckedRunnable() {
340		public void realRun() throws InterruptedException {
341		for (int i = 0; i < SIZE; ++i) {
342		assertEquals(new PDelay(i), ((PDelay)q.take()));
343		}
344	+
345	+	Thread.currentThread().interrupt();
346		try {
347		q.take();
348		shouldThrow();
349		} catch (InterruptedException success) {}
350	+	assertFalse(Thread.interrupted());
351	+
352	+	pleaseInterrupt.countDown();
353	+	try {
354	+	q.take();
355	+	shouldThrow();
356	+	} catch (InterruptedException success) {}
357	+	assertFalse(Thread.interrupted());
358		}});
359
360	<	t.start();
361	<	Thread.sleep(SHORT_DELAY_MS);
360	>	await(pleaseInterrupt);
361	>	assertThreadStaysAlive(t);
362		t.interrupt();
363	<	t.join();
363	>	awaitTermination(t);
364		}
365
438	–
366		/**
367		* poll succeeds unless empty
368		*/
369		public void testPoll() {
370		DelayQueue q = populatedQueue(SIZE);
371		for (int i = 0; i < SIZE; ++i) {
372	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
372	>	assertEquals(new PDelay(i), q.poll());
373		}
374		assertNull(q.poll());
375		}
376
377		/**
378	<	* timed pool with zero timeout succeeds when non-empty, else times out
378	>	* timed poll with zero timeout succeeds when non-empty, else times out
379		*/
380		public void testTimedPoll0() throws InterruptedException {
381		DelayQueue q = populatedQueue(SIZE);
382		for (int i = 0; i < SIZE; ++i) {
383	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
383	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
384		}
385		assertNull(q.poll(0, MILLISECONDS));
386		}
387
388		/**
389	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
389	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
390		*/
391		public void testTimedPoll() throws InterruptedException {
392		DelayQueue q = populatedQueue(SIZE);
393		for (int i = 0; i < SIZE; ++i) {
394	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
395	<	}
396	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
394	>	long startTime = System.nanoTime();
395	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
396	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
397	>	}
398	>	long startTime = System.nanoTime();
399	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
400	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
401	>	checkEmpty(q);
402		}
403
404		/**
#	Line 474 | Line 406 | public class DelayQueueTest extends JSR1
406		* returning timeout status
407		*/
408		public void testInterruptedTimedPoll() throws InterruptedException {
409	<	Thread t = new Thread(new CheckedRunnable() {
409	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
410	>	final DelayQueue q = populatedQueue(SIZE);
411	>	Thread t = newStartedThread(new CheckedRunnable() {
412		public void realRun() throws InterruptedException {
413	<	DelayQueue q = populatedQueue(SIZE);
413	>	long startTime = System.nanoTime();
414		for (int i = 0; i < SIZE; ++i) {
415	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
415	>	assertEquals(new PDelay(i),
416	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
417		}
483	–	try {
484	–	q.poll(SMALL_DELAY_MS, MILLISECONDS);
485	–	shouldThrow();
486	–	} catch (InterruptedException success) {}
487	–	}});
488	–
489	–	t.start();
490	–	Thread.sleep(SHORT_DELAY_MS);
491	–	t.interrupt();
492	–	t.join();
493	–	}
494	–
495	–	/**
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	–
507	–	barrier.await();
508	–	assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
418
419		Thread.currentThread().interrupt();
420		try {
421	<	q.poll(SHORT_DELAY_MS, MILLISECONDS);
421	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
422		shouldThrow();
423		} catch (InterruptedException success) {}
424	+	assertFalse(Thread.interrupted());
425
426	<	barrier.await();
426	>	pleaseInterrupt.countDown();
427		try {
428	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
428	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
429		shouldThrow();
430		} catch (InterruptedException success) {}
431	+	assertFalse(Thread.interrupted());
432	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
433		}});
434
435	<	t.start();
436	<	barrier.await();
525	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
526	<	barrier.await();
527	<	sleep(SHORT_DELAY_MS);
435	>	await(pleaseInterrupt);
436	>	assertThreadStaysAlive(t);
437		t.interrupt();
438	<	t.join();
438	>	awaitTermination(t);
439	>	checkEmpty(q);
440		}
441
532	–
442		/**
443		* peek returns next element, or null if empty
444		*/
445		public void testPeek() {
446		DelayQueue q = populatedQueue(SIZE);
447		for (int i = 0; i < SIZE; ++i) {
448	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
449	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
448	>	assertEquals(new PDelay(i), q.peek());
449	>	assertEquals(new PDelay(i), q.poll());
450		if (q.isEmpty())
451		assertNull(q.peek());
452		else
#	Line 552 | Line 461 | public class DelayQueueTest extends JSR1
461		public void testElement() {
462		DelayQueue q = populatedQueue(SIZE);
463		for (int i = 0; i < SIZE; ++i) {
464	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
464	>	assertEquals(new PDelay(i), q.element());
465		q.poll();
466		}
467		try {
#	Line 567 | Line 476 | public class DelayQueueTest extends JSR1
476		public void testRemove() {
477		DelayQueue q = populatedQueue(SIZE);
478		for (int i = 0; i < SIZE; ++i) {
479	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
479	>	assertEquals(new PDelay(i), q.remove());
480		}
481		try {
482		q.remove();
#	Line 576 | Line 485 | public class DelayQueueTest extends JSR1
485		}
486
487		/**
579	–	* remove(x) removes x and returns true if present
580	–	*/
581	–	public void testRemoveElement() {
582	–	DelayQueue q = populatedQueue(SIZE);
583	–	for (int i = 1; i < SIZE; i+=2) {
584	–	assertTrue(q.remove(new PDelay(i)));
585	–	}
586	–	for (int i = 0; i < SIZE; i+=2) {
587	–	assertTrue(q.remove(new PDelay(i)));
588	–	assertFalse(q.remove(new PDelay(i+1)));
589	–	}
590	–	assertTrue(q.isEmpty());
591	–	}
592	–
593	–	/**
488		* contains(x) reports true when elements added but not yet removed
489		*/
490		public void testContains() {
#	Line 610 | Line 504 | public class DelayQueueTest extends JSR1
504		q.clear();
505		assertTrue(q.isEmpty());
506		assertEquals(0, q.size());
507	<	assertEquals(NOCAP, q.remainingCapacity());
507	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
508		PDelay x = new PDelay(1);
509		q.add(x);
510		assertFalse(q.isEmpty());
#	Line 647 | Line 541 | public class DelayQueueTest extends JSR1
541		assertTrue(changed);
542
543		assertTrue(q.containsAll(p));
544	<	assertEquals(SIZE-i, q.size());
544	>	assertEquals(SIZE - i, q.size());
545		p.remove();
546		}
547		}
#	Line 660 | Line 554 | public class DelayQueueTest extends JSR1
554		DelayQueue q = populatedQueue(SIZE);
555		DelayQueue p = populatedQueue(i);
556		assertTrue(q.removeAll(p));
557	<	assertEquals(SIZE-i, q.size());
557	>	assertEquals(SIZE - i, q.size());
558		for (int j = 0; j < i; ++j) {
559	<	PDelay I = (PDelay)(p.remove());
560	<	assertFalse(q.contains(I));
559	>	PDelay x = (PDelay)(p.remove());
560	>	assertFalse(q.contains(x));
561		}
562		}
563		}
#	Line 676 | Line 570 | public class DelayQueueTest extends JSR1
570		Object[] o = q.toArray();
571		Arrays.sort(o);
572		for (int i = 0; i < o.length; i++)
573	<	assertEquals(o[i], q.take());
573	>	assertSame(o[i], q.take());
574		}
575
576		/**
577		* toArray(a) contains all elements
578		*/
579	<	public void testToArray2() throws InterruptedException {
580	<	DelayQueue q = populatedQueue(SIZE);
579	>	public void testToArray2() {
580	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
581		PDelay[] ints = new PDelay[SIZE];
582	<	ints = (PDelay[])q.toArray(ints);
582	>	PDelay[] array = q.toArray(ints);
583	>	assertSame(ints, array);
584		Arrays.sort(ints);
585		for (int i = 0; i < ints.length; i++)
586	<	assertEquals(ints[i], q.take());
692	<	}
693	<
694	<
695	<	/**
696	<	* toArray(null) throws NPE
697	<	*/
698	<	public void testToArray_BadArg() {
699	<	DelayQueue q = populatedQueue(SIZE);
700	<	try {
701	<	Object o[] = q.toArray(null);
702	<	shouldThrow();
703	<	} catch (NullPointerException success) {}
586	>	assertSame(ints[i], q.remove());
587		}
588
589		/**
590	<	* toArray with incompatible array type throws CCE
590	>	* toArray(incompatible array type) throws ArrayStoreException
591		*/
592		public void testToArray1_BadArg() {
593		DelayQueue q = populatedQueue(SIZE);
594		try {
595	<	Object o[] = q.toArray(new String[10]);
595	>	q.toArray(new String[10]);
596		shouldThrow();
597		} catch (ArrayStoreException success) {}
598		}
#	Line 726 | Line 609 | public class DelayQueueTest extends JSR1
609		++i;
610		}
611		assertEquals(i, SIZE);
612	+	assertIteratorExhausted(it);
613	+	}
614	+
615	+	/**
616	+	* iterator of empty collection has no elements
617	+	*/
618	+	public void testEmptyIterator() {
619	+	assertIteratorExhausted(new DelayQueue().iterator());
620		}
621
622		/**
#	Line 740 | Line 631 | public class DelayQueueTest extends JSR1
631		it.next();
632		it.remove();
633		it = q.iterator();
634	<	assertEquals(it.next(), new PDelay(2));
635	<	assertEquals(it.next(), new PDelay(3));
634	>	assertEquals(new PDelay(2), it.next());
635	>	assertEquals(new PDelay(3), it.next());
636		assertFalse(it.hasNext());
637		}
638
748	–
639		/**
640		* toString contains toStrings of elements
641		*/
642		public void testToString() {
643		DelayQueue q = populatedQueue(SIZE);
644		String s = q.toString();
645	<	for (int i = 0; i < SIZE; ++i) {
646	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
757	<	}
645	>	for (Object e : q)
646	>	assertTrue(s.contains(e.toString()));
647		}
648
649		/**
650	<	* offer transfers elements across Executor tasks
650	>	* timed poll transfers elements across Executor tasks
651		*/
652		public void testPollInExecutor() {
653		final DelayQueue q = new DelayQueue();
654	<	ExecutorService executor = Executors.newFixedThreadPool(2);
655	<	executor.execute(new CheckedRunnable() {
656	<	public void realRun() throws InterruptedException {
657	<	assertNull(q.poll());
658	<	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
659	<	assertTrue(q.isEmpty());
660	<	}});
661	<
662	<	executor.execute(new CheckedRunnable() {
663	<	public void realRun() throws InterruptedException {
664	<	Thread.sleep(SHORT_DELAY_MS);
665	<	q.put(new PDelay(1));
666	<	}});
667	<
668	<	joinPool(executor);
654	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
655	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
656	>	try (PoolCleaner cleaner = cleaner(executor)) {
657	>	executor.execute(new CheckedRunnable() {
658	>	public void realRun() throws InterruptedException {
659	>	assertNull(q.poll());
660	>	threadsStarted.await();
661	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
662	>	checkEmpty(q);
663	>	}});
664	>
665	>	executor.execute(new CheckedRunnable() {
666	>	public void realRun() throws InterruptedException {
667	>	threadsStarted.await();
668	>	q.put(new PDelay(1));
669	>	}});
670	>	}
671		}
672
782	–
673		/**
674		* Delayed actions do not occur until their delay elapses
675		*/
676		public void testDelay() throws InterruptedException {
677	<	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
677	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
678		for (int i = 0; i < SIZE; ++i)
679		q.add(new NanoDelay(1000000L * (SIZE - i)));
680
#	Line 809 | Line 699 | public class DelayQueueTest extends JSR1
699		assertNotNull(q.peek());
700		}
701
812	–
702		/**
703		* poll of a non-empty queue returns null if no expired elements.
704		*/
#	Line 825 | Line 714 | public class DelayQueueTest extends JSR1
714		public void testTimedPollDelayed() throws InterruptedException {
715		DelayQueue q = new DelayQueue();
716		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
717	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
829	<	}
830	<
831	<	/**
832	<	* drainTo(null) throws NPE
833	<	*/
834	<	public void testDrainToNull() {
835	<	DelayQueue q = populatedQueue(SIZE);
836	<	try {
837	<	q.drainTo(null);
838	<	shouldThrow();
839	<	} catch (NullPointerException success) {}
840	<	}
841	<
842	<	/**
843	<	* drainTo(this) throws IAE
844	<	*/
845	<	public void testDrainToSelf() {
846	<	DelayQueue q = populatedQueue(SIZE);
847	<	try {
848	<	q.drainTo(q);
849	<	shouldThrow();
850	<	} catch (IllegalArgumentException success) {}
717	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
718		}
719
720		/**
#	Line 862 | Line 729 | public class DelayQueueTest extends JSR1
729		}
730		ArrayList l = new ArrayList();
731		q.drainTo(l);
732	<	assertEquals(q.size(), 0);
732	>	assertEquals(0, q.size());
733		for (int i = 0; i < SIZE; ++i)
734	<	assertEquals(l.get(i), elems[i]);
734	>	assertEquals(elems[i], l.get(i));
735		q.add(elems[0]);
736		q.add(elems[1]);
737		assertFalse(q.isEmpty());
#	Line 872 | Line 739 | public class DelayQueueTest extends JSR1
739		assertTrue(q.contains(elems[1]));
740		l.clear();
741		q.drainTo(l);
742	<	assertEquals(q.size(), 0);
743	<	assertEquals(l.size(), 2);
742	>	assertEquals(0, q.size());
743	>	assertEquals(2, l.size());
744		for (int i = 0; i < 2; ++i)
745	<	assertEquals(l.get(i), elems[i]);
745	>	assertEquals(elems[i], l.get(i));
746		}
747
748		/**
#	Line 885 | Line 752 | public class DelayQueueTest extends JSR1
752		final DelayQueue q = populatedQueue(SIZE);
753		Thread t = new Thread(new CheckedRunnable() {
754		public void realRun() {
755	<	q.put(new PDelay(SIZE+1));
755	>	q.put(new PDelay(SIZE + 1));
756		}});
757
758		t.start();
#	Line 897 | Line 764 | public class DelayQueueTest extends JSR1
764		}
765
766		/**
900	–	* drainTo(null, n) throws NPE
901	–	*/
902	–	public void testDrainToNullN() {
903	–	DelayQueue q = populatedQueue(SIZE);
904	–	try {
905	–	q.drainTo(null, 0);
906	–	shouldThrow();
907	–	} catch (NullPointerException success) {}
908	–	}
909	–
910	–	/**
911	–	* drainTo(this, n) throws IAE
912	–	*/
913	–	public void testDrainToSelfN() {
914	–	DelayQueue q = populatedQueue(SIZE);
915	–	try {
916	–	q.drainTo(q, 0);
917	–	shouldThrow();
918	–	} catch (IllegalArgumentException success) {}
919	–	}
920	–
921	–	/**
767		* drainTo(c, n) empties first min(n, size) elements of queue into c
768		*/
769		public void testDrainToN() {
#	Line 927 | Line 772 | public class DelayQueueTest extends JSR1
772		ArrayList l = new ArrayList();
773		q.drainTo(l, i);
774		int k = (i < SIZE) ? i : SIZE;
775	<	assertEquals(q.size(), SIZE-k);
776	<	assertEquals(l.size(), k);
775	>	assertEquals(SIZE - k, q.size());
776	>	assertEquals(k, l.size());
777		}
778		}
779
780	<
780	>	/**
781	>	* remove(null), contains(null) always return false
782	>	*/
783	>	public void testNeverContainsNull() {
784	>	Collection<?> q = populatedQueue(SIZE);
785	>	assertFalse(q.contains(null));
786	>	assertFalse(q.remove(null));
787	>	}
788		}

Diff Legend

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