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.28 by jsr166, Tue Dec 1 06:39:23 2009 UTC vs.
Revision 1.78 by jsr166, Sun Oct 16 20:44:18 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);
63	>	return (other instanceof PDelay) &&
64	>	this.pseudodelay == ((PDelay)other).pseudodelay;
65		}
66	<	public boolean equals(PDelay other) {
67	<	return other.pseudodelay == pseudodelay;
50	<	}
51	<
52	<
66	>	// suppress [overrides] javac warning
67	>	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
56	–	public int intValue() {
57	–	return pseudodelay;
58	–	}
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
120	<	* PDelays 0 ... n.
119	>	* Returns a new queue of given size containing consecutive
120	>	* PDelays 0 ... n - 1.
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	+	assertEquals(new PDelay(0), q.peek());
133		return q;
134		}
135
#	Line 126 | Line 137 | public class DelayQueueTest extends JSR1
137		* A new queue has unbounded capacity
138		*/
139		public void testConstructor1() {
140	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
140	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
141		}
142
143		/**
#	Line 134 | Line 145 | public class DelayQueueTest extends JSR1
145		*/
146		public void testConstructor3() {
147		try {
148	<	DelayQueue q = new DelayQueue(null);
148	>	new DelayQueue(null);
149		shouldThrow();
150		} catch (NullPointerException success) {}
151		}
#	Line 144 | Line 155 | public class DelayQueueTest extends JSR1
155		*/
156		public void testConstructor4() {
157		try {
158	<	PDelay[] ints = new PDelay[SIZE];
148	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
158	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
159		shouldThrow();
160		} catch (NullPointerException success) {}
161		}
#	Line 154 | Line 164 | public class DelayQueueTest extends JSR1
164		* Initializing from Collection with some null elements throws NPE
165		*/
166		public void testConstructor5() {
167	+	PDelay[] a = new PDelay[SIZE];
168	+	for (int i = 0; i < SIZE - 1; ++i)
169	+	a[i] = new PDelay(i);
170		try {
171	<	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));
171	>	new DelayQueue(Arrays.asList(a));
172		shouldThrow();
173		} catch (NullPointerException success) {}
174		}
#	Line 181 | Line 191 | public class DelayQueueTest extends JSR1
191		public void testEmpty() {
192		DelayQueue q = new DelayQueue();
193		assertTrue(q.isEmpty());
194	<	assertEquals(NOCAP, q.remainingCapacity());
194	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
195		q.add(new PDelay(1));
196		assertFalse(q.isEmpty());
197		q.add(new PDelay(2));
#	Line 191 | Line 201 | public class DelayQueueTest extends JSR1
201		}
202
203		/**
204	<	* remainingCapacity does not change when elementa added or removed,
195	<	* but size does
204	>	* remainingCapacity() always returns Integer.MAX_VALUE
205		*/
206		public void testRemainingCapacity() {
207	<	DelayQueue q = populatedQueue(SIZE);
207	>	BlockingQueue q = populatedQueue(SIZE);
208		for (int i = 0; i < SIZE; ++i) {
209	<	assertEquals(NOCAP, q.remainingCapacity());
210	<	assertEquals(SIZE-i, q.size());
211	<	q.remove();
209	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
210	>	assertEquals(SIZE - i, q.size());
211	>	assertTrue(q.remove() instanceof PDelay);
212		}
213		for (int i = 0; i < SIZE; ++i) {
214	<	assertEquals(NOCAP, q.remainingCapacity());
214	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
215		assertEquals(i, q.size());
216	<	q.add(new PDelay(i));
216	>	assertTrue(q.add(new PDelay(i)));
217		}
218		}
219
220		/**
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	–	/**
221		* offer non-null succeeds
222		*/
223		public void testOffer() {
#	Line 251 | Line 238 | public class DelayQueueTest extends JSR1
238		}
239
240		/**
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	–	/**
241		* addAll(this) throws IAE
242		*/
243		public void testAddAllSelf() {
244	+	DelayQueue q = populatedQueue(SIZE);
245		try {
270	–	DelayQueue q = populatedQueue(SIZE);
246		q.addAll(q);
247		shouldThrow();
248		} catch (IllegalArgumentException success) {}
249		}
250
251		/**
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	–	/**
252		* addAll of a collection with any null elements throws NPE after
253		* possibly adding some elements
254		*/
255		public void testAddAll3() {
256	+	DelayQueue q = new DelayQueue();
257	+	PDelay[] a = new PDelay[SIZE];
258	+	for (int i = 0; i < SIZE - 1; ++i)
259	+	a[i] = new PDelay(i);
260		try {
261	<	DelayQueue q = new DelayQueue();
294	<	PDelay[] ints = new PDelay[SIZE];
295	<	for (int i = 0; i < SIZE-1; ++i)
296	<	ints[i] = new PDelay(i);
297	<	q.addAll(Arrays.asList(ints));
261	>	q.addAll(Arrays.asList(a));
262		shouldThrow();
263		} catch (NullPointerException success) {}
264		}
#	Line 305 | Line 269 | public class DelayQueueTest extends JSR1
269		public void testAddAll5() {
270		PDelay[] empty = new PDelay[0];
271		PDelay[] ints = new PDelay[SIZE];
272	<	for (int i = SIZE-1; i >= 0; --i)
272	>	for (int i = SIZE - 1; i >= 0; --i)
273		ints[i] = new PDelay(i);
274		DelayQueue q = new DelayQueue();
275		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 315 | Line 279 | public class DelayQueueTest extends JSR1
279		}
280
281		/**
318	–	* put(null) throws NPE
319	–	*/
320	–	public void testPutNull() {
321	–	try {
322	–	DelayQueue q = new DelayQueue();
323	–	q.put(null);
324	–	shouldThrow();
325	–	} catch (NullPointerException success) {}
326	–	}
327	–
328	–	/**
282		* all elements successfully put are contained
283		*/
284	<	public void testPut() {
285	<	DelayQueue q = new DelayQueue();
286	<	for (int i = 0; i < SIZE; ++i) {
287	<	PDelay I = new PDelay(i);
288	<	q.put(I);
289	<	assertTrue(q.contains(I));
290	<	}
291	<	assertEquals(SIZE, q.size());
284	>	public void testPut() {
285	>	DelayQueue q = new DelayQueue();
286	>	for (int i = 0; i < SIZE; ++i) {
287	>	PDelay x = new PDelay(i);
288	>	q.put(x);
289	>	assertTrue(q.contains(x));
290	>	}
291	>	assertEquals(SIZE, q.size());
292		}
293
294		/**
#	Line 343 | Line 296 | public class DelayQueueTest extends JSR1
296		*/
297		public void testPutWithTake() throws InterruptedException {
298		final DelayQueue q = new DelayQueue();
299	<	Thread t = new Thread(new CheckedRunnable() {
299	>	Thread t = newStartedThread(new CheckedRunnable() {
300		public void realRun() {
301		q.put(new PDelay(0));
302		q.put(new PDelay(0));
#	Line 351 | Line 304 | public class DelayQueueTest extends JSR1
304		q.put(new PDelay(0));
305		}});
306
307	<	t.start();
308	<	Thread.sleep(SHORT_DELAY_MS);
356	<	q.take();
357	<	t.interrupt();
358	<	t.join();
307	>	awaitTermination(t);
308	>	assertEquals(4, q.size());
309		}
310
311		/**
#	Line 363 | Line 313 | public class DelayQueueTest extends JSR1
313		*/
314		public void testTimedOffer() throws InterruptedException {
315		final DelayQueue q = new DelayQueue();
316	<	Thread t = new Thread(new CheckedRunnable() {
316	>	Thread t = newStartedThread(new CheckedRunnable() {
317		public void realRun() throws InterruptedException {
318		q.put(new PDelay(0));
319		q.put(new PDelay(0));
#	Line 371 | Line 321 | public class DelayQueueTest extends JSR1
321		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
322		}});
323
324	<	t.start();
375	<	Thread.sleep(SMALL_DELAY_MS);
376	<	t.interrupt();
377	<	t.join();
324	>	awaitTermination(t);
325		}
326
327		/**
#	Line 383 | Line 330 | public class DelayQueueTest extends JSR1
330		public void testTake() throws InterruptedException {
331		DelayQueue q = populatedQueue(SIZE);
332		for (int i = 0; i < SIZE; ++i) {
333	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
333	>	assertEquals(new PDelay(i), q.take());
334		}
335		}
336
337		/**
391	–	* take blocks interruptibly when empty
392	–	*/
393	–	public void testTakeFromEmpty() throws InterruptedException {
394	–	final DelayQueue q = new DelayQueue();
395	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
396	–	public void realRun() throws InterruptedException {
397	–	q.take();
398	–	}};
399	–
400	–	t.start();
401	–	Thread.sleep(SHORT_DELAY_MS);
402	–	t.interrupt();
403	–	t.join();
404	–	}
405	–
406	–	/**
338		* Take removes existing elements until empty, then blocks interruptibly
339		*/
340		public void testBlockingTake() throws InterruptedException {
341		final DelayQueue q = populatedQueue(SIZE);
342	<	Thread t = new Thread(new CheckedRunnable() {
342	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
343	>	Thread t = newStartedThread(new CheckedRunnable() {
344		public void realRun() throws InterruptedException {
345		for (int i = 0; i < SIZE; ++i) {
346		assertEquals(new PDelay(i), ((PDelay)q.take()));
347		}
348	+
349	+	Thread.currentThread().interrupt();
350	+	try {
351	+	q.take();
352	+	shouldThrow();
353	+	} catch (InterruptedException success) {}
354	+	assertFalse(Thread.interrupted());
355	+
356	+	pleaseInterrupt.countDown();
357		try {
358		q.take();
359		shouldThrow();
360		} catch (InterruptedException success) {}
361	+	assertFalse(Thread.interrupted());
362		}});
363
364	<	t.start();
365	<	Thread.sleep(SHORT_DELAY_MS);
364	>	await(pleaseInterrupt);
365	>	assertThreadStaysAlive(t);
366		t.interrupt();
367	<	t.join();
367	>	awaitTermination(t);
368		}
369
428	–
370		/**
371		* poll succeeds unless empty
372		*/
373		public void testPoll() {
374		DelayQueue q = populatedQueue(SIZE);
375		for (int i = 0; i < SIZE; ++i) {
376	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
376	>	assertEquals(new PDelay(i), q.poll());
377		}
378		assertNull(q.poll());
379		}
380
381		/**
382	<	* timed pool with zero timeout succeeds when non-empty, else times out
382	>	* timed poll with zero timeout succeeds when non-empty, else times out
383		*/
384		public void testTimedPoll0() throws InterruptedException {
385		DelayQueue q = populatedQueue(SIZE);
386		for (int i = 0; i < SIZE; ++i) {
387	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
387	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
388		}
389		assertNull(q.poll(0, MILLISECONDS));
390		}
391
392		/**
393	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
393	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
394		*/
395		public void testTimedPoll() throws InterruptedException {
396		DelayQueue q = populatedQueue(SIZE);
397		for (int i = 0; i < SIZE; ++i) {
398	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
399	<	}
400	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
398	>	long startTime = System.nanoTime();
399	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
400	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
401	>	}
402	>	long startTime = System.nanoTime();
403	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
404	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
405	>	checkEmpty(q);
406		}
407
408		/**
#	Line 464 | Line 410 | public class DelayQueueTest extends JSR1
410		* returning timeout status
411		*/
412		public void testInterruptedTimedPoll() throws InterruptedException {
413	<	Thread t = new Thread(new CheckedRunnable() {
413	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
414	>	final DelayQueue q = populatedQueue(SIZE);
415	>	Thread t = newStartedThread(new CheckedRunnable() {
416		public void realRun() throws InterruptedException {
417	<	DelayQueue q = populatedQueue(SIZE);
417	>	long startTime = System.nanoTime();
418		for (int i = 0; i < SIZE; ++i) {
419	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
419	>	assertEquals(new PDelay(i),
420	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
421		}
422	+
423	+	Thread.currentThread().interrupt();
424		try {
425	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
425	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
426		shouldThrow();
427		} catch (InterruptedException success) {}
428	<	}});
478	<
479	<	t.start();
480	<	Thread.sleep(SHORT_DELAY_MS);
481	<	t.interrupt();
482	<	t.join();
483	<	}
428	>	assertFalse(Thread.interrupted());
429
430	<	/**
486	<	*  timed poll before a delayed offer fails; after offer succeeds;
487	<	*  on interruption throws
488	<	*/
489	<	public void testTimedPollWithOffer() throws InterruptedException {
490	<	final DelayQueue q = new DelayQueue();
491	<	final PDelay pdelay = new PDelay(0);
492	<	Thread t = new Thread(new CheckedRunnable() {
493	<	public void realRun() throws InterruptedException {
494	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
495	<	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
430	>	pleaseInterrupt.countDown();
431		try {
432		q.poll(LONG_DELAY_MS, MILLISECONDS);
433		shouldThrow();
434		} catch (InterruptedException success) {}
435	+	assertFalse(Thread.interrupted());
436	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
437		}});
438
439	<	t.start();
440	<	Thread.sleep(SMALL_DELAY_MS);
504	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
439	>	await(pleaseInterrupt);
440	>	assertThreadStaysAlive(t);
441		t.interrupt();
442	<	t.join();
442	>	awaitTermination(t);
443	>	checkEmpty(q);
444		}
445
509	–
446		/**
447		* peek returns next element, or null if empty
448		*/
449		public void testPeek() {
450		DelayQueue q = populatedQueue(SIZE);
451		for (int i = 0; i < SIZE; ++i) {
452	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
453	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
452	>	assertEquals(new PDelay(i), q.peek());
453	>	assertEquals(new PDelay(i), q.poll());
454		if (q.isEmpty())
455		assertNull(q.peek());
456		else
#	Line 529 | Line 465 | public class DelayQueueTest extends JSR1
465		public void testElement() {
466		DelayQueue q = populatedQueue(SIZE);
467		for (int i = 0; i < SIZE; ++i) {
468	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
468	>	assertEquals(new PDelay(i), q.element());
469		q.poll();
470		}
471		try {
#	Line 544 | Line 480 | public class DelayQueueTest extends JSR1
480		public void testRemove() {
481		DelayQueue q = populatedQueue(SIZE);
482		for (int i = 0; i < SIZE; ++i) {
483	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
483	>	assertEquals(new PDelay(i), q.remove());
484		}
485		try {
486		q.remove();
#	Line 553 | Line 489 | public class DelayQueueTest extends JSR1
489		}
490
491		/**
556	–	* remove(x) removes x and returns true if present
557	–	*/
558	–	public void testRemoveElement() {
559	–	DelayQueue q = populatedQueue(SIZE);
560	–	for (int i = 1; i < SIZE; i+=2) {
561	–	assertTrue(q.remove(new PDelay(i)));
562	–	}
563	–	for (int i = 0; i < SIZE; i+=2) {
564	–	assertTrue(q.remove(new PDelay(i)));
565	–	assertFalse(q.remove(new PDelay(i+1)));
566	–	}
567	–	assertTrue(q.isEmpty());
568	–	}
569	–
570	–	/**
492		* contains(x) reports true when elements added but not yet removed
493		*/
494		public void testContains() {
#	Line 587 | Line 508 | public class DelayQueueTest extends JSR1
508		q.clear();
509		assertTrue(q.isEmpty());
510		assertEquals(0, q.size());
511	<	assertEquals(NOCAP, q.remainingCapacity());
511	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
512		PDelay x = new PDelay(1);
513		q.add(x);
514		assertFalse(q.isEmpty());
#	Line 624 | Line 545 | public class DelayQueueTest extends JSR1
545		assertTrue(changed);
546
547		assertTrue(q.containsAll(p));
548	<	assertEquals(SIZE-i, q.size());
548	>	assertEquals(SIZE - i, q.size());
549		p.remove();
550		}
551		}
#	Line 637 | Line 558 | public class DelayQueueTest extends JSR1
558		DelayQueue q = populatedQueue(SIZE);
559		DelayQueue p = populatedQueue(i);
560		assertTrue(q.removeAll(p));
561	<	assertEquals(SIZE-i, q.size());
561	>	assertEquals(SIZE - i, q.size());
562		for (int j = 0; j < i; ++j) {
563	<	PDelay I = (PDelay)(p.remove());
564	<	assertFalse(q.contains(I));
563	>	PDelay x = (PDelay)(p.remove());
564	>	assertFalse(q.contains(x));
565		}
566		}
567		}
#	Line 653 | Line 574 | public class DelayQueueTest extends JSR1
574		Object[] o = q.toArray();
575		Arrays.sort(o);
576		for (int i = 0; i < o.length; i++)
577	<	assertEquals(o[i], q.take());
577	>	assertSame(o[i], q.take());
578		}
579
580		/**
581		* toArray(a) contains all elements
582		*/
583	<	public void testToArray2() throws InterruptedException {
584	<	DelayQueue q = populatedQueue(SIZE);
583	>	public void testToArray2() {
584	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
585		PDelay[] ints = new PDelay[SIZE];
586	<	ints = (PDelay[])q.toArray(ints);
586	>	PDelay[] array = q.toArray(ints);
587	>	assertSame(ints, array);
588		Arrays.sort(ints);
589		for (int i = 0; i < ints.length; i++)
590	<	assertEquals(ints[i], q.take());
669	<	}
670	<
671	<
672	<	/**
673	<	* toArray(null) throws NPE
674	<	*/
675	<	public void testToArray_BadArg() {
676	<	DelayQueue q = populatedQueue(SIZE);
677	<	try {
678	<	Object o[] = q.toArray(null);
679	<	shouldThrow();
680	<	} catch (NullPointerException success) {}
590	>	assertSame(ints[i], q.remove());
591		}
592
593		/**
594	<	* toArray with incompatible array type throws CCE
594	>	* toArray(incompatible array type) throws ArrayStoreException
595		*/
596		public void testToArray1_BadArg() {
597		DelayQueue q = populatedQueue(SIZE);
598		try {
599	<	Object o[] = q.toArray(new String[10]);
599	>	q.toArray(new String[10]);
600		shouldThrow();
601		} catch (ArrayStoreException success) {}
602		}
#	Line 703 | Line 613 | public class DelayQueueTest extends JSR1
613		++i;
614		}
615		assertEquals(i, SIZE);
616	+	assertIteratorExhausted(it);
617	+	}
618	+
619	+	/**
620	+	* iterator of empty collection has no elements
621	+	*/
622	+	public void testEmptyIterator() {
623	+	assertIteratorExhausted(new DelayQueue().iterator());
624		}
625
626		/**
627		* iterator.remove removes current element
628		*/
629	<	public void testIteratorRemove () {
629	>	public void testIteratorRemove() {
630		final DelayQueue q = new DelayQueue();
631		q.add(new PDelay(2));
632		q.add(new PDelay(1));
#	Line 717 | Line 635 | public class DelayQueueTest extends JSR1
635		it.next();
636		it.remove();
637		it = q.iterator();
638	<	assertEquals(it.next(), new PDelay(2));
639	<	assertEquals(it.next(), new PDelay(3));
638	>	assertEquals(new PDelay(2), it.next());
639	>	assertEquals(new PDelay(3), it.next());
640		assertFalse(it.hasNext());
641		}
642
725	–
643		/**
644		* toString contains toStrings of elements
645		*/
646		public void testToString() {
647		DelayQueue q = populatedQueue(SIZE);
648		String s = q.toString();
649	<	for (int i = 0; i < SIZE; ++i) {
650	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
734	<	}
649	>	for (Object e : q)
650	>	assertTrue(s.contains(e.toString()));
651		}
652
653		/**
654	<	* offer transfers elements across Executor tasks
654	>	* timed poll transfers elements across Executor tasks
655		*/
656		public void testPollInExecutor() {
657		final DelayQueue q = new DelayQueue();
658	<	ExecutorService executor = Executors.newFixedThreadPool(2);
659	<	executor.execute(new CheckedRunnable() {
660	<	public void realRun() throws InterruptedException {
661	<	assertNull(q.poll());
662	<	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
663	<	assertTrue(q.isEmpty());
664	<	}});
665	<
666	<	executor.execute(new CheckedRunnable() {
667	<	public void realRun() throws InterruptedException {
668	<	Thread.sleep(SHORT_DELAY_MS);
669	<	q.put(new PDelay(1));
670	<	}});
671	<
672	<	joinPool(executor);
673	<
658	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
659	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
660	>	try (PoolCleaner cleaner = cleaner(executor)) {
661	>	executor.execute(new CheckedRunnable() {
662	>	public void realRun() throws InterruptedException {
663	>	assertNull(q.poll());
664	>	threadsStarted.await();
665	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
666	>	checkEmpty(q);
667	>	}});
668	>
669	>	executor.execute(new CheckedRunnable() {
670	>	public void realRun() throws InterruptedException {
671	>	threadsStarted.await();
672	>	q.put(new PDelay(1));
673	>	}});
674	>	}
675		}
676
760	–
677		/**
678		* Delayed actions do not occur until their delay elapses
679		*/
680		public void testDelay() throws InterruptedException {
681	<	DelayQueue q = new DelayQueue();
682	<	NanoDelay[] elements = new NanoDelay[SIZE];
683	<	for (int i = 0; i < SIZE; ++i) {
768	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
769	<	}
770	<	for (int i = 0; i < SIZE; ++i) {
771	<	q.add(elements[i]);
772	<	}
681	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
682	>	for (int i = 0; i < SIZE; ++i)
683	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
684
685		long last = 0;
686		for (int i = 0; i < SIZE; ++i) {
687	<	NanoDelay e = (NanoDelay)(q.take());
687	>	NanoDelay e = q.take();
688		long tt = e.getTriggerTime();
689	<	assertTrue(tt <= System.nanoTime());
689	>	assertTrue(System.nanoTime() - tt >= 0);
690		if (i != 0)
691		assertTrue(tt >= last);
692		last = tt;
693		}
694	+	assertTrue(q.isEmpty());
695		}
696
697		/**
#	Line 788 | Line 700 | public class DelayQueueTest extends JSR1
700		public void testPeekDelayed() {
701		DelayQueue q = new DelayQueue();
702		q.add(new NanoDelay(Long.MAX_VALUE));
703	<	assert(q.peek() != null);
703	>	assertNotNull(q.peek());
704		}
705
794	–
706		/**
707		* poll of a non-empty queue returns null if no expired elements.
708		*/
#	Line 807 | Line 718 | public class DelayQueueTest extends JSR1
718		public void testTimedPollDelayed() throws InterruptedException {
719		DelayQueue q = new DelayQueue();
720		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
721	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
811	<	}
812	<
813	<	/**
814	<	* drainTo(null) throws NPE
815	<	*/
816	<	public void testDrainToNull() {
817	<	DelayQueue q = populatedQueue(SIZE);
818	<	try {
819	<	q.drainTo(null);
820	<	shouldThrow();
821	<	} catch (NullPointerException success) {}
822	<	}
823	<
824	<	/**
825	<	* drainTo(this) throws IAE
826	<	*/
827	<	public void testDrainToSelf() {
828	<	DelayQueue q = populatedQueue(SIZE);
829	<	try {
830	<	q.drainTo(q);
831	<	shouldThrow();
832	<	} catch (IllegalArgumentException success) {}
721	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
722		}
723
724		/**
#	Line 844 | 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 854 | 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 867 | 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 879 | Line 768 | public class DelayQueueTest extends JSR1
768		}
769
770		/**
771	<	* drainTo(null, n) throws NPE
883	<	*/
884	<	public void testDrainToNullN() {
885	<	DelayQueue q = populatedQueue(SIZE);
886	<	try {
887	<	q.drainTo(null, 0);
888	<	shouldThrow();
889	<	} catch (NullPointerException success) {}
890	<	}
891	<
892	<	/**
893	<	* drainTo(this, n) throws IAE
894	<	*/
895	<	public void testDrainToSelfN() {
896	<	DelayQueue q = populatedQueue(SIZE);
897	<	try {
898	<	q.drainTo(q, 0);
899	<	shouldThrow();
900	<	} catch (IllegalArgumentException success) {}
901	<	}
902	<
903	<	/**
904	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
771	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
772		*/
773		public void testDrainToN() {
774		for (int i = 0; i < SIZE + 2; ++i) {
775		DelayQueue q = populatedQueue(SIZE);
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);
778	>	int k = (i < SIZE) ? i : SIZE;
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