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.25 by jsr166, Sun Nov 22 00:17:37 2009 UTC vs.
Revision 1.86 by jsr166, Sun May 14 00:48:20 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 = ((PDelay)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	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
63	>	return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64		}
48	–
65		public boolean equals(Object other) {
66	<	return ((PDelay)other).pseudodelay == pseudodelay;
67	<	}
52	<	public boolean equals(PDelay other) {
53	<	return ((PDelay)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;
59	<	}
60	<	public int intValue() {
61	<	return pseudodelay;
72	>	return Integer.MIN_VALUE + pseudodelay;
73		}
63	–
74		public String toString() {
75		return String.valueOf(pseudodelay);
76		}
77		}
78
69	–
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		}
78	–	public int compareTo(NanoDelay y) {
79	–	long i = trigger;
80	–	long j = ((NanoDelay)y).trigger;
81	–	if (i < j) return -1;
82	–	if (i > j) return 1;
83	–	return 0;
84	–	}
87
88		public int compareTo(Delayed y) {
89	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
89	>	return Long.compare(trigger, ((NanoDelay)y).trigger);
90		}
91
92		public boolean equals(Object other) {
93	<	return ((NanoDelay)other).trigger == trigger;
94	<	}
97	<	public boolean equals(NanoDelay other) {
98	<	return ((NanoDelay)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 112 | Line 111 | public class DelayQueueTest extends JSR1
111		}
112		}
113
115	–
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 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 134 | 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 142 | 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 152 | Line 151 | public class DelayQueueTest extends JSR1
151		*/
152		public void testConstructor4() {
153		try {
154	<	PDelay[] ints = new PDelay[SIZE];
156	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
154	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
155		shouldThrow();
156		} catch (NullPointerException success) {}
157		}
#	Line 162 | 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];
167	<	for (int i = 0; i < SIZE-1; ++i)
168	<	ints[i] = new PDelay(i);
169	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
167	>	new DelayQueue(Arrays.asList(a));
168		shouldThrow();
169		} catch (NullPointerException success) {}
170		}
#	Line 189 | 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 199 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elementa added or removed,
203	<	* 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		/**
220	–	* offer(null) throws NPE
221	–	*/
222	–	public void testOfferNull() {
223	–	try {
224	–	DelayQueue q = new DelayQueue();
225	–	q.offer(null);
226	–	shouldThrow();
227	–	} catch (NullPointerException success) {}
228	–	}
229	–
230	–	/**
231	–	* add(null) throws NPE
232	–	*/
233	–	public void testAddNull() {
234	–	try {
235	–	DelayQueue q = new DelayQueue();
236	–	q.add(null);
237	–	shouldThrow();
238	–	} catch (NullPointerException success) {}
239	–	}
240	–
241	–	/**
217		* offer non-null succeeds
218		*/
219		public void testOffer() {
#	Line 259 | Line 234 | public class DelayQueueTest extends JSR1
234		}
235
236		/**
262	–	* addAll(null) throws NPE
263	–	*/
264	–	public void testAddAll1() {
265	–	try {
266	–	DelayQueue q = new DelayQueue();
267	–	q.addAll(null);
268	–	shouldThrow();
269	–	} catch (NullPointerException success) {}
270	–	}
271	–
272	–
273	–	/**
237		* addAll(this) throws IAE
238		*/
239		public void testAddAllSelf() {
240	+	DelayQueue q = populatedQueue(SIZE);
241		try {
278	–	DelayQueue q = populatedQueue(SIZE);
242		q.addAll(q);
243		shouldThrow();
244		} catch (IllegalArgumentException success) {}
245		}
246
247		/**
285	–	* addAll of a collection with null elements throws NPE
286	–	*/
287	–	public void testAddAll2() {
288	–	try {
289	–	DelayQueue q = new DelayQueue();
290	–	PDelay[] ints = new PDelay[SIZE];
291	–	q.addAll(Arrays.asList(ints));
292	–	shouldThrow();
293	–	} catch (NullPointerException success) {}
294	–	}
295	–	/**
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();
302	<	PDelay[] ints = new PDelay[SIZE];
303	<	for (int i = 0; i < SIZE-1; ++i)
304	<	ints[i] = new PDelay(i);
305	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259		} catch (NullPointerException success) {}
260		}
#	Line 313 | 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 323 | Line 275 | public class DelayQueueTest extends JSR1
275		}
276
277		/**
326	–	* put(null) throws NPE
327	–	*/
328	–	public void testPutNull() {
329	–	try {
330	–	DelayQueue q = new DelayQueue();
331	–	q.put(null);
332	–	shouldThrow();
333	–	} catch (NullPointerException success) {}
334	–	}
335	–
336	–	/**
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 351 | 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 359 | Line 300 | public class DelayQueueTest extends JSR1
300		q.put(new PDelay(0));
301		}});
302
303	<	t.start();
304	<	Thread.sleep(SHORT_DELAY_MS);
364	<	q.take();
365	<	t.interrupt();
366	<	t.join();
303	>	awaitTermination(t);
304	>	assertEquals(4, q.size());
305		}
306
307		/**
#	Line 371 | 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 379 | Line 317 | public class DelayQueueTest extends JSR1
317		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
318		}});
319
320	<	t.start();
383	<	Thread.sleep(SMALL_DELAY_MS);
384	<	t.interrupt();
385	<	t.join();
320	>	awaitTermination(t);
321		}
322
323		/**
#	Line 391 | 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		/**
399	–	* take blocks interruptibly when empty
400	–	*/
401	–	public void testTakeFromEmpty() throws InterruptedException {
402	–	final DelayQueue q = new DelayQueue();
403	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
404	–	public void realRun() throws InterruptedException {
405	–	q.take();
406	–	}};
407	–
408	–	t.start();
409	–	Thread.sleep(SHORT_DELAY_MS);
410	–	t.interrupt();
411	–	t.join();
412	–	}
413	–
414	–	/**
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) {
341	>	for (int i = 0; i < SIZE; i++)
342		assertEquals(new PDelay(i), ((PDelay)q.take()));
343	<	}
343	>
344	>	Thread.currentThread().interrupt();
345		try {
346		q.take();
347		shouldThrow();
348		} catch (InterruptedException success) {}
349	+	assertFalse(Thread.interrupted());
350	+
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
436	–
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		}
375
376		/**
377	<	* timed pool with zero timeout succeeds when non-empty, else times out
377	>	* timed poll with zero timeout succeeds when non-empty, else times out
378		*/
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		}
386
387		/**
388	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
388	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
389		*/
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 472 | 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() {
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	<	DelayQueue q = populatedQueue(SIZE);
412	>	long startTime = System.nanoTime();
413		for (int i = 0; i < SIZE; ++i) {
414	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
414	>	assertEquals(new PDelay(i),
415	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
416		}
417	+
418	+	Thread.currentThread().interrupt();
419		try {
420	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
420	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
421		shouldThrow();
422		} catch (InterruptedException success) {}
423	<	}});
486	<
487	<	t.start();
488	<	Thread.sleep(SHORT_DELAY_MS);
489	<	t.interrupt();
490	<	t.join();
491	<	}
423	>	assertFalse(Thread.interrupted());
424
425	<	/**
494	<	*  timed poll before a delayed offer fails; after offer succeeds;
495	<	*  on interruption throws
496	<	*/
497	<	public void testTimedPollWithOffer() throws InterruptedException {
498	<	final DelayQueue q = new DelayQueue();
499	<	final PDelay pdelay = new PDelay(0);
500	<	Thread t = new Thread(new CheckedRunnable() {
501	<	public void realRun() throws InterruptedException {
502	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
503	<	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
425	>	pleaseInterrupt.countDown();
426		try {
427		q.poll(LONG_DELAY_MS, MILLISECONDS);
428		shouldThrow();
429		} catch (InterruptedException success) {}
430	+	assertFalse(Thread.interrupted());
431	+
432	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
433		}});
434
435	<	t.start();
436	<	Thread.sleep(SMALL_DELAY_MS);
512	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
435	>	await(pleaseInterrupt);
436	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
437		t.interrupt();
438	<	t.join();
438	>	awaitTermination(t);
439	>	checkEmpty(q);
440		}
441
517	–
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	<	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
453	<	assertTrue(i != ((PDelay)q.peek()).intValue());
453	>	assertFalse(new PDelay(i).equals(q.peek()));
454		}
455		assertNull(q.peek());
456		}
#	Line 537 | 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 552 | 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 561 | Line 485 | public class DelayQueueTest extends JSR1
485		}
486
487		/**
564	–	* remove(x) removes x and returns true if present
565	–	*/
566	–	public void testRemoveElement() {
567	–	DelayQueue q = populatedQueue(SIZE);
568	–	for (int i = 1; i < SIZE; i+=2) {
569	–	assertTrue(q.remove(new PDelay(i)));
570	–	}
571	–	for (int i = 0; i < SIZE; i+=2) {
572	–	assertTrue(q.remove(new PDelay(i)));
573	–	assertFalse(q.remove(new PDelay(i+1)));
574	–	}
575	–	assertTrue(q.isEmpty());
576	–	}
577	–
578	–	/**
488		* contains(x) reports true when elements added but not yet removed
489		*/
490		public void testContains() {
#	Line 595 | 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 632 | 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 645 | 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 661 | 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());
586	>	assertSame(ints[i], q.remove());
587		}
588
679	–
589		/**
590	<	* toArray(null) throws NPE
682	<	*/
683	<	public void testToArray_BadArg() {
684	<	try {
685	<	DelayQueue q = populatedQueue(SIZE);
686	<	Object o[] = q.toArray(null);
687	<	shouldThrow();
688	<	} catch (NullPointerException success) {}
689	<	}
690	<
691	<	/**
692	<	* 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	<	DelayQueue q = populatedQueue(SIZE);
697	<	Object o[] = q.toArray(new String[10] );
595	>	q.toArray(new String[10]);
596		shouldThrow();
597		} catch (ArrayStoreException success) {}
598		}
#	Line 711 | 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		/**
623		* iterator.remove removes current element
624		*/
625	<	public void testIteratorRemove () {
625	>	public void testIteratorRemove() {
626		final DelayQueue q = new DelayQueue();
627		q.add(new PDelay(2));
628		q.add(new PDelay(1));
#	Line 725 | 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
733	–
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);
742	<	}
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	<	threadAssertNull(q.poll());
658	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
659	<	threadAssertTrue(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);
669	<
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
768	–
673		/**
674		* Delayed actions do not occur until their delay elapses
675		*/
676		public void testDelay() throws InterruptedException {
677	<	DelayQueue q = new DelayQueue();
678	<	NanoDelay[] elements = new NanoDelay[SIZE];
679	<	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	<	}
677	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
678	>	for (int i = 0; i < SIZE; ++i)
679	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
680
681		long last = 0;
682		for (int i = 0; i < SIZE; ++i) {
683	<	NanoDelay e = (NanoDelay)(q.take());
683	>	NanoDelay e = q.take();
684		long tt = e.getTriggerTime();
685	<	assertTrue(tt <= System.nanoTime());
685	>	assertTrue(System.nanoTime() - tt >= 0);
686		if (i != 0)
687		assertTrue(tt >= last);
688		last = tt;
689		}
690	+	assertTrue(q.isEmpty());
691		}
692
693		/**
#	Line 796 | Line 696 | public class DelayQueueTest extends JSR1
696		public void testPeekDelayed() {
697		DelayQueue q = new DelayQueue();
698		q.add(new NanoDelay(Long.MAX_VALUE));
699	<	assert(q.peek() != null);
699	>	assertNotNull(q.peek());
700		}
701
802	–
702		/**
703		* poll of a non-empty queue returns null if no expired elements.
704		*/
#	Line 815 | 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));
718	<	}
719	<
821	<	/**
822	<	* drainTo(null) throws NPE
823	<	*/
824	<	public void testDrainToNull() {
825	<	DelayQueue q = populatedQueue(SIZE);
826	<	try {
827	<	q.drainTo(null);
828	<	shouldThrow();
829	<	} catch (NullPointerException success) {}
830	<	}
831	<
832	<	/**
833	<	* drainTo(this) throws IAE
834	<	*/
835	<	public void testDrainToSelf() {
836	<	DelayQueue q = populatedQueue(SIZE);
837	<	try {
838	<	q.drainTo(q);
839	<	shouldThrow();
840	<	} catch (IllegalArgumentException success) {}
717	>	long startTime = System.nanoTime();
718	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
719	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
720		}
721
722		/**
#	Line 852 | Line 731 | public class DelayQueueTest extends JSR1
731		}
732		ArrayList l = new ArrayList();
733		q.drainTo(l);
734	<	assertEquals(q.size(), 0);
734	>	assertEquals(0, q.size());
735		for (int i = 0; i < SIZE; ++i)
736	<	assertEquals(l.get(i), elems[i]);
736	>	assertEquals(elems[i], l.get(i));
737		q.add(elems[0]);
738		q.add(elems[1]);
739		assertFalse(q.isEmpty());
#	Line 862 | Line 741 | public class DelayQueueTest extends JSR1
741		assertTrue(q.contains(elems[1]));
742		l.clear();
743		q.drainTo(l);
744	<	assertEquals(q.size(), 0);
745	<	assertEquals(l.size(), 2);
744	>	assertEquals(0, q.size());
745	>	assertEquals(2, l.size());
746		for (int i = 0; i < 2; ++i)
747	<	assertEquals(l.get(i), elems[i]);
747	>	assertEquals(elems[i], l.get(i));
748		}
749
750		/**
#	Line 875 | Line 754 | public class DelayQueueTest extends JSR1
754		final DelayQueue q = populatedQueue(SIZE);
755		Thread t = new Thread(new CheckedRunnable() {
756		public void realRun() {
757	<	q.put(new PDelay(SIZE+1));
757	>	q.put(new PDelay(SIZE + 1));
758		}});
759
760		t.start();
#	Line 887 | Line 766 | public class DelayQueueTest extends JSR1
766		}
767
768		/**
769	<	* drainTo(null, n) throws NPE
891	<	*/
892	<	public void testDrainToNullN() {
893	<	DelayQueue q = populatedQueue(SIZE);
894	<	try {
895	<	q.drainTo(null, 0);
896	<	shouldThrow();
897	<	} catch (NullPointerException success) {}
898	<	}
899	<
900	<	/**
901	<	* drainTo(this, n) throws IAE
902	<	*/
903	<	public void testDrainToSelfN() {
904	<	DelayQueue q = populatedQueue(SIZE);
905	<	try {
906	<	q.drainTo(q, 0);
907	<	shouldThrow();
908	<	} catch (IllegalArgumentException success) {}
909	<	}
910	<
911	<	/**
912	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
769	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
770		*/
771		public void testDrainToN() {
772		for (int i = 0; i < SIZE + 2; ++i) {
773		DelayQueue q = populatedQueue(SIZE);
774		ArrayList l = new ArrayList();
775		q.drainTo(l, i);
776	<	int k = (i < SIZE)? i : SIZE;
777	<	assertEquals(q.size(), SIZE-k);
778	<	assertEquals(l.size(), k);
776	>	int k = (i < SIZE) ? i : SIZE;
777	>	assertEquals(SIZE - k, q.size());
778	>	assertEquals(k, l.size());
779		}
780		}
781
782	<
782	>	/**
783	>	* remove(null), contains(null) always return false
784	>	*/
785	>	public void testNeverContainsNull() {
786	>	Collection<?> q = populatedQueue(SIZE);
787	>	assertFalse(q.contains(null));
788	>	assertFalse(q.remove(null));
789	>	}
790		}

Diff Legend

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