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.48 by jsr166, Thu Apr 14 22:55:08 2011 UTC vs.
Revision 1.89 by jsr166, Mon May 28 21:43:48 2018 UTC

#	Line 6 | Line 6
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<PDelay> populatedQueue(int n) {
119	<	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
118	>	private static 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		/**
237	<	* 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	<	/**
266	<	* addAll(this) throws IAE
237	>	* addAll(this) throws IllegalArgumentException
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));
283	>	PDelay x = new PDelay(i);
284	>	q.put(x);
285	>	assertTrue(q.contains(x));
286		}
287		assertEquals(SIZE, q.size());
288		}
#	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		/**
334	<	* take blocks interruptibly when empty
334	>	* Take removes existing elements until empty, then blocks interruptibly
335		*/
336	<	public void testTakeFromEmptyBlocksInterruptibly()
337	<	throws InterruptedException {
338	<	final BlockingQueue q = new DelayQueue();
397	<	final CountDownLatch threadStarted = new CountDownLatch(1);
336	>	public void testBlockingTake() throws InterruptedException {
337	>	final DelayQueue q = populatedQueue(SIZE);
338	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
339		Thread t = newStartedThread(new CheckedRunnable() {
340	<	public void realRun() {
341	<	long t0 = System.nanoTime();
342	<	threadStarted.countDown();
340	>	public void realRun() throws InterruptedException {
341	>	for (int i = 0; i < SIZE; i++)
342	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
343	>
344	>	Thread.currentThread().interrupt();
345		try {
346		q.take();
347		shouldThrow();
348		} catch (InterruptedException success) {}
349	<	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	<	}
349	>	assertFalse(Thread.interrupted());
350
351	<	/**
417	<	* Take removes existing elements until empty, then blocks interruptibly
418	<	*/
419	<	public void testBlockingTake() throws InterruptedException {
420	<	final DelayQueue q = populatedQueue(SIZE);
421	<	Thread t = new Thread(new CheckedRunnable() {
422	<	public void realRun() throws InterruptedException {
423	<	for (int i = 0; i < SIZE; ++i) {
424	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
425	<	}
351	>	pleaseInterrupt.countDown();
352		try {
353		q.take();
354		shouldThrow();
355		} catch (InterruptedException success) {}
356	+	assertFalse(Thread.interrupted());
357		}});
358
359	<	t.start();
360	<	Thread.sleep(SHORT_DELAY_MS);
359	>	await(pleaseInterrupt);
360	>	assertThreadBlocks(t, Thread.State.WAITING);
361		t.interrupt();
362	<	t.join();
362	>	awaitTermination(t);
363		}
364
438	–
365		/**
366		* poll succeeds unless empty
367		*/
368		public void testPoll() {
369		DelayQueue q = populatedQueue(SIZE);
370		for (int i = 0; i < SIZE; ++i) {
371	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
371	>	assertEquals(new PDelay(i), q.poll());
372		}
373		assertNull(q.poll());
374		}
#	Line 453 | Line 379 | public class DelayQueueTest extends JSR1
379		public void testTimedPoll0() throws InterruptedException {
380		DelayQueue q = populatedQueue(SIZE);
381		for (int i = 0; i < SIZE; ++i) {
382	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
382	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
383		}
384		assertNull(q.poll(0, MILLISECONDS));
385		}
#	Line 464 | Line 390 | public class DelayQueueTest extends JSR1
390		public void testTimedPoll() throws InterruptedException {
391		DelayQueue q = populatedQueue(SIZE);
392		for (int i = 0; i < SIZE; ++i) {
393	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
394	<	}
395	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
393	>	long startTime = System.nanoTime();
394	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
395	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
396	>	}
397	>	long startTime = System.nanoTime();
398	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
399	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
400	>	checkEmpty(q);
401		}
402
403		/**
#	Line 474 | Line 405 | public class DelayQueueTest extends JSR1
405		* returning timeout status
406		*/
407		public void testInterruptedTimedPoll() throws InterruptedException {
408	<	Thread t = new Thread(new CheckedRunnable() {
409	<	public void realRun() throws InterruptedException {
410	<	DelayQueue q = populatedQueue(SIZE);
480	<	for (int i = 0; i < SIZE; ++i) {
481	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
482	<	}
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() {
408	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
409	>	final DelayQueue q = populatedQueue(SIZE);
410	>	Thread t = newStartedThread(new CheckedRunnable() {
411		public void realRun() throws InterruptedException {
412	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
413	<
414	<	barrier.await();
415	<	assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
412	>	long startTime = System.nanoTime();
413	>	for (int i = 0; i < SIZE; i++)
414	>	assertEquals(new PDelay(i),
415	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
416
417		Thread.currentThread().interrupt();
418		try {
419	<	q.poll(SHORT_DELAY_MS, MILLISECONDS);
419	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
420		shouldThrow();
421		} catch (InterruptedException success) {}
422	+	assertFalse(Thread.interrupted());
423
424	<	barrier.await();
424	>	pleaseInterrupt.countDown();
425		try {
426	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
426	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
427		shouldThrow();
428		} catch (InterruptedException success) {}
429	+	assertFalse(Thread.interrupted());
430	+
431	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
432		}});
433
434	<	t.start();
435	<	barrier.await();
525	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
526	<	barrier.await();
527	<	sleep(SHORT_DELAY_MS);
434	>	await(pleaseInterrupt);
435	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
436		t.interrupt();
437	<	t.join();
437	>	awaitTermination(t);
438	>	checkEmpty(q);
439		}
440
532	–
441		/**
442		* peek returns next element, or null if empty
443		*/
444		public void testPeek() {
445		DelayQueue q = populatedQueue(SIZE);
446		for (int i = 0; i < SIZE; ++i) {
447	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
448	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
447	>	assertEquals(new PDelay(i), q.peek());
448	>	assertEquals(new PDelay(i), q.poll());
449		if (q.isEmpty())
450		assertNull(q.peek());
451		else
#	Line 552 | Line 460 | public class DelayQueueTest extends JSR1
460		public void testElement() {
461		DelayQueue q = populatedQueue(SIZE);
462		for (int i = 0; i < SIZE; ++i) {
463	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
463	>	assertEquals(new PDelay(i), q.element());
464		q.poll();
465		}
466		try {
#	Line 567 | Line 475 | public class DelayQueueTest extends JSR1
475		public void testRemove() {
476		DelayQueue q = populatedQueue(SIZE);
477		for (int i = 0; i < SIZE; ++i) {
478	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
478	>	assertEquals(new PDelay(i), q.remove());
479		}
480		try {
481		q.remove();
#	Line 576 | Line 484 | public class DelayQueueTest extends JSR1
484		}
485
486		/**
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	–	/**
487		* contains(x) reports true when elements added but not yet removed
488		*/
489		public void testContains() {
#	Line 610 | Line 503 | public class DelayQueueTest extends JSR1
503		q.clear();
504		assertTrue(q.isEmpty());
505		assertEquals(0, q.size());
506	<	assertEquals(NOCAP, q.remainingCapacity());
506	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
507		PDelay x = new PDelay(1);
508		q.add(x);
509		assertFalse(q.isEmpty());
#	Line 647 | Line 540 | public class DelayQueueTest extends JSR1
540		assertTrue(changed);
541
542		assertTrue(q.containsAll(p));
543	<	assertEquals(SIZE-i, q.size());
543	>	assertEquals(SIZE - i, q.size());
544		p.remove();
545		}
546		}
#	Line 660 | Line 553 | public class DelayQueueTest extends JSR1
553		DelayQueue q = populatedQueue(SIZE);
554		DelayQueue p = populatedQueue(i);
555		assertTrue(q.removeAll(p));
556	<	assertEquals(SIZE-i, q.size());
556	>	assertEquals(SIZE - i, q.size());
557		for (int j = 0; j < i; ++j) {
558	<	PDelay I = (PDelay)(p.remove());
559	<	assertFalse(q.contains(I));
558	>	PDelay x = (PDelay)(p.remove());
559	>	assertFalse(q.contains(x));
560		}
561		}
562		}
#	Line 673 | Line 566 | public class DelayQueueTest extends JSR1
566		*/
567		public void testToArray() throws InterruptedException {
568		DelayQueue q = populatedQueue(SIZE);
569	<	Object[] o = q.toArray();
570	<	Arrays.sort(o);
571	<	for (int i = 0; i < o.length; i++)
572	<	assertSame(o[i], q.take());
569	>	Object[] a = q.toArray();
570	>	assertSame(Object[].class, a.getClass());
571	>	Arrays.sort(a);
572	>	for (Object o : a)
573	>	assertSame(o, q.take());
574	>	assertTrue(q.isEmpty());
575		}
576
577		/**
#	Line 688 | Line 583 | public class DelayQueueTest extends JSR1
583		PDelay[] array = q.toArray(ints);
584		assertSame(ints, array);
585		Arrays.sort(ints);
586	<	for (int i = 0; i < ints.length; i++)
587	<	assertSame(ints[i], q.remove());
588	<	}
694	<
695	<
696	<	/**
697	<	* toArray(null) throws NullPointerException
698	<	*/
699	<	public void testToArray_NullArg() {
700	<	DelayQueue q = populatedQueue(SIZE);
701	<	try {
702	<	q.toArray(null);
703	<	shouldThrow();
704	<	} catch (NullPointerException success) {}
586	>	for (PDelay o : ints)
587	>	assertSame(o, q.remove());
588	>	assertTrue(q.isEmpty());
589		}
590
591		/**
#	Line 727 | Line 611 | public class DelayQueueTest extends JSR1
611		++i;
612		}
613		assertEquals(i, SIZE);
614	+	assertIteratorExhausted(it);
615	+	}
616	+
617	+	/**
618	+	* iterator of empty collection has no elements
619	+	*/
620	+	public void testEmptyIterator() {
621	+	assertIteratorExhausted(new DelayQueue().iterator());
622		}
623
624		/**
#	Line 741 | Line 633 | public class DelayQueueTest extends JSR1
633		it.next();
634		it.remove();
635		it = q.iterator();
636	<	assertEquals(it.next(), new PDelay(2));
637	<	assertEquals(it.next(), new PDelay(3));
636	>	assertEquals(new PDelay(2), it.next());
637	>	assertEquals(new PDelay(3), it.next());
638		assertFalse(it.hasNext());
639		}
640
749	–
641		/**
642		* toString contains toStrings of elements
643		*/
644		public void testToString() {
645		DelayQueue q = populatedQueue(SIZE);
646		String s = q.toString();
647	<	for (int i = 0; i < SIZE; ++i) {
648	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
758	<	}
647	>	for (Object e : q)
648	>	assertTrue(s.contains(e.toString()));
649		}
650
651		/**
652	<	* offer transfers elements across Executor tasks
652	>	* timed poll transfers elements across Executor tasks
653		*/
654		public void testPollInExecutor() {
655		final DelayQueue q = new DelayQueue();
656	<	ExecutorService executor = Executors.newFixedThreadPool(2);
657	<	executor.execute(new CheckedRunnable() {
658	<	public void realRun() throws InterruptedException {
659	<	assertNull(q.poll());
660	<	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
661	<	assertTrue(q.isEmpty());
662	<	}});
663	<
664	<	executor.execute(new CheckedRunnable() {
665	<	public void realRun() throws InterruptedException {
666	<	Thread.sleep(SHORT_DELAY_MS);
667	<	q.put(new PDelay(1));
668	<	}});
669	<
670	<	joinPool(executor);
656	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
657	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
658	>	try (PoolCleaner cleaner = cleaner(executor)) {
659	>	executor.execute(new CheckedRunnable() {
660	>	public void realRun() throws InterruptedException {
661	>	assertNull(q.poll());
662	>	threadsStarted.await();
663	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
664	>	checkEmpty(q);
665	>	}});
666	>
667	>	executor.execute(new CheckedRunnable() {
668	>	public void realRun() throws InterruptedException {
669	>	threadsStarted.await();
670	>	q.put(new PDelay(1));
671	>	}});
672	>	}
673		}
674
783	–
675		/**
676		* Delayed actions do not occur until their delay elapses
677		*/
678		public void testDelay() throws InterruptedException {
679	<	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
679	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
680		for (int i = 0; i < SIZE; ++i)
681		q.add(new NanoDelay(1000000L * (SIZE - i)));
682
#	Line 810 | Line 701 | public class DelayQueueTest extends JSR1
701		assertNotNull(q.peek());
702		}
703
813	–
704		/**
705		* poll of a non-empty queue returns null if no expired elements.
706		*/
#	Line 826 | Line 716 | public class DelayQueueTest extends JSR1
716		public void testTimedPollDelayed() throws InterruptedException {
717		DelayQueue q = new DelayQueue();
718		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
719	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
720	<	}
721	<
832	<	/**
833	<	* drainTo(null) throws NPE
834	<	*/
835	<	public void testDrainToNull() {
836	<	DelayQueue q = populatedQueue(SIZE);
837	<	try {
838	<	q.drainTo(null);
839	<	shouldThrow();
840	<	} catch (NullPointerException success) {}
841	<	}
842	<
843	<	/**
844	<	* drainTo(this) throws IAE
845	<	*/
846	<	public void testDrainToSelf() {
847	<	DelayQueue q = populatedQueue(SIZE);
848	<	try {
849	<	q.drainTo(q);
850	<	shouldThrow();
851	<	} catch (IllegalArgumentException success) {}
719	>	long startTime = System.nanoTime();
720	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
721	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
722		}
723
724		/**
#	Line 863 | Line 733 | public class DelayQueueTest extends JSR1
733		}
734		ArrayList l = new ArrayList();
735		q.drainTo(l);
736	<	assertEquals(q.size(), 0);
736	>	assertEquals(0, q.size());
737		for (int i = 0; i < SIZE; ++i)
738	<	assertEquals(l.get(i), elems[i]);
738	>	assertEquals(elems[i], l.get(i));
739		q.add(elems[0]);
740		q.add(elems[1]);
741		assertFalse(q.isEmpty());
#	Line 873 | Line 743 | public class DelayQueueTest extends JSR1
743		assertTrue(q.contains(elems[1]));
744		l.clear();
745		q.drainTo(l);
746	<	assertEquals(q.size(), 0);
747	<	assertEquals(l.size(), 2);
746	>	assertEquals(0, q.size());
747	>	assertEquals(2, l.size());
748		for (int i = 0; i < 2; ++i)
749	<	assertEquals(l.get(i), elems[i]);
749	>	assertEquals(elems[i], l.get(i));
750		}
751
752		/**
#	Line 886 | Line 756 | public class DelayQueueTest extends JSR1
756		final DelayQueue q = populatedQueue(SIZE);
757		Thread t = new Thread(new CheckedRunnable() {
758		public void realRun() {
759	<	q.put(new PDelay(SIZE+1));
759	>	q.put(new PDelay(SIZE + 1));
760		}});
761
762		t.start();
#	Line 898 | Line 768 | public class DelayQueueTest extends JSR1
768		}
769
770		/**
901	–	* drainTo(null, n) throws NPE
902	–	*/
903	–	public void testDrainToNullN() {
904	–	DelayQueue q = populatedQueue(SIZE);
905	–	try {
906	–	q.drainTo(null, 0);
907	–	shouldThrow();
908	–	} catch (NullPointerException success) {}
909	–	}
910	–
911	–	/**
912	–	* drainTo(this, n) throws IAE
913	–	*/
914	–	public void testDrainToSelfN() {
915	–	DelayQueue q = populatedQueue(SIZE);
916	–	try {
917	–	q.drainTo(q, 0);
918	–	shouldThrow();
919	–	} catch (IllegalArgumentException success) {}
920	–	}
921	–
922	–	/**
771		* drainTo(c, n) empties first min(n, size) elements of queue into c
772		*/
773		public void testDrainToN() {
#	Line 928 | Line 776 | public class DelayQueueTest extends JSR1
776		ArrayList l = new ArrayList();
777		q.drainTo(l, i);
778		int k = (i < SIZE) ? i : SIZE;
779	<	assertEquals(q.size(), SIZE-k);
780	<	assertEquals(l.size(), k);
779	>	assertEquals(SIZE - k, q.size());
780	>	assertEquals(k, l.size());
781		}
782		}
783
784	<
784	>	/**
785	>	* remove(null), contains(null) always return false
786	>	*/
787	>	public void testNeverContainsNull() {
788	>	Collection<?> q = populatedQueue(SIZE);
789	>	assertFalse(q.contains(null));
790	>	assertFalse(q.remove(null));
791	>	}
792		}

Diff Legend

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