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.29 by jsr166, Tue Dec 1 09:48:12 2009 UTC vs.
Revision 1.73 by jsr166, Sat May 23 00:53:08 2015 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 90 | Line 100 | public class DelayQueueTest extends JSR1
100		return other.trigger == trigger;
101		}
102
103	+	// suppress [overrides] javac warning
104	+	public int hashCode() { return (int) trigger; }
105	+
106		public long getDelay(TimeUnit unit) {
107		long n = trigger - System.nanoTime();
108		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 104 | Line 117 | public class DelayQueueTest extends JSR1
117		}
118		}
119
107	–
120		/**
121	<	* Create a queue of given size containing consecutive
121	>	* Returns a new queue of given size containing consecutive
122		* PDelays 0 ... n.
123		*/
124	<	private DelayQueue populatedQueue(int n) {
125	<	DelayQueue q = new DelayQueue();
124	>	private DelayQueue<PDelay> populatedQueue(int n) {
125	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
126		assertTrue(q.isEmpty());
127	<	for (int i = n-1; i >= 0; i-=2)
127	>	for (int i = n-1; i >= 0; i -= 2)
128		assertTrue(q.offer(new PDelay(i)));
129	<	for (int i = (n & 1); i < n; i+=2)
129	>	for (int i = (n & 1); i < n; i += 2)
130		assertTrue(q.offer(new PDelay(i)));
131		assertFalse(q.isEmpty());
132	<	assertEquals(NOCAP, q.remainingCapacity());
132	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
133		assertEquals(n, q.size());
134		return q;
135		}
#	Line 126 | Line 138 | public class DelayQueueTest extends JSR1
138		* A new queue has unbounded capacity
139		*/
140		public void testConstructor1() {
141	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
141	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
142		}
143
144		/**
#	Line 134 | Line 146 | public class DelayQueueTest extends JSR1
146		*/
147		public void testConstructor3() {
148		try {
149	<	DelayQueue q = new DelayQueue(null);
149	>	new DelayQueue(null);
150		shouldThrow();
151		} catch (NullPointerException success) {}
152		}
#	Line 144 | Line 156 | public class DelayQueueTest extends JSR1
156		*/
157		public void testConstructor4() {
158		try {
159	<	PDelay[] ints = new PDelay[SIZE];
148	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
159	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
160		shouldThrow();
161		} catch (NullPointerException success) {}
162		}
#	Line 154 | Line 165 | public class DelayQueueTest extends JSR1
165		* Initializing from Collection with some null elements throws NPE
166		*/
167		public void testConstructor5() {
168	+	PDelay[] a = new PDelay[SIZE];
169	+	for (int i = 0; i < SIZE - 1; ++i)
170	+	a[i] = new PDelay(i);
171		try {
172	<	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));
172	>	new DelayQueue(Arrays.asList(a));
173		shouldThrow();
174		} catch (NullPointerException success) {}
175		}
#	Line 181 | Line 192 | public class DelayQueueTest extends JSR1
192		public void testEmpty() {
193		DelayQueue q = new DelayQueue();
194		assertTrue(q.isEmpty());
195	<	assertEquals(NOCAP, q.remainingCapacity());
195	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
196		q.add(new PDelay(1));
197		assertFalse(q.isEmpty());
198		q.add(new PDelay(2));
#	Line 191 | Line 202 | public class DelayQueueTest extends JSR1
202		}
203
204		/**
205	<	* remainingCapacity does not change when elementa added or removed,
195	<	* but size does
205	>	* remainingCapacity() always returns Integer.MAX_VALUE
206		*/
207		public void testRemainingCapacity() {
208	<	DelayQueue q = populatedQueue(SIZE);
208	>	BlockingQueue q = populatedQueue(SIZE);
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
211	<	assertEquals(SIZE-i, q.size());
212	<	q.remove();
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211	>	assertEquals(SIZE - i, q.size());
212	>	assertTrue(q.remove() instanceof PDelay);
213		}
214		for (int i = 0; i < SIZE; ++i) {
215	<	assertEquals(NOCAP, q.remainingCapacity());
215	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
216		assertEquals(i, q.size());
217	<	q.add(new PDelay(i));
217	>	assertTrue(q.add(new PDelay(i)));
218		}
219		}
220
221		/**
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	–	/**
222		* offer non-null succeeds
223		*/
224		public void testOffer() {
#	Line 251 | Line 239 | public class DelayQueueTest extends JSR1
239		}
240
241		/**
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	–	/**
242		* addAll(this) throws IAE
243		*/
244		public void testAddAllSelf() {
245	+	DelayQueue q = populatedQueue(SIZE);
246		try {
270	–	DelayQueue q = populatedQueue(SIZE);
247		q.addAll(q);
248		shouldThrow();
249		} catch (IllegalArgumentException success) {}
250		}
251
252		/**
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	–	/**
253		* addAll of a collection with any null elements throws NPE after
254		* possibly adding some elements
255		*/
256		public void testAddAll3() {
257	+	DelayQueue q = new DelayQueue();
258	+	PDelay[] a = new PDelay[SIZE];
259	+	for (int i = 0; i < SIZE - 1; ++i)
260	+	a[i] = new PDelay(i);
261		try {
262	<	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));
262	>	q.addAll(Arrays.asList(a));
263		shouldThrow();
264		} catch (NullPointerException success) {}
265		}
#	Line 305 | Line 270 | public class DelayQueueTest extends JSR1
270		public void testAddAll5() {
271		PDelay[] empty = new PDelay[0];
272		PDelay[] ints = new PDelay[SIZE];
273	<	for (int i = SIZE-1; i >= 0; --i)
273	>	for (int i = SIZE - 1; i >= 0; --i)
274		ints[i] = new PDelay(i);
275		DelayQueue q = new DelayQueue();
276		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 315 | Line 280 | public class DelayQueueTest extends JSR1
280		}
281
282		/**
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	–	/**
283		* all elements successfully put are contained
284		*/
285	<	public void testPut() {
286	<	DelayQueue q = new DelayQueue();
287	<	for (int i = 0; i < SIZE; ++i) {
288	<	PDelay I = new PDelay(i);
289	<	q.put(I);
290	<	assertTrue(q.contains(I));
291	<	}
292	<	assertEquals(SIZE, q.size());
285	>	public void testPut() {
286	>	DelayQueue q = new DelayQueue();
287	>	for (int i = 0; i < SIZE; ++i) {
288	>	PDelay x = new PDelay(i);
289	>	q.put(x);
290	>	assertTrue(q.contains(x));
291	>	}
292	>	assertEquals(SIZE, q.size());
293		}
294
295		/**
#	Line 343 | Line 297 | public class DelayQueueTest extends JSR1
297		*/
298		public void testPutWithTake() throws InterruptedException {
299		final DelayQueue q = new DelayQueue();
300	<	Thread t = new Thread(new CheckedRunnable() {
300	>	Thread t = newStartedThread(new CheckedRunnable() {
301		public void realRun() {
302		q.put(new PDelay(0));
303		q.put(new PDelay(0));
#	Line 351 | Line 305 | public class DelayQueueTest extends JSR1
305		q.put(new PDelay(0));
306		}});
307
308	<	t.start();
309	<	Thread.sleep(SHORT_DELAY_MS);
356	<	q.take();
357	<	t.interrupt();
358	<	t.join();
308	>	awaitTermination(t);
309	>	assertEquals(4, q.size());
310		}
311
312		/**
#	Line 363 | Line 314 | public class DelayQueueTest extends JSR1
314		*/
315		public void testTimedOffer() throws InterruptedException {
316		final DelayQueue q = new DelayQueue();
317	<	Thread t = new Thread(new CheckedRunnable() {
317	>	Thread t = newStartedThread(new CheckedRunnable() {
318		public void realRun() throws InterruptedException {
319		q.put(new PDelay(0));
320		q.put(new PDelay(0));
#	Line 371 | Line 322 | public class DelayQueueTest extends JSR1
322		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
323		}});
324
325	<	t.start();
375	<	Thread.sleep(SMALL_DELAY_MS);
376	<	t.interrupt();
377	<	t.join();
325	>	awaitTermination(t);
326		}
327
328		/**
#	Line 383 | Line 331 | public class DelayQueueTest extends JSR1
331		public void testTake() throws InterruptedException {
332		DelayQueue q = populatedQueue(SIZE);
333		for (int i = 0; i < SIZE; ++i) {
334	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
334	>	assertEquals(new PDelay(i), q.take());
335		}
336		}
337
338		/**
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	–	/**
339		* Take removes existing elements until empty, then blocks interruptibly
340		*/
341		public void testBlockingTake() throws InterruptedException {
342		final DelayQueue q = populatedQueue(SIZE);
343	<	Thread t = new Thread(new CheckedRunnable() {
343	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
344	>	Thread t = newStartedThread(new CheckedRunnable() {
345		public void realRun() throws InterruptedException {
346		for (int i = 0; i < SIZE; ++i) {
347		assertEquals(new PDelay(i), ((PDelay)q.take()));
348		}
349	+
350	+	Thread.currentThread().interrupt();
351		try {
352		q.take();
353		shouldThrow();
354		} catch (InterruptedException success) {}
355	+	assertFalse(Thread.interrupted());
356	+
357	+	pleaseInterrupt.countDown();
358	+	try {
359	+	q.take();
360	+	shouldThrow();
361	+	} catch (InterruptedException success) {}
362	+	assertFalse(Thread.interrupted());
363		}});
364
365	<	t.start();
366	<	Thread.sleep(SHORT_DELAY_MS);
365	>	await(pleaseInterrupt);
366	>	assertThreadStaysAlive(t);
367		t.interrupt();
368	<	t.join();
368	>	awaitTermination(t);
369		}
370
428	–
371		/**
372		* poll succeeds unless empty
373		*/
374		public void testPoll() {
375		DelayQueue q = populatedQueue(SIZE);
376		for (int i = 0; i < SIZE; ++i) {
377	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
377	>	assertEquals(new PDelay(i), q.poll());
378		}
379		assertNull(q.poll());
380		}
381
382		/**
383	<	* timed pool with zero timeout succeeds when non-empty, else times out
383	>	* timed poll with zero timeout succeeds when non-empty, else times out
384		*/
385		public void testTimedPoll0() throws InterruptedException {
386		DelayQueue q = populatedQueue(SIZE);
387		for (int i = 0; i < SIZE; ++i) {
388	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
388	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
389		}
390		assertNull(q.poll(0, MILLISECONDS));
391		}
392
393		/**
394	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
394	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
395		*/
396		public void testTimedPoll() throws InterruptedException {
397		DelayQueue q = populatedQueue(SIZE);
398		for (int i = 0; i < SIZE; ++i) {
399	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
400	<	}
401	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
399	>	long startTime = System.nanoTime();
400	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
401	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
402	>	}
403	>	long startTime = System.nanoTime();
404	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
405	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
406	>	checkEmpty(q);
407		}
408
409		/**
#	Line 464 | Line 411 | public class DelayQueueTest extends JSR1
411		* returning timeout status
412		*/
413		public void testInterruptedTimedPoll() throws InterruptedException {
414	<	Thread t = new Thread(new CheckedRunnable() {
414	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
415	>	Thread t = newStartedThread(new CheckedRunnable() {
416		public void realRun() throws InterruptedException {
417		DelayQueue q = populatedQueue(SIZE);
418		for (int i = 0; i < SIZE; ++i) {
419		assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
420		}
421	+
422	+	Thread.currentThread().interrupt();
423		try {
424	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
424	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
425		shouldThrow();
426		} catch (InterruptedException success) {}
427	<	}});
427	>	assertFalse(Thread.interrupted());
428
429	<	t.start();
480	<	Thread.sleep(SHORT_DELAY_MS);
481	<	t.interrupt();
482	<	t.join();
483	<	}
484	<
485	<	/**
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));
429	>	pleaseInterrupt.countDown();
430		try {
431		q.poll(LONG_DELAY_MS, MILLISECONDS);
432		shouldThrow();
433		} catch (InterruptedException success) {}
434	+	assertFalse(Thread.interrupted());
435		}});
436
437	<	t.start();
438	<	Thread.sleep(SMALL_DELAY_MS);
504	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
437	>	await(pleaseInterrupt);
438	>	assertThreadStaysAlive(t);
439		t.interrupt();
440	<	t.join();
440	>	awaitTermination(t);
441		}
442
509	–
443		/**
444		* peek returns next element, or null if empty
445		*/
446		public void testPeek() {
447		DelayQueue q = populatedQueue(SIZE);
448		for (int i = 0; i < SIZE; ++i) {
449	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
450	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
449	>	assertEquals(new PDelay(i), q.peek());
450	>	assertEquals(new PDelay(i), q.poll());
451		if (q.isEmpty())
452		assertNull(q.peek());
453		else
#	Line 529 | Line 462 | public class DelayQueueTest extends JSR1
462		public void testElement() {
463		DelayQueue q = populatedQueue(SIZE);
464		for (int i = 0; i < SIZE; ++i) {
465	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
465	>	assertEquals(new PDelay(i), q.element());
466		q.poll();
467		}
468		try {
#	Line 544 | Line 477 | public class DelayQueueTest extends JSR1
477		public void testRemove() {
478		DelayQueue q = populatedQueue(SIZE);
479		for (int i = 0; i < SIZE; ++i) {
480	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
480	>	assertEquals(new PDelay(i), q.remove());
481		}
482		try {
483		q.remove();
#	Line 553 | Line 486 | public class DelayQueueTest extends JSR1
486		}
487
488		/**
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	–	/**
489		* contains(x) reports true when elements added but not yet removed
490		*/
491		public void testContains() {
#	Line 587 | Line 505 | public class DelayQueueTest extends JSR1
505		q.clear();
506		assertTrue(q.isEmpty());
507		assertEquals(0, q.size());
508	<	assertEquals(NOCAP, q.remainingCapacity());
508	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
509		PDelay x = new PDelay(1);
510		q.add(x);
511		assertFalse(q.isEmpty());
#	Line 624 | Line 542 | public class DelayQueueTest extends JSR1
542		assertTrue(changed);
543
544		assertTrue(q.containsAll(p));
545	<	assertEquals(SIZE-i, q.size());
545	>	assertEquals(SIZE - i, q.size());
546		p.remove();
547		}
548		}
#	Line 637 | Line 555 | public class DelayQueueTest extends JSR1
555		DelayQueue q = populatedQueue(SIZE);
556		DelayQueue p = populatedQueue(i);
557		assertTrue(q.removeAll(p));
558	<	assertEquals(SIZE-i, q.size());
558	>	assertEquals(SIZE - i, q.size());
559		for (int j = 0; j < i; ++j) {
560	<	PDelay I = (PDelay)(p.remove());
561	<	assertFalse(q.contains(I));
560	>	PDelay x = (PDelay)(p.remove());
561	>	assertFalse(q.contains(x));
562		}
563		}
564		}
#	Line 653 | Line 571 | public class DelayQueueTest extends JSR1
571		Object[] o = q.toArray();
572		Arrays.sort(o);
573		for (int i = 0; i < o.length; i++)
574	<	assertEquals(o[i], q.take());
574	>	assertSame(o[i], q.take());
575		}
576
577		/**
578		* toArray(a) contains all elements
579		*/
580	<	public void testToArray2() throws InterruptedException {
581	<	DelayQueue q = populatedQueue(SIZE);
580	>	public void testToArray2() {
581	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
582		PDelay[] ints = new PDelay[SIZE];
583	<	ints = (PDelay[])q.toArray(ints);
583	>	PDelay[] array = q.toArray(ints);
584	>	assertSame(ints, array);
585		Arrays.sort(ints);
586		for (int i = 0; i < ints.length; i++)
587	<	assertEquals(ints[i], q.take());
587	>	assertSame(ints[i], q.remove());
588		}
589
671	–
590		/**
591	<	* 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) {}
681	<	}
682	<
683	<	/**
684	<	* toArray with incompatible array type throws CCE
591	>	* toArray(incompatible array type) throws ArrayStoreException
592		*/
593		public void testToArray1_BadArg() {
594		DelayQueue q = populatedQueue(SIZE);
595		try {
596	<	Object o[] = q.toArray(new String[10]);
596	>	q.toArray(new String[10]);
597		shouldThrow();
598		} catch (ArrayStoreException success) {}
599		}
#	Line 703 | Line 610 | public class DelayQueueTest extends JSR1
610		++i;
611		}
612		assertEquals(i, SIZE);
613	+	assertIteratorExhausted(it);
614	+	}
615	+
616	+	/**
617	+	* iterator of empty collection has no elements
618	+	*/
619	+	public void testEmptyIterator() {
620	+	assertIteratorExhausted(new DelayQueue().iterator());
621		}
622
623		/**
624		* iterator.remove removes current element
625		*/
626	<	public void testIteratorRemove () {
626	>	public void testIteratorRemove() {
627		final DelayQueue q = new DelayQueue();
628		q.add(new PDelay(2));
629		q.add(new PDelay(1));
#	Line 717 | Line 632 | public class DelayQueueTest extends JSR1
632		it.next();
633		it.remove();
634		it = q.iterator();
635	<	assertEquals(it.next(), new PDelay(2));
636	<	assertEquals(it.next(), new PDelay(3));
635	>	assertEquals(new PDelay(2), it.next());
636	>	assertEquals(new PDelay(3), it.next());
637		assertFalse(it.hasNext());
638		}
639
725	–
640		/**
641		* toString contains toStrings of elements
642		*/
643		public void testToString() {
644		DelayQueue q = populatedQueue(SIZE);
645		String s = q.toString();
646	<	for (int i = 0; i < SIZE; ++i) {
647	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
734	<	}
646	>	for (Object e : q)
647	>	assertTrue(s.contains(e.toString()));
648		}
649
650		/**
651	<	* offer transfers elements across Executor tasks
651	>	* timed poll transfers elements across Executor tasks
652		*/
653		public void testPollInExecutor() {
654		final DelayQueue q = new DelayQueue();
655	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
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());
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	<	Thread.sleep(SHORT_DELAY_MS);
667	>	threadsStarted.await();
668		q.put(new PDelay(1));
669		}});
670
671		joinPool(executor);
672		}
673
759	–
674		/**
675		* Delayed actions do not occur until their delay elapses
676		*/
677		public void testDelay() throws InterruptedException {
678	<	DelayQueue q = new DelayQueue();
679	<	NanoDelay[] elements = new NanoDelay[SIZE];
680	<	for (int i = 0; i < SIZE; ++i) {
767	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
768	<	}
769	<	for (int i = 0; i < SIZE; ++i) {
770	<	q.add(elements[i]);
771	<	}
678	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
679	>	for (int i = 0; i < SIZE; ++i)
680	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
681
682		long last = 0;
683		for (int i = 0; i < SIZE; ++i) {
684	<	NanoDelay e = (NanoDelay)(q.take());
684	>	NanoDelay e = q.take();
685		long tt = e.getTriggerTime();
686	<	assertTrue(tt <= System.nanoTime());
686	>	assertTrue(System.nanoTime() - tt >= 0);
687		if (i != 0)
688		assertTrue(tt >= last);
689		last = tt;
690		}
691	+	assertTrue(q.isEmpty());
692		}
693
694		/**
#	Line 787 | Line 697 | public class DelayQueueTest extends JSR1
697		public void testPeekDelayed() {
698		DelayQueue q = new DelayQueue();
699		q.add(new NanoDelay(Long.MAX_VALUE));
700	<	assert(q.peek() != null);
700	>	assertNotNull(q.peek());
701		}
702
793	–
703		/**
704		* poll of a non-empty queue returns null if no expired elements.
705		*/
#	Line 806 | Line 715 | public class DelayQueueTest extends JSR1
715		public void testTimedPollDelayed() throws InterruptedException {
716		DelayQueue q = new DelayQueue();
717		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
718	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
810	<	}
811	<
812	<	/**
813	<	* drainTo(null) throws NPE
814	<	*/
815	<	public void testDrainToNull() {
816	<	DelayQueue q = populatedQueue(SIZE);
817	<	try {
818	<	q.drainTo(null);
819	<	shouldThrow();
820	<	} catch (NullPointerException success) {}
821	<	}
822	<
823	<	/**
824	<	* drainTo(this) throws IAE
825	<	*/
826	<	public void testDrainToSelf() {
827	<	DelayQueue q = populatedQueue(SIZE);
828	<	try {
829	<	q.drainTo(q);
830	<	shouldThrow();
831	<	} catch (IllegalArgumentException success) {}
718	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
719		}
720
721		/**
#	Line 843 | Line 730 | public class DelayQueueTest extends JSR1
730		}
731		ArrayList l = new ArrayList();
732		q.drainTo(l);
733	<	assertEquals(q.size(), 0);
733	>	assertEquals(0, q.size());
734		for (int i = 0; i < SIZE; ++i)
735	<	assertEquals(l.get(i), elems[i]);
735	>	assertEquals(elems[i], l.get(i));
736		q.add(elems[0]);
737		q.add(elems[1]);
738		assertFalse(q.isEmpty());
#	Line 853 | Line 740 | public class DelayQueueTest extends JSR1
740		assertTrue(q.contains(elems[1]));
741		l.clear();
742		q.drainTo(l);
743	<	assertEquals(q.size(), 0);
744	<	assertEquals(l.size(), 2);
743	>	assertEquals(0, q.size());
744	>	assertEquals(2, l.size());
745		for (int i = 0; i < 2; ++i)
746	<	assertEquals(l.get(i), elems[i]);
746	>	assertEquals(elems[i], l.get(i));
747		}
748
749		/**
#	Line 866 | Line 753 | public class DelayQueueTest extends JSR1
753		final DelayQueue q = populatedQueue(SIZE);
754		Thread t = new Thread(new CheckedRunnable() {
755		public void realRun() {
756	<	q.put(new PDelay(SIZE+1));
756	>	q.put(new PDelay(SIZE + 1));
757		}});
758
759		t.start();
#	Line 878 | Line 765 | public class DelayQueueTest extends JSR1
765		}
766
767		/**
768	<	* drainTo(null, n) throws NPE
882	<	*/
883	<	public void testDrainToNullN() {
884	<	DelayQueue q = populatedQueue(SIZE);
885	<	try {
886	<	q.drainTo(null, 0);
887	<	shouldThrow();
888	<	} catch (NullPointerException success) {}
889	<	}
890	<
891	<	/**
892	<	* drainTo(this, n) throws IAE
893	<	*/
894	<	public void testDrainToSelfN() {
895	<	DelayQueue q = populatedQueue(SIZE);
896	<	try {
897	<	q.drainTo(q, 0);
898	<	shouldThrow();
899	<	} catch (IllegalArgumentException success) {}
900	<	}
901	<
902	<	/**
903	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
768	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
769		*/
770		public void testDrainToN() {
771		for (int i = 0; i < SIZE + 2; ++i) {
772		DelayQueue q = populatedQueue(SIZE);
773		ArrayList l = new ArrayList();
774		q.drainTo(l, i);
775	<	int k = (i < SIZE)? i : SIZE;
776	<	assertEquals(q.size(), SIZE-k);
777	<	assertEquals(l.size(), k);
775	>	int k = (i < SIZE) ? i : SIZE;
776	>	assertEquals(SIZE - k, q.size());
777	>	assertEquals(k, l.size());
778		}
779		}
780
781	<
781	>	/**
782	>	* remove(null), contains(null) always return false
783	>	*/
784	>	public void testNeverContainsNull() {
785	>	Collection<?> q = populatedQueue(SIZE);
786	>	assertFalse(q.contains(null));
787	>	assertFalse(q.remove(null));
788	>	}
789		}

Diff Legend

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