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.22 by jsr166, Sat Nov 21 19:11:53 2009 UTC vs.
Revision 1.79 by jsr166, Mon Oct 17 01:54:51 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	>	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
56	>	* Most tests use Pseudodelays, 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; }
62	<	public int compareTo(PDelay y) {
63	<	int i = pseudodelay;
64	<	int j = ((PDelay)y).pseudodelay;
65	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
61	>	PDelay(int i) { pseudodelay = i; }
62	>	public int compareTo(PDelay other) {
63	>	int a = this.pseudodelay;
64	>	int b = other.pseudodelay;
65	>	return (a < b) ? -1 : (a > b) ? 1 : 0;
66		}
40	–
67		public int compareTo(Delayed y) {
68	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
68	>	return compareTo((PDelay)y);
69		}
48	–
70		public boolean equals(Object other) {
71	<	return ((PDelay)other).pseudodelay == pseudodelay;
72	<	}
52	<	public boolean equals(PDelay other) {
53	<	return ((PDelay)other).pseudodelay == pseudodelay;
71	>	return (other instanceof PDelay) &&
72	>	this.pseudodelay == ((PDelay)other).pseudodelay;
73		}
74	<
75	<
74	>	// suppress [overrides] javac warning
75	>	public int hashCode() { return pseudodelay; }
76		public long getDelay(TimeUnit ignore) {
77	<	return pseudodelay;
59	<	}
60	<	public int intValue() {
61	<	return pseudodelay;
77	>	return Integer.MIN_VALUE + pseudodelay;
78		}
63	–
79		public String toString() {
80		return String.valueOf(pseudodelay);
81		}
82		}
83
69	–
84		/**
85		* Delayed implementation that actually delays
86		*/
#	Line 77 | Line 91 | public class DelayQueueTest extends JSR1
91		}
92		public int compareTo(NanoDelay y) {
93		long i = trigger;
94	<	long j = ((NanoDelay)y).trigger;
94	>	long j = y.trigger;
95		if (i < j) return -1;
96		if (i > j) return 1;
97		return 0;
98		}
99
100		public int compareTo(Delayed y) {
101	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
101	>	return compareTo((NanoDelay)y);
102		}
103
104		public boolean equals(Object other) {
105	<	return ((NanoDelay)other).trigger == trigger;
106	<	}
97	<	public boolean equals(NanoDelay other) {
98	<	return ((NanoDelay)other).trigger == trigger;
105	>	return (other instanceof NanoDelay) &&
106	>	this.trigger == ((NanoDelay)other).trigger;
107		}
108
109	+	// suppress [overrides] javac warning
110	+	public int hashCode() { return (int) trigger; }
111	+
112		public long getDelay(TimeUnit unit) {
113		long n = trigger - System.nanoTime();
114		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 112 | Line 123 | public class DelayQueueTest extends JSR1
123		}
124		}
125
115	–
126		/**
127	<	* Create a queue of given size containing consecutive
128	<	* PDelays 0 ... n.
127	>	* Returns a new queue of given size containing consecutive
128	>	* PDelays 0 ... n - 1.
129		*/
130	<	private DelayQueue populatedQueue(int n) {
131	<	DelayQueue q = new DelayQueue();
130	>	private DelayQueue<PDelay> populatedQueue(int n) {
131	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
132		assertTrue(q.isEmpty());
133	<	for (int i = n-1; i >= 0; i-=2)
133	>	for (int i = n - 1; i >= 0; i -= 2)
134		assertTrue(q.offer(new PDelay(i)));
135	<	for (int i = (n & 1); i < n; i+=2)
135	>	for (int i = (n & 1); i < n; i += 2)
136		assertTrue(q.offer(new PDelay(i)));
137		assertFalse(q.isEmpty());
138	<	assertEquals(NOCAP, q.remainingCapacity());
138	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
139		assertEquals(n, q.size());
140	+	assertEquals(new PDelay(0), q.peek());
141		return q;
142		}
143
#	Line 134 | Line 145 | public class DelayQueueTest extends JSR1
145		* A new queue has unbounded capacity
146		*/
147		public void testConstructor1() {
148	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
148	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
149		}
150
151		/**
#	Line 142 | Line 153 | public class DelayQueueTest extends JSR1
153		*/
154		public void testConstructor3() {
155		try {
156	<	DelayQueue q = new DelayQueue(null);
156	>	new DelayQueue(null);
157		shouldThrow();
158		} catch (NullPointerException success) {}
159		}
#	Line 152 | Line 163 | public class DelayQueueTest extends JSR1
163		*/
164		public void testConstructor4() {
165		try {
166	<	PDelay[] ints = new PDelay[SIZE];
156	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
166	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
167		shouldThrow();
168		} catch (NullPointerException success) {}
169		}
#	Line 162 | Line 172 | public class DelayQueueTest extends JSR1
172		* Initializing from Collection with some null elements throws NPE
173		*/
174		public void testConstructor5() {
175	+	PDelay[] a = new PDelay[SIZE];
176	+	for (int i = 0; i < SIZE - 1; ++i)
177	+	a[i] = new PDelay(i);
178		try {
179	<	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));
179	>	new DelayQueue(Arrays.asList(a));
180		shouldThrow();
181		} catch (NullPointerException success) {}
182		}
#	Line 189 | Line 199 | public class DelayQueueTest extends JSR1
199		public void testEmpty() {
200		DelayQueue q = new DelayQueue();
201		assertTrue(q.isEmpty());
202	<	assertEquals(NOCAP, q.remainingCapacity());
202	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
203		q.add(new PDelay(1));
204		assertFalse(q.isEmpty());
205		q.add(new PDelay(2));
#	Line 199 | Line 209 | public class DelayQueueTest extends JSR1
209		}
210
211		/**
212	<	* remainingCapacity does not change when elementa added or removed,
203	<	* but size does
212	>	* remainingCapacity() always returns Integer.MAX_VALUE
213		*/
214		public void testRemainingCapacity() {
215	<	DelayQueue q = populatedQueue(SIZE);
215	>	BlockingQueue q = populatedQueue(SIZE);
216		for (int i = 0; i < SIZE; ++i) {
217	<	assertEquals(NOCAP, q.remainingCapacity());
218	<	assertEquals(SIZE-i, q.size());
219	<	q.remove();
217	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
218	>	assertEquals(SIZE - i, q.size());
219	>	assertTrue(q.remove() instanceof PDelay);
220		}
221		for (int i = 0; i < SIZE; ++i) {
222	<	assertEquals(NOCAP, q.remainingCapacity());
222	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
223		assertEquals(i, q.size());
224	<	q.add(new PDelay(i));
224	>	assertTrue(q.add(new PDelay(i)));
225		}
226		}
227
228		/**
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	–	/**
229		* offer non-null succeeds
230		*/
231		public void testOffer() {
#	Line 259 | Line 246 | public class DelayQueueTest extends JSR1
246		}
247
248		/**
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	–	/**
249		* addAll(this) throws IAE
250		*/
251		public void testAddAllSelf() {
252	+	DelayQueue q = populatedQueue(SIZE);
253		try {
278	–	DelayQueue q = populatedQueue(SIZE);
254		q.addAll(q);
255		shouldThrow();
256		} catch (IllegalArgumentException success) {}
257		}
258
259		/**
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	–	/**
260		* addAll of a collection with any null elements throws NPE after
261		* possibly adding some elements
262		*/
263		public void testAddAll3() {
264	+	DelayQueue q = new DelayQueue();
265	+	PDelay[] a = new PDelay[SIZE];
266	+	for (int i = 0; i < SIZE - 1; ++i)
267	+	a[i] = new PDelay(i);
268		try {
269	<	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));
269	>	q.addAll(Arrays.asList(a));
270		shouldThrow();
271		} catch (NullPointerException success) {}
272		}
#	Line 313 | Line 277 | public class DelayQueueTest extends JSR1
277		public void testAddAll5() {
278		PDelay[] empty = new PDelay[0];
279		PDelay[] ints = new PDelay[SIZE];
280	<	for (int i = SIZE-1; i >= 0; --i)
280	>	for (int i = SIZE - 1; i >= 0; --i)
281		ints[i] = new PDelay(i);
282		DelayQueue q = new DelayQueue();
283		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 323 | Line 287 | public class DelayQueueTest extends JSR1
287		}
288
289		/**
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	–	/**
290		* all elements successfully put are contained
291		*/
292	<	public void testPut() {
293	<	DelayQueue q = new DelayQueue();
294	<	for (int i = 0; i < SIZE; ++i) {
295	<	PDelay I = new PDelay(i);
296	<	q.put(I);
297	<	assertTrue(q.contains(I));
298	<	}
299	<	assertEquals(SIZE, q.size());
292	>	public void testPut() {
293	>	DelayQueue q = new DelayQueue();
294	>	for (int i = 0; i < SIZE; ++i) {
295	>	PDelay x = new PDelay(i);
296	>	q.put(x);
297	>	assertTrue(q.contains(x));
298	>	}
299	>	assertEquals(SIZE, q.size());
300		}
301
302		/**
#	Line 351 | Line 304 | public class DelayQueueTest extends JSR1
304		*/
305		public void testPutWithTake() throws InterruptedException {
306		final DelayQueue q = new DelayQueue();
307	<	Thread t = new Thread(new CheckedRunnable() {
307	>	Thread t = newStartedThread(new CheckedRunnable() {
308		public void realRun() {
309		q.put(new PDelay(0));
310		q.put(new PDelay(0));
#	Line 359 | Line 312 | public class DelayQueueTest extends JSR1
312		q.put(new PDelay(0));
313		}});
314
315	<	t.start();
316	<	Thread.sleep(SHORT_DELAY_MS);
364	<	q.take();
365	<	t.interrupt();
366	<	t.join();
315	>	awaitTermination(t);
316	>	assertEquals(4, q.size());
317		}
318
319		/**
#	Line 371 | Line 321 | public class DelayQueueTest extends JSR1
321		*/
322		public void testTimedOffer() throws InterruptedException {
323		final DelayQueue q = new DelayQueue();
324	<	Thread t = new Thread(new CheckedRunnable() {
324	>	Thread t = newStartedThread(new CheckedRunnable() {
325		public void realRun() throws InterruptedException {
326		q.put(new PDelay(0));
327		q.put(new PDelay(0));
328	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
329	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
328	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
329	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
330		}});
331
332	<	t.start();
383	<	Thread.sleep(SMALL_DELAY_MS);
384	<	t.interrupt();
385	<	t.join();
332	>	awaitTermination(t);
333		}
334
335		/**
#	Line 391 | Line 338 | public class DelayQueueTest extends JSR1
338		public void testTake() throws InterruptedException {
339		DelayQueue q = populatedQueue(SIZE);
340		for (int i = 0; i < SIZE; ++i) {
341	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
341	>	assertEquals(new PDelay(i), q.take());
342		}
343		}
344
345		/**
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	–	/**
346		* Take removes existing elements until empty, then blocks interruptibly
347		*/
348		public void testBlockingTake() throws InterruptedException {
349	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
349	>	final DelayQueue q = populatedQueue(SIZE);
350	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
351	>	Thread t = newStartedThread(new CheckedRunnable() {
352		public void realRun() throws InterruptedException {
420	–	DelayQueue q = populatedQueue(SIZE);
353		for (int i = 0; i < SIZE; ++i) {
354	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
354	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
355		}
424	–	q.take();
425	–	}};
356
357	<	t.start();
358	<	Thread.sleep(SHORT_DELAY_MS);
357	>	Thread.currentThread().interrupt();
358	>	try {
359	>	q.take();
360	>	shouldThrow();
361	>	} catch (InterruptedException success) {}
362	>	assertFalse(Thread.interrupted());
363	>
364	>	pleaseInterrupt.countDown();
365	>	try {
366	>	q.take();
367	>	shouldThrow();
368	>	} catch (InterruptedException success) {}
369	>	assertFalse(Thread.interrupted());
370	>	}});
371	>
372	>	await(pleaseInterrupt);
373	>	assertThreadStaysAlive(t);
374		t.interrupt();
375	<	t.join();
375	>	awaitTermination(t);
376		}
377
433	–
378		/**
379		* poll succeeds unless empty
380		*/
381		public void testPoll() {
382		DelayQueue q = populatedQueue(SIZE);
383		for (int i = 0; i < SIZE; ++i) {
384	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
384	>	assertEquals(new PDelay(i), q.poll());
385		}
386		assertNull(q.poll());
387		}
388
389		/**
390	<	* timed pool with zero timeout succeeds when non-empty, else times out
390	>	* timed poll with zero timeout succeeds when non-empty, else times out
391		*/
392		public void testTimedPoll0() throws InterruptedException {
393		DelayQueue q = populatedQueue(SIZE);
394		for (int i = 0; i < SIZE; ++i) {
395	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
395	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
396		}
397		assertNull(q.poll(0, MILLISECONDS));
398		}
399
400		/**
401	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
401	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
402		*/
403		public void testTimedPoll() throws InterruptedException {
404		DelayQueue q = populatedQueue(SIZE);
405		for (int i = 0; i < SIZE; ++i) {
406	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
407	<	}
408	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
406	>	long startTime = System.nanoTime();
407	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
408	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
409	>	}
410	>	long startTime = System.nanoTime();
411	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
412	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
413	>	checkEmpty(q);
414		}
415
416		/**
#	Line 469 | Line 418 | public class DelayQueueTest extends JSR1
418		* returning timeout status
419		*/
420		public void testInterruptedTimedPoll() throws InterruptedException {
421	<	Thread t = new Thread(new CheckedRunnable() {
421	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
422	>	final DelayQueue q = populatedQueue(SIZE);
423	>	Thread t = newStartedThread(new CheckedRunnable() {
424		public void realRun() throws InterruptedException {
425	<	DelayQueue q = populatedQueue(SIZE);
425	>	long startTime = System.nanoTime();
426		for (int i = 0; i < SIZE; ++i) {
427	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
427	>	assertEquals(new PDelay(i),
428	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
429		}
430	+
431	+	Thread.currentThread().interrupt();
432		try {
433	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
433	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
434		shouldThrow();
435		} catch (InterruptedException success) {}
436	<	}});
436	>	assertFalse(Thread.interrupted());
437
438	<	t.start();
485	<	Thread.sleep(SHORT_DELAY_MS);
486	<	t.interrupt();
487	<	t.join();
488	<	}
489	<
490	<	/**
491	<	*  timed poll before a delayed offer fails; after offer succeeds;
492	<	*  on interruption throws
493	<	*/
494	<	public void testTimedPollWithOffer() throws InterruptedException {
495	<	final DelayQueue q = new DelayQueue();
496	<	Thread t = new Thread(new CheckedRunnable() {
497	<	public void realRun() throws InterruptedException {
498	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
499	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
438	>	pleaseInterrupt.countDown();
439		try {
440		q.poll(LONG_DELAY_MS, MILLISECONDS);
441		shouldThrow();
442		} catch (InterruptedException success) {}
443	+	assertFalse(Thread.interrupted());
444	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
445		}});
446
447	<	t.start();
448	<	Thread.sleep(SMALL_DELAY_MS);
508	<	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
447	>	await(pleaseInterrupt);
448	>	assertThreadStaysAlive(t);
449		t.interrupt();
450	<	t.join();
450	>	awaitTermination(t);
451	>	checkEmpty(q);
452		}
453
513	–
454		/**
455		* peek returns next element, or null if empty
456		*/
457		public void testPeek() {
458		DelayQueue q = populatedQueue(SIZE);
459		for (int i = 0; i < SIZE; ++i) {
460	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
461	<	q.poll();
460	>	assertEquals(new PDelay(i), q.peek());
461	>	assertEquals(new PDelay(i), q.poll());
462		if (q.isEmpty())
463		assertNull(q.peek());
464		else
465	<	assertTrue(i != ((PDelay)q.peek()).intValue());
465	>	assertFalse(new PDelay(i).equals(q.peek()));
466		}
467		assertNull(q.peek());
468		}
#	Line 533 | Line 473 | public class DelayQueueTest extends JSR1
473		public void testElement() {
474		DelayQueue q = populatedQueue(SIZE);
475		for (int i = 0; i < SIZE; ++i) {
476	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
476	>	assertEquals(new PDelay(i), q.element());
477		q.poll();
478		}
479		try {
#	Line 548 | Line 488 | public class DelayQueueTest extends JSR1
488		public void testRemove() {
489		DelayQueue q = populatedQueue(SIZE);
490		for (int i = 0; i < SIZE; ++i) {
491	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
491	>	assertEquals(new PDelay(i), q.remove());
492		}
493		try {
494		q.remove();
#	Line 557 | Line 497 | public class DelayQueueTest extends JSR1
497		}
498
499		/**
560	–	* remove(x) removes x and returns true if present
561	–	*/
562	–	public void testRemoveElement() {
563	–	DelayQueue q = populatedQueue(SIZE);
564	–	for (int i = 1; i < SIZE; i+=2) {
565	–	assertTrue(q.remove(new PDelay(i)));
566	–	}
567	–	for (int i = 0; i < SIZE; i+=2) {
568	–	assertTrue(q.remove(new PDelay(i)));
569	–	assertFalse(q.remove(new PDelay(i+1)));
570	–	}
571	–	assertTrue(q.isEmpty());
572	–	}
573	–
574	–	/**
500		* contains(x) reports true when elements added but not yet removed
501		*/
502		public void testContains() {
#	Line 591 | Line 516 | public class DelayQueueTest extends JSR1
516		q.clear();
517		assertTrue(q.isEmpty());
518		assertEquals(0, q.size());
519	<	assertEquals(NOCAP, q.remainingCapacity());
519	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
520		PDelay x = new PDelay(1);
521		q.add(x);
522		assertFalse(q.isEmpty());
#	Line 628 | Line 553 | public class DelayQueueTest extends JSR1
553		assertTrue(changed);
554
555		assertTrue(q.containsAll(p));
556	<	assertEquals(SIZE-i, q.size());
556	>	assertEquals(SIZE - i, q.size());
557		p.remove();
558		}
559		}
#	Line 641 | Line 566 | public class DelayQueueTest extends JSR1
566		DelayQueue q = populatedQueue(SIZE);
567		DelayQueue p = populatedQueue(i);
568		assertTrue(q.removeAll(p));
569	<	assertEquals(SIZE-i, q.size());
569	>	assertEquals(SIZE - i, q.size());
570		for (int j = 0; j < i; ++j) {
571	<	PDelay I = (PDelay)(p.remove());
572	<	assertFalse(q.contains(I));
571	>	PDelay x = (PDelay)(p.remove());
572	>	assertFalse(q.contains(x));
573		}
574		}
575		}
#	Line 657 | Line 582 | public class DelayQueueTest extends JSR1
582		Object[] o = q.toArray();
583		Arrays.sort(o);
584		for (int i = 0; i < o.length; i++)
585	<	assertEquals(o[i], q.take());
585	>	assertSame(o[i], q.take());
586		}
587
588		/**
589		* toArray(a) contains all elements
590		*/
591	<	public void testToArray2() throws InterruptedException {
592	<	DelayQueue q = populatedQueue(SIZE);
591	>	public void testToArray2() {
592	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
593		PDelay[] ints = new PDelay[SIZE];
594	<	ints = (PDelay[])q.toArray(ints);
594	>	PDelay[] array = q.toArray(ints);
595	>	assertSame(ints, array);
596		Arrays.sort(ints);
597		for (int i = 0; i < ints.length; i++)
598	<	assertEquals(ints[i], q.take());
673	<	}
674	<
675	<
676	<	/**
677	<	* toArray(null) throws NPE
678	<	*/
679	<	public void testToArray_BadArg() {
680	<	try {
681	<	DelayQueue q = populatedQueue(SIZE);
682	<	Object o[] = q.toArray(null);
683	<	shouldThrow();
684	<	} catch (NullPointerException success) {}
598	>	assertSame(ints[i], q.remove());
599		}
600
601		/**
602	<	* toArray with incompatible array type throws CCE
602	>	* toArray(incompatible array type) throws ArrayStoreException
603		*/
604		public void testToArray1_BadArg() {
605	+	DelayQueue q = populatedQueue(SIZE);
606		try {
607	<	DelayQueue q = populatedQueue(SIZE);
693	<	Object o[] = q.toArray(new String[10] );
607	>	q.toArray(new String[10]);
608		shouldThrow();
609		} catch (ArrayStoreException success) {}
610		}
#	Line 707 | Line 621 | public class DelayQueueTest extends JSR1
621		++i;
622		}
623		assertEquals(i, SIZE);
624	+	assertIteratorExhausted(it);
625	+	}
626	+
627	+	/**
628	+	* iterator of empty collection has no elements
629	+	*/
630	+	public void testEmptyIterator() {
631	+	assertIteratorExhausted(new DelayQueue().iterator());
632		}
633
634		/**
635		* iterator.remove removes current element
636		*/
637	<	public void testIteratorRemove () {
637	>	public void testIteratorRemove() {
638		final DelayQueue q = new DelayQueue();
639		q.add(new PDelay(2));
640		q.add(new PDelay(1));
#	Line 721 | Line 643 | public class DelayQueueTest extends JSR1
643		it.next();
644		it.remove();
645		it = q.iterator();
646	<	assertEquals(it.next(), new PDelay(2));
647	<	assertEquals(it.next(), new PDelay(3));
646	>	assertEquals(new PDelay(2), it.next());
647	>	assertEquals(new PDelay(3), it.next());
648		assertFalse(it.hasNext());
649		}
650
729	–
651		/**
652		* toString contains toStrings of elements
653		*/
654		public void testToString() {
655		DelayQueue q = populatedQueue(SIZE);
656		String s = q.toString();
657	<	for (int i = 0; i < SIZE; ++i) {
658	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
738	<	}
657	>	for (Object e : q)
658	>	assertTrue(s.contains(e.toString()));
659		}
660
661		/**
662	<	* offer transfers elements across Executor tasks
662	>	* timed poll transfers elements across Executor tasks
663		*/
664		public void testPollInExecutor() {
665		final DelayQueue q = new DelayQueue();
666	<	ExecutorService executor = Executors.newFixedThreadPool(2);
667	<	executor.execute(new CheckedRunnable() {
668	<	public void realRun() throws InterruptedException {
669	<	threadAssertNull(q.poll());
670	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
671	<	threadAssertTrue(q.isEmpty());
672	<	}});
673	<
674	<	executor.execute(new CheckedRunnable() {
675	<	public void realRun() throws InterruptedException {
676	<	Thread.sleep(SHORT_DELAY_MS);
677	<	q.put(new PDelay(1));
678	<	}});
679	<
680	<	joinPool(executor);
681	<
666	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
667	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
668	>	try (PoolCleaner cleaner = cleaner(executor)) {
669	>	executor.execute(new CheckedRunnable() {
670	>	public void realRun() throws InterruptedException {
671	>	assertNull(q.poll());
672	>	threadsStarted.await();
673	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
674	>	checkEmpty(q);
675	>	}});
676	>
677	>	executor.execute(new CheckedRunnable() {
678	>	public void realRun() throws InterruptedException {
679	>	threadsStarted.await();
680	>	q.put(new PDelay(1));
681	>	}});
682	>	}
683		}
684
764	–
685		/**
686		* Delayed actions do not occur until their delay elapses
687		*/
688		public void testDelay() throws InterruptedException {
689	<	DelayQueue q = new DelayQueue();
690	<	NanoDelay[] elements = new NanoDelay[SIZE];
691	<	for (int i = 0; i < SIZE; ++i) {
772	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
773	<	}
774	<	for (int i = 0; i < SIZE; ++i) {
775	<	q.add(elements[i]);
776	<	}
689	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
690	>	for (int i = 0; i < SIZE; ++i)
691	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
692
693		long last = 0;
694		for (int i = 0; i < SIZE; ++i) {
695	<	NanoDelay e = (NanoDelay)(q.take());
695	>	NanoDelay e = q.take();
696		long tt = e.getTriggerTime();
697	<	assertTrue(tt <= System.nanoTime());
697	>	assertTrue(System.nanoTime() - tt >= 0);
698		if (i != 0)
699		assertTrue(tt >= last);
700		last = tt;
701		}
702	+	assertTrue(q.isEmpty());
703		}
704
705		/**
#	Line 792 | Line 708 | public class DelayQueueTest extends JSR1
708		public void testPeekDelayed() {
709		DelayQueue q = new DelayQueue();
710		q.add(new NanoDelay(Long.MAX_VALUE));
711	<	assert(q.peek() != null);
711	>	assertNotNull(q.peek());
712		}
713
798	–
714		/**
715		* poll of a non-empty queue returns null if no expired elements.
716		*/
#	Line 811 | Line 726 | public class DelayQueueTest extends JSR1
726		public void testTimedPollDelayed() throws InterruptedException {
727		DelayQueue q = new DelayQueue();
728		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
729	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
815	<	}
816	<
817	<	/**
818	<	* drainTo(null) throws NPE
819	<	*/
820	<	public void testDrainToNull() {
821	<	DelayQueue q = populatedQueue(SIZE);
822	<	try {
823	<	q.drainTo(null);
824	<	shouldThrow();
825	<	} catch (NullPointerException success) {}
826	<	}
827	<
828	<	/**
829	<	* drainTo(this) throws IAE
830	<	*/
831	<	public void testDrainToSelf() {
832	<	DelayQueue q = populatedQueue(SIZE);
833	<	try {
834	<	q.drainTo(q);
835	<	shouldThrow();
836	<	} catch (IllegalArgumentException success) {}
729	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
730		}
731
732		/**
#	Line 848 | Line 741 | public class DelayQueueTest extends JSR1
741		}
742		ArrayList l = new ArrayList();
743		q.drainTo(l);
744	<	assertEquals(q.size(), 0);
744	>	assertEquals(0, q.size());
745		for (int i = 0; i < SIZE; ++i)
746	<	assertEquals(l.get(i), elems[i]);
746	>	assertEquals(elems[i], l.get(i));
747		q.add(elems[0]);
748		q.add(elems[1]);
749		assertFalse(q.isEmpty());
#	Line 858 | Line 751 | public class DelayQueueTest extends JSR1
751		assertTrue(q.contains(elems[1]));
752		l.clear();
753		q.drainTo(l);
754	<	assertEquals(q.size(), 0);
755	<	assertEquals(l.size(), 2);
754	>	assertEquals(0, q.size());
755	>	assertEquals(2, l.size());
756		for (int i = 0; i < 2; ++i)
757	<	assertEquals(l.get(i), elems[i]);
757	>	assertEquals(elems[i], l.get(i));
758		}
759
760		/**
#	Line 871 | Line 764 | public class DelayQueueTest extends JSR1
764		final DelayQueue q = populatedQueue(SIZE);
765		Thread t = new Thread(new CheckedRunnable() {
766		public void realRun() {
767	<	q.put(new PDelay(SIZE+1));
767	>	q.put(new PDelay(SIZE + 1));
768		}});
769
770		t.start();
#	Line 883 | Line 776 | public class DelayQueueTest extends JSR1
776		}
777
778		/**
779	<	* drainTo(null, n) throws NPE
887	<	*/
888	<	public void testDrainToNullN() {
889	<	DelayQueue q = populatedQueue(SIZE);
890	<	try {
891	<	q.drainTo(null, 0);
892	<	shouldThrow();
893	<	} catch (NullPointerException success) {}
894	<	}
895	<
896	<	/**
897	<	* drainTo(this, n) throws IAE
898	<	*/
899	<	public void testDrainToSelfN() {
900	<	DelayQueue q = populatedQueue(SIZE);
901	<	try {
902	<	q.drainTo(q, 0);
903	<	shouldThrow();
904	<	} catch (IllegalArgumentException success) {}
905	<	}
906	<
907	<	/**
908	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
779	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
780		*/
781		public void testDrainToN() {
782		for (int i = 0; i < SIZE + 2; ++i) {
783		DelayQueue q = populatedQueue(SIZE);
784		ArrayList l = new ArrayList();
785		q.drainTo(l, i);
786	<	int k = (i < SIZE)? i : SIZE;
787	<	assertEquals(q.size(), SIZE-k);
788	<	assertEquals(l.size(), k);
786	>	int k = (i < SIZE) ? i : SIZE;
787	>	assertEquals(SIZE - k, q.size());
788	>	assertEquals(k, l.size());
789		}
790		}
791
792	<
792	>	/**
793	>	* remove(null), contains(null) always return false
794	>	*/
795	>	public void testNeverContainsNull() {
796	>	Collection<?> q = populatedQueue(SIZE);
797	>	assertFalse(q.contains(null));
798	>	assertFalse(q.remove(null));
799	>	}
800		}

Diff Legend

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