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.38 by jsr166, Tue Oct 19 00:41:14 2010 UTC vs.
Revision 1.77 by jsr166, Thu Sep 15 17:07:16 2016 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	>	return newTestSuite(DelayQueueTest.class,
43	>	new Generic().testSuite());
44		}
45
23	–	private static final int NOCAP = Integer.MAX_VALUE;
24	–
46		/**
47		* A delayed implementation for testing.
48		* Most tests use Pseudodelays, where delays are all elapsed
#	Line 29 | Line 50 | public class DelayQueueTest extends JSR1
50		*/
51		static class PDelay implements Delayed {
52		int pseudodelay;
53	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
54	<	public int compareTo(PDelay y) {
55	<	int i = pseudodelay;
56	<	int j = y.pseudodelay;
57	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
53	>	PDelay(int i) { pseudodelay = i; }
54	>	public int compareTo(PDelay other) {
55	>	int a = this.pseudodelay;
56	>	int b = other.pseudodelay;
57	>	return (a < b) ? -1 : (a > b) ? 1 : 0;
58		}
40	–
59		public int compareTo(Delayed y) {
60		return compareTo((PDelay)y);
61		}
44	–
62		public boolean equals(Object other) {
63	<	return equals((PDelay)other);
64	<	}
48	<	public boolean equals(PDelay other) {
49	<	return other.pseudodelay == pseudodelay;
63	>	return (other instanceof PDelay) &&
64	>	this.pseudodelay == ((PDelay)other).pseudodelay;
65		}
66	<
67	<
66	>	// suppress [overrides] javac warning
67	>	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69	<	return pseudodelay;
55	<	}
56	<	public int intValue() {
57	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
59	–
71		public String toString() {
72		return String.valueOf(pseudodelay);
73		}
74		}
75
65	–
76		/**
77		* Delayed implementation that actually delays
78		*/
#	Line 84 | Line 94 | public class DelayQueueTest extends JSR1
94		}
95
96		public boolean equals(Object other) {
97	<	return equals((NanoDelay)other);
98	<	}
89	<	public boolean equals(NanoDelay other) {
90	<	return other.trigger == trigger;
97	>	return (other instanceof NanoDelay) &&
98	>	this.trigger == ((NanoDelay)other).trigger;
99		}
100
101	+	// suppress [overrides] javac warning
102	+	public int hashCode() { return (int) trigger; }
103	+
104		public long getDelay(TimeUnit unit) {
105		long n = trigger - System.nanoTime();
106		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 104 | Line 115 | public class DelayQueueTest extends JSR1
115		}
116		}
117
107	–
118		/**
119	<	* Create a queue of given size containing consecutive
119	>	* Returns a new queue of given size containing consecutive
120		* PDelays 0 ... n.
121		*/
122	<	private DelayQueue populatedQueue(int n) {
123	<	DelayQueue q = new DelayQueue();
122	>	private DelayQueue<PDelay> populatedQueue(int n) {
123	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
124		assertTrue(q.isEmpty());
125	<	for (int i = n-1; i >= 0; i-=2)
125	>	for (int i = n - 1; i >= 0; i -= 2)
126		assertTrue(q.offer(new PDelay(i)));
127	<	for (int i = (n & 1); i < n; i+=2)
127	>	for (int i = (n & 1); i < n; i += 2)
128		assertTrue(q.offer(new PDelay(i)));
129		assertFalse(q.isEmpty());
130	<	assertEquals(NOCAP, q.remainingCapacity());
130	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
131		assertEquals(n, q.size());
132		return q;
133		}
#	Line 126 | Line 136 | public class DelayQueueTest extends JSR1
136		* A new queue has unbounded capacity
137		*/
138		public void testConstructor1() {
139	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
139	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
140		}
141
142		/**
#	Line 134 | Line 144 | public class DelayQueueTest extends JSR1
144		*/
145		public void testConstructor3() {
146		try {
147	<	DelayQueue q = new DelayQueue(null);
147	>	new DelayQueue(null);
148		shouldThrow();
149		} catch (NullPointerException success) {}
150		}
#	Line 144 | Line 154 | public class DelayQueueTest extends JSR1
154		*/
155		public void testConstructor4() {
156		try {
157	<	PDelay[] ints = new PDelay[SIZE];
148	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
157	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
158		shouldThrow();
159		} catch (NullPointerException success) {}
160		}
#	Line 154 | Line 163 | public class DelayQueueTest extends JSR1
163		* Initializing from Collection with some null elements throws NPE
164		*/
165		public void testConstructor5() {
166	+	PDelay[] a = new PDelay[SIZE];
167	+	for (int i = 0; i < SIZE - 1; ++i)
168	+	a[i] = new PDelay(i);
169		try {
170	<	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));
170	>	new DelayQueue(Arrays.asList(a));
171		shouldThrow();
172		} catch (NullPointerException success) {}
173		}
#	Line 181 | Line 190 | public class DelayQueueTest extends JSR1
190		public void testEmpty() {
191		DelayQueue q = new DelayQueue();
192		assertTrue(q.isEmpty());
193	<	assertEquals(NOCAP, q.remainingCapacity());
193	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
194		q.add(new PDelay(1));
195		assertFalse(q.isEmpty());
196		q.add(new PDelay(2));
#	Line 191 | Line 200 | public class DelayQueueTest extends JSR1
200		}
201
202		/**
203	<	* remainingCapacity does not change when elements added or removed,
195	<	* but size does
203	>	* remainingCapacity() always returns Integer.MAX_VALUE
204		*/
205		public void testRemainingCapacity() {
206	<	DelayQueue q = populatedQueue(SIZE);
206	>	BlockingQueue q = populatedQueue(SIZE);
207		for (int i = 0; i < SIZE; ++i) {
208	<	assertEquals(NOCAP, q.remainingCapacity());
209	<	assertEquals(SIZE-i, q.size());
210	<	q.remove();
208	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
209	>	assertEquals(SIZE - i, q.size());
210	>	assertTrue(q.remove() instanceof PDelay);
211		}
212		for (int i = 0; i < SIZE; ++i) {
213	<	assertEquals(NOCAP, q.remainingCapacity());
213	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
214		assertEquals(i, q.size());
215	<	q.add(new PDelay(i));
215	>	assertTrue(q.add(new PDelay(i)));
216		}
217		}
218
219		/**
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	–	/**
220		* offer non-null succeeds
221		*/
222		public void testOffer() {
#	Line 251 | Line 237 | public class DelayQueueTest extends JSR1
237		}
238
239		/**
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	–	/**
240		* addAll(this) throws IAE
241		*/
242		public void testAddAllSelf() {
243	+	DelayQueue q = populatedQueue(SIZE);
244		try {
270	–	DelayQueue q = populatedQueue(SIZE);
245		q.addAll(q);
246		shouldThrow();
247		} catch (IllegalArgumentException success) {}
248		}
249
250		/**
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	–	/**
251		* addAll of a collection with any null elements throws NPE after
252		* possibly adding some elements
253		*/
254		public void testAddAll3() {
255	+	DelayQueue q = new DelayQueue();
256	+	PDelay[] a = new PDelay[SIZE];
257	+	for (int i = 0; i < SIZE - 1; ++i)
258	+	a[i] = new PDelay(i);
259		try {
260	<	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));
260	>	q.addAll(Arrays.asList(a));
261		shouldThrow();
262		} catch (NullPointerException success) {}
263		}
#	Line 306 | Line 268 | public class DelayQueueTest extends JSR1
268		public void testAddAll5() {
269		PDelay[] empty = new PDelay[0];
270		PDelay[] ints = new PDelay[SIZE];
271	<	for (int i = SIZE-1; i >= 0; --i)
271	>	for (int i = SIZE - 1; i >= 0; --i)
272		ints[i] = new PDelay(i);
273		DelayQueue q = new DelayQueue();
274		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 316 | Line 278 | public class DelayQueueTest extends JSR1
278		}
279
280		/**
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	–	/**
281		* all elements successfully put are contained
282		*/
283	<	public void testPut() {
284	<	DelayQueue q = new DelayQueue();
285	<	for (int i = 0; i < SIZE; ++i) {
286	<	PDelay I = new PDelay(i);
287	<	q.put(I);
288	<	assertTrue(q.contains(I));
289	<	}
290	<	assertEquals(SIZE, q.size());
283	>	public void testPut() {
284	>	DelayQueue q = new DelayQueue();
285	>	for (int i = 0; i < SIZE; ++i) {
286	>	PDelay x = new PDelay(i);
287	>	q.put(x);
288	>	assertTrue(q.contains(x));
289	>	}
290	>	assertEquals(SIZE, q.size());
291		}
292
293		/**
#	Line 344 | Line 295 | public class DelayQueueTest extends JSR1
295		*/
296		public void testPutWithTake() throws InterruptedException {
297		final DelayQueue q = new DelayQueue();
298	<	Thread t = new Thread(new CheckedRunnable() {
298	>	Thread t = newStartedThread(new CheckedRunnable() {
299		public void realRun() {
300		q.put(new PDelay(0));
301		q.put(new PDelay(0));
#	Line 352 | Line 303 | public class DelayQueueTest extends JSR1
303		q.put(new PDelay(0));
304		}});
305
306	<	t.start();
307	<	Thread.sleep(SHORT_DELAY_MS);
357	<	q.take();
358	<	t.interrupt();
359	<	t.join();
306	>	awaitTermination(t);
307	>	assertEquals(4, q.size());
308		}
309
310		/**
#	Line 364 | Line 312 | public class DelayQueueTest extends JSR1
312		*/
313		public void testTimedOffer() throws InterruptedException {
314		final DelayQueue q = new DelayQueue();
315	<	Thread t = new Thread(new CheckedRunnable() {
315	>	Thread t = newStartedThread(new CheckedRunnable() {
316		public void realRun() throws InterruptedException {
317		q.put(new PDelay(0));
318		q.put(new PDelay(0));
#	Line 372 | Line 320 | public class DelayQueueTest extends JSR1
320		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
321		}});
322
323	<	t.start();
376	<	Thread.sleep(SMALL_DELAY_MS);
377	<	t.interrupt();
378	<	t.join();
323	>	awaitTermination(t);
324		}
325
326		/**
#	Line 384 | Line 329 | public class DelayQueueTest extends JSR1
329		public void testTake() throws InterruptedException {
330		DelayQueue q = populatedQueue(SIZE);
331		for (int i = 0; i < SIZE; ++i) {
332	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
332	>	assertEquals(new PDelay(i), q.take());
333		}
334		}
335
336		/**
392	–	* take blocks interruptibly when empty
393	–	*/
394	–	public void testTakeFromEmpty() throws InterruptedException {
395	–	final DelayQueue q = new DelayQueue();
396	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
397	–	public void realRun() throws InterruptedException {
398	–	q.take();
399	–	}};
400	–
401	–	t.start();
402	–	Thread.sleep(SHORT_DELAY_MS);
403	–	t.interrupt();
404	–	t.join();
405	–	}
406	–
407	–	/**
337		* Take removes existing elements until empty, then blocks interruptibly
338		*/
339		public void testBlockingTake() throws InterruptedException {
340		final DelayQueue q = populatedQueue(SIZE);
341	<	Thread t = new Thread(new CheckedRunnable() {
341	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
342	>	Thread t = newStartedThread(new CheckedRunnable() {
343		public void realRun() throws InterruptedException {
344		for (int i = 0; i < SIZE; ++i) {
345		assertEquals(new PDelay(i), ((PDelay)q.take()));
346		}
347	+
348	+	Thread.currentThread().interrupt();
349		try {
350		q.take();
351		shouldThrow();
352		} catch (InterruptedException success) {}
353	+	assertFalse(Thread.interrupted());
354	+
355	+	pleaseInterrupt.countDown();
356	+	try {
357	+	q.take();
358	+	shouldThrow();
359	+	} catch (InterruptedException success) {}
360	+	assertFalse(Thread.interrupted());
361		}});
362
363	<	t.start();
364	<	Thread.sleep(SHORT_DELAY_MS);
363	>	await(pleaseInterrupt);
364	>	assertThreadStaysAlive(t);
365		t.interrupt();
366	<	t.join();
366	>	awaitTermination(t);
367		}
368
429	–
369		/**
370		* poll succeeds unless empty
371		*/
372		public void testPoll() {
373		DelayQueue q = populatedQueue(SIZE);
374		for (int i = 0; i < SIZE; ++i) {
375	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
375	>	assertEquals(new PDelay(i), q.poll());
376		}
377		assertNull(q.poll());
378		}
379
380		/**
381	<	* timed pool with zero timeout succeeds when non-empty, else times out
381	>	* timed poll with zero timeout succeeds when non-empty, else times out
382		*/
383		public void testTimedPoll0() throws InterruptedException {
384		DelayQueue q = populatedQueue(SIZE);
385		for (int i = 0; i < SIZE; ++i) {
386	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
386	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
387		}
388		assertNull(q.poll(0, MILLISECONDS));
389		}
390
391		/**
392	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
392	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
393		*/
394		public void testTimedPoll() throws InterruptedException {
395		DelayQueue q = populatedQueue(SIZE);
396		for (int i = 0; i < SIZE; ++i) {
397	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
398	<	}
399	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
397	>	long startTime = System.nanoTime();
398	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
399	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
400	>	}
401	>	long startTime = System.nanoTime();
402	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
403	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
404	>	checkEmpty(q);
405		}
406
407		/**
#	Line 465 | Line 409 | public class DelayQueueTest extends JSR1
409		* returning timeout status
410		*/
411		public void testInterruptedTimedPoll() throws InterruptedException {
412	<	Thread t = new Thread(new CheckedRunnable() {
412	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
413	>	final DelayQueue q = populatedQueue(SIZE);
414	>	Thread t = newStartedThread(new CheckedRunnable() {
415		public void realRun() throws InterruptedException {
416	<	DelayQueue q = populatedQueue(SIZE);
416	>	long startTime = System.nanoTime();
417		for (int i = 0; i < SIZE; ++i) {
418	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
418	>	assertEquals(new PDelay(i),
419	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
420		}
474	–	try {
475	–	q.poll(SMALL_DELAY_MS, MILLISECONDS);
476	–	shouldThrow();
477	–	} catch (InterruptedException success) {}
478	–	}});
479	–
480	–	t.start();
481	–	Thread.sleep(SHORT_DELAY_MS);
482	–	t.interrupt();
483	–	t.join();
484	–	}
485	–
486	–	/**
487	–	* timed poll before a delayed offer fails; after offer succeeds;
488	–	* on interruption throws
489	–	*/
490	–	public void testTimedPollWithOffer() throws InterruptedException {
491	–	final DelayQueue q = new DelayQueue();
492	–	final PDelay pdelay = new PDelay(0);
493	–	final CheckedBarrier barrier = new CheckedBarrier(2);
494	–	Thread t = new Thread(new CheckedRunnable() {
495	–	public void realRun() throws InterruptedException {
496	–	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
497	–
498	–	barrier.await();
499	–	assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
421
422		Thread.currentThread().interrupt();
423		try {
424	<	q.poll(SHORT_DELAY_MS, MILLISECONDS);
424	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
425		shouldThrow();
426		} catch (InterruptedException success) {}
427	+	assertFalse(Thread.interrupted());
428
429	<	barrier.await();
429	>	pleaseInterrupt.countDown();
430		try {
431	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
431	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
432		shouldThrow();
433		} catch (InterruptedException success) {}
434	+	assertFalse(Thread.interrupted());
435	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
436		}});
437
438	<	t.start();
439	<	barrier.await();
516	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
517	<	barrier.await();
518	<	sleep(SHORT_DELAY_MS);
438	>	await(pleaseInterrupt);
439	>	assertThreadStaysAlive(t);
440		t.interrupt();
441	<	t.join();
441	>	awaitTermination(t);
442	>	checkEmpty(q);
443		}
444
523	–
445		/**
446		* peek returns next element, or null if empty
447		*/
448		public void testPeek() {
449		DelayQueue q = populatedQueue(SIZE);
450		for (int i = 0; i < SIZE; ++i) {
451	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
452	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
451	>	assertEquals(new PDelay(i), q.peek());
452	>	assertEquals(new PDelay(i), q.poll());
453		if (q.isEmpty())
454		assertNull(q.peek());
455		else
#	Line 543 | Line 464 | public class DelayQueueTest extends JSR1
464		public void testElement() {
465		DelayQueue q = populatedQueue(SIZE);
466		for (int i = 0; i < SIZE; ++i) {
467	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
467	>	assertEquals(new PDelay(i), q.element());
468		q.poll();
469		}
470		try {
#	Line 558 | Line 479 | public class DelayQueueTest extends JSR1
479		public void testRemove() {
480		DelayQueue q = populatedQueue(SIZE);
481		for (int i = 0; i < SIZE; ++i) {
482	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
482	>	assertEquals(new PDelay(i), q.remove());
483		}
484		try {
485		q.remove();
#	Line 567 | Line 488 | public class DelayQueueTest extends JSR1
488		}
489
490		/**
570	–	* remove(x) removes x and returns true if present
571	–	*/
572	–	public void testRemoveElement() {
573	–	DelayQueue q = populatedQueue(SIZE);
574	–	for (int i = 1; i < SIZE; i+=2) {
575	–	assertTrue(q.remove(new PDelay(i)));
576	–	}
577	–	for (int i = 0; i < SIZE; i+=2) {
578	–	assertTrue(q.remove(new PDelay(i)));
579	–	assertFalse(q.remove(new PDelay(i+1)));
580	–	}
581	–	assertTrue(q.isEmpty());
582	–	}
583	–
584	–	/**
491		* contains(x) reports true when elements added but not yet removed
492		*/
493		public void testContains() {
#	Line 601 | Line 507 | public class DelayQueueTest extends JSR1
507		q.clear();
508		assertTrue(q.isEmpty());
509		assertEquals(0, q.size());
510	<	assertEquals(NOCAP, q.remainingCapacity());
510	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
511		PDelay x = new PDelay(1);
512		q.add(x);
513		assertFalse(q.isEmpty());
#	Line 638 | Line 544 | public class DelayQueueTest extends JSR1
544		assertTrue(changed);
545
546		assertTrue(q.containsAll(p));
547	<	assertEquals(SIZE-i, q.size());
547	>	assertEquals(SIZE - i, q.size());
548		p.remove();
549		}
550		}
#	Line 651 | Line 557 | public class DelayQueueTest extends JSR1
557		DelayQueue q = populatedQueue(SIZE);
558		DelayQueue p = populatedQueue(i);
559		assertTrue(q.removeAll(p));
560	<	assertEquals(SIZE-i, q.size());
560	>	assertEquals(SIZE - i, q.size());
561		for (int j = 0; j < i; ++j) {
562	<	PDelay I = (PDelay)(p.remove());
563	<	assertFalse(q.contains(I));
562	>	PDelay x = (PDelay)(p.remove());
563	>	assertFalse(q.contains(x));
564		}
565		}
566		}
#	Line 667 | Line 573 | public class DelayQueueTest extends JSR1
573		Object[] o = q.toArray();
574		Arrays.sort(o);
575		for (int i = 0; i < o.length; i++)
576	<	assertEquals(o[i], q.take());
576	>	assertSame(o[i], q.take());
577		}
578
579		/**
580		* toArray(a) contains all elements
581		*/
582	<	public void testToArray2() throws InterruptedException {
583	<	DelayQueue q = populatedQueue(SIZE);
582	>	public void testToArray2() {
583	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
584		PDelay[] ints = new PDelay[SIZE];
585	<	ints = (PDelay[])q.toArray(ints);
585	>	PDelay[] array = q.toArray(ints);
586	>	assertSame(ints, array);
587		Arrays.sort(ints);
588		for (int i = 0; i < ints.length; i++)
589	<	assertEquals(ints[i], q.take());
683	<	}
684	<
685	<
686	<	/**
687	<	* toArray(null) throws NPE
688	<	*/
689	<	public void testToArray_BadArg() {
690	<	DelayQueue q = populatedQueue(SIZE);
691	<	try {
692	<	Object o[] = q.toArray(null);
693	<	shouldThrow();
694	<	} catch (NullPointerException success) {}
589	>	assertSame(ints[i], q.remove());
590		}
591
592		/**
593	<	* toArray with incompatible array type throws CCE
593	>	* toArray(incompatible array type) throws ArrayStoreException
594		*/
595		public void testToArray1_BadArg() {
596		DelayQueue q = populatedQueue(SIZE);
597		try {
598	<	Object o[] = q.toArray(new String[10]);
598	>	q.toArray(new String[10]);
599		shouldThrow();
600		} catch (ArrayStoreException success) {}
601		}
#	Line 717 | Line 612 | public class DelayQueueTest extends JSR1
612		++i;
613		}
614		assertEquals(i, SIZE);
615	+	assertIteratorExhausted(it);
616	+	}
617	+
618	+	/**
619	+	* iterator of empty collection has no elements
620	+	*/
621	+	public void testEmptyIterator() {
622	+	assertIteratorExhausted(new DelayQueue().iterator());
623		}
624
625		/**
#	Line 731 | Line 634 | public class DelayQueueTest extends JSR1
634		it.next();
635		it.remove();
636		it = q.iterator();
637	<	assertEquals(it.next(), new PDelay(2));
638	<	assertEquals(it.next(), new PDelay(3));
637	>	assertEquals(new PDelay(2), it.next());
638	>	assertEquals(new PDelay(3), it.next());
639		assertFalse(it.hasNext());
640		}
641
739	–
642		/**
643		* toString contains toStrings of elements
644		*/
645		public void testToString() {
646		DelayQueue q = populatedQueue(SIZE);
647		String s = q.toString();
648	<	for (int i = 0; i < SIZE; ++i) {
649	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
748	<	}
648	>	for (Object e : q)
649	>	assertTrue(s.contains(e.toString()));
650		}
651
652		/**
653	<	* offer transfers elements across Executor tasks
653	>	* timed poll transfers elements across Executor tasks
654		*/
655		public void testPollInExecutor() {
656		final DelayQueue q = new DelayQueue();
657	<	ExecutorService executor = Executors.newFixedThreadPool(2);
658	<	executor.execute(new CheckedRunnable() {
659	<	public void realRun() throws InterruptedException {
660	<	assertNull(q.poll());
661	<	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
662	<	assertTrue(q.isEmpty());
663	<	}});
664	<
665	<	executor.execute(new CheckedRunnable() {
666	<	public void realRun() throws InterruptedException {
667	<	Thread.sleep(SHORT_DELAY_MS);
668	<	q.put(new PDelay(1));
669	<	}});
670	<
671	<	joinPool(executor);
657	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
658	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
659	>	try (PoolCleaner cleaner = cleaner(executor)) {
660	>	executor.execute(new CheckedRunnable() {
661	>	public void realRun() throws InterruptedException {
662	>	assertNull(q.poll());
663	>	threadsStarted.await();
664	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
665	>	checkEmpty(q);
666	>	}});
667	>
668	>	executor.execute(new CheckedRunnable() {
669	>	public void realRun() throws InterruptedException {
670	>	threadsStarted.await();
671	>	q.put(new PDelay(1));
672	>	}});
673	>	}
674		}
675
773	–
676		/**
677		* Delayed actions do not occur until their delay elapses
678		*/
#	Line 800 | Line 702 | public class DelayQueueTest extends JSR1
702		assertNotNull(q.peek());
703		}
704
803	–
705		/**
706		* poll of a non-empty queue returns null if no expired elements.
707		*/
#	Line 816 | Line 717 | public class DelayQueueTest extends JSR1
717		public void testTimedPollDelayed() throws InterruptedException {
718		DelayQueue q = new DelayQueue();
719		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
720	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
820	<	}
821	<
822	<	/**
823	<	* drainTo(null) throws NPE
824	<	*/
825	<	public void testDrainToNull() {
826	<	DelayQueue q = populatedQueue(SIZE);
827	<	try {
828	<	q.drainTo(null);
829	<	shouldThrow();
830	<	} catch (NullPointerException success) {}
831	<	}
832	<
833	<	/**
834	<	* drainTo(this) throws IAE
835	<	*/
836	<	public void testDrainToSelf() {
837	<	DelayQueue q = populatedQueue(SIZE);
838	<	try {
839	<	q.drainTo(q);
840	<	shouldThrow();
841	<	} catch (IllegalArgumentException success) {}
720	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
721		}
722
723		/**
#	Line 853 | Line 732 | public class DelayQueueTest extends JSR1
732		}
733		ArrayList l = new ArrayList();
734		q.drainTo(l);
735	<	assertEquals(q.size(), 0);
735	>	assertEquals(0, q.size());
736		for (int i = 0; i < SIZE; ++i)
737	<	assertEquals(l.get(i), elems[i]);
737	>	assertEquals(elems[i], l.get(i));
738		q.add(elems[0]);
739		q.add(elems[1]);
740		assertFalse(q.isEmpty());
#	Line 863 | Line 742 | public class DelayQueueTest extends JSR1
742		assertTrue(q.contains(elems[1]));
743		l.clear();
744		q.drainTo(l);
745	<	assertEquals(q.size(), 0);
746	<	assertEquals(l.size(), 2);
745	>	assertEquals(0, q.size());
746	>	assertEquals(2, l.size());
747		for (int i = 0; i < 2; ++i)
748	<	assertEquals(l.get(i), elems[i]);
748	>	assertEquals(elems[i], l.get(i));
749		}
750
751		/**
#	Line 876 | Line 755 | public class DelayQueueTest extends JSR1
755		final DelayQueue q = populatedQueue(SIZE);
756		Thread t = new Thread(new CheckedRunnable() {
757		public void realRun() {
758	<	q.put(new PDelay(SIZE+1));
758	>	q.put(new PDelay(SIZE + 1));
759		}});
760
761		t.start();
#	Line 888 | Line 767 | public class DelayQueueTest extends JSR1
767		}
768
769		/**
891	–	* drainTo(null, n) throws NPE
892	–	*/
893	–	public void testDrainToNullN() {
894	–	DelayQueue q = populatedQueue(SIZE);
895	–	try {
896	–	q.drainTo(null, 0);
897	–	shouldThrow();
898	–	} catch (NullPointerException success) {}
899	–	}
900	–
901	–	/**
902	–	* drainTo(this, n) throws IAE
903	–	*/
904	–	public void testDrainToSelfN() {
905	–	DelayQueue q = populatedQueue(SIZE);
906	–	try {
907	–	q.drainTo(q, 0);
908	–	shouldThrow();
909	–	} catch (IllegalArgumentException success) {}
910	–	}
911	–
912	–	/**
770		* drainTo(c, n) empties first min(n, size) elements of queue into c
771		*/
772		public void testDrainToN() {
#	Line 917 | Line 774 | public class DelayQueueTest extends JSR1
774		DelayQueue q = populatedQueue(SIZE);
775		ArrayList l = new ArrayList();
776		q.drainTo(l, i);
777	<	int k = (i < SIZE)? i : SIZE;
778	<	assertEquals(q.size(), SIZE-k);
779	<	assertEquals(l.size(), k);
777	>	int k = (i < SIZE) ? i : SIZE;
778	>	assertEquals(SIZE - k, q.size());
779	>	assertEquals(k, l.size());
780		}
781		}
782
783	<
783	>	/**
784	>	* remove(null), contains(null) always return false
785	>	*/
786	>	public void testNeverContainsNull() {
787	>	Collection<?> q = populatedQueue(SIZE);
788	>	assertFalse(q.contains(null));
789	>	assertFalse(q.remove(null));
790	>	}
791		}

Diff Legend

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