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.19 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.66 by jsr166, Wed Dec 31 20:17:39 2014 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	>	junit.textui.TestRunner.run(suite());
39		}
40
41		public static Test suite() {
42	<	return new TestSuite(DelayQueueTest.class);
42	>	return newTestSuite(DelayQueueTest.class,
43	>	new Generic().testSuite());
44		}
45
46		private static final int NOCAP = Integer.MAX_VALUE;
47
48		/**
49		* A delayed implementation for testing.
50	<	* Most  tests use Pseudodelays, where delays are all elapsed
50	>	* Most tests use Pseudodelays, where delays are all elapsed
51		* (so, no blocking solely for delays) but are still ordered
52		*/
53		static class PDelay implements Delayed {
54		int pseudodelay;
55	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
56	<	public int compareTo(PDelay y) {
57	<	int i = pseudodelay;
58	<	int j = ((PDelay)y).pseudodelay;
59	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
55	>	PDelay(int i) { pseudodelay = i; }
56	>	public int compareTo(PDelay other) {
57	>	int a = this.pseudodelay;
58	>	int b = other.pseudodelay;
59	>	return (a < b) ? -1 : (a > b) ? 1 : 0;
60		}
40	–
61		public int compareTo(Delayed y) {
62	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
62	>	return compareTo((PDelay)y);
63		}
48	–
64		public boolean equals(Object other) {
65	<	return ((PDelay)other).pseudodelay == pseudodelay;
66	<	}
52	<	public boolean equals(PDelay other) {
53	<	return ((PDelay)other).pseudodelay == pseudodelay;
65	>	return (other instanceof PDelay) &&
66	>	this.pseudodelay == ((PDelay)other).pseudodelay;
67		}
68	<
69	<
68	>	// suppress [overrides] javac warning
69	>	public int hashCode() { return pseudodelay; }
70		public long getDelay(TimeUnit ignore) {
71	<	return pseudodelay;
71	>	return Integer.MIN_VALUE + pseudodelay;
72		}
60	–	public int intValue() {
61	–	return pseudodelay;
62	–	}
63	–
73		public String toString() {
74		return String.valueOf(pseudodelay);
75		}
76		}
77
69	–
78		/**
79		* Delayed implementation that actually delays
80		*/
#	Line 77 | Line 85 | public class DelayQueueTest extends JSR1
85		}
86		public int compareTo(NanoDelay y) {
87		long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
88	>	long j = y.trigger;
89		if (i < j) return -1;
90		if (i > j) return 1;
91		return 0;
92		}
93
94		public int compareTo(Delayed y) {
95	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
95	>	return compareTo((NanoDelay)y);
96		}
97
98		public boolean equals(Object other) {
99	<	return ((NanoDelay)other).trigger == trigger;
99	>	return equals((NanoDelay)other);
100		}
101		public boolean equals(NanoDelay other) {
102	<	return ((NanoDelay)other).trigger == trigger;
102	>	return other.trigger == trigger;
103		}
104
105	+	// suppress [overrides] javac warning
106	+	public int hashCode() { return (int) trigger; }
107	+
108		public long getDelay(TimeUnit unit) {
109		long n = trigger - System.nanoTime();
110		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 112 | Line 119 | public class DelayQueueTest extends JSR1
119		}
120		}
121
115	–
122		/**
123	<	* Create a queue of given size containing consecutive
123	>	* Returns a new queue of given size containing consecutive
124		* PDelays 0 ... n.
125		*/
126	<	private DelayQueue populatedQueue(int n) {
127	<	DelayQueue q = new DelayQueue();
126	>	private DelayQueue<PDelay> populatedQueue(int n) {
127	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
128		assertTrue(q.isEmpty());
129	<	for (int i = n-1; i >= 0; i-=2)
129	>	for (int i = n-1; i >= 0; i -= 2)
130		assertTrue(q.offer(new PDelay(i)));
131	<	for (int i = (n & 1); i < n; i+=2)
131	>	for (int i = (n & 1); i < n; i += 2)
132		assertTrue(q.offer(new PDelay(i)));
133		assertFalse(q.isEmpty());
134		assertEquals(NOCAP, q.remainingCapacity());
#	Line 144 | Line 150 | public class DelayQueueTest extends JSR1
150		try {
151		DelayQueue q = new DelayQueue(null);
152		shouldThrow();
153	<	}
148	<	catch (NullPointerException success) {}
153	>	} catch (NullPointerException success) {}
154		}
155
156		/**
#	Line 156 | Line 161 | public class DelayQueueTest extends JSR1
161		PDelay[] ints = new PDelay[SIZE];
162		DelayQueue q = new DelayQueue(Arrays.asList(ints));
163		shouldThrow();
164	<	}
160	<	catch (NullPointerException success) {}
164	>	} catch (NullPointerException success) {}
165		}
166
167		/**
#	Line 170 | Line 174 | public class DelayQueueTest extends JSR1
174		ints[i] = new PDelay(i);
175		DelayQueue q = new DelayQueue(Arrays.asList(ints));
176		shouldThrow();
177	<	}
174	<	catch (NullPointerException success) {}
177	>	} catch (NullPointerException success) {}
178		}
179
180		/**
181		* Queue contains all elements of collection used to initialize
182		*/
183		public void testConstructor6() {
184	<	try {
185	<	PDelay[] ints = new PDelay[SIZE];
186	<	for (int i = 0; i < SIZE; ++i)
187	<	ints[i] = new PDelay(i);
188	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
189	<	for (int i = 0; i < SIZE; ++i)
187	<	assertEquals(ints[i], q.poll());
188	<	}
189	<	finally {}
184	>	PDelay[] ints = new PDelay[SIZE];
185	>	for (int i = 0; i < SIZE; ++i)
186	>	ints[i] = new PDelay(i);
187	>	DelayQueue q = new DelayQueue(Arrays.asList(ints));
188	>	for (int i = 0; i < SIZE; ++i)
189	>	assertEquals(ints[i], q.poll());
190		}
191
192		/**
#	Line 205 | Line 205 | public class DelayQueueTest extends JSR1
205		}
206
207		/**
208	<	* remainingCapacity does not change when elementa added or removed,
208	>	* remainingCapacity does not change when elements added or removed,
209		* but size does
210		*/
211		public void testRemainingCapacity() {
#	Line 223 | Line 223 | public class DelayQueueTest extends JSR1
223		}
224
225		/**
226	–	* offer(null) throws NPE
227	–	*/
228	–	public void testOfferNull() {
229	–	try {
230	–	DelayQueue q = new DelayQueue();
231	–	q.offer(null);
232	–	shouldThrow();
233	–	} catch (NullPointerException success) { }
234	–	}
235	–
236	–	/**
237	–	* add(null) throws NPE
238	–	*/
239	–	public void testAddNull() {
240	–	try {
241	–	DelayQueue q = new DelayQueue();
242	–	q.add(null);
243	–	shouldThrow();
244	–	} catch (NullPointerException success) { }
245	–	}
246	–
247	–	/**
226		* offer non-null succeeds
227		*/
228		public void testOffer() {
#	Line 265 | Line 243 | public class DelayQueueTest extends JSR1
243		}
244
245		/**
268	–	* addAll(null) throws NPE
269	–	*/
270	–	public void testAddAll1() {
271	–	try {
272	–	DelayQueue q = new DelayQueue();
273	–	q.addAll(null);
274	–	shouldThrow();
275	–	}
276	–	catch (NullPointerException success) {}
277	–	}
278	–
279	–
280	–	/**
246		* addAll(this) throws IAE
247		*/
248		public void testAddAllSelf() {
#	Line 285 | Line 250 | public class DelayQueueTest extends JSR1
250		DelayQueue q = populatedQueue(SIZE);
251		q.addAll(q);
252		shouldThrow();
253	<	}
289	<	catch (IllegalArgumentException success) {}
253	>	} catch (IllegalArgumentException success) {}
254		}
255
256		/**
293	–	* addAll of a collection with null elements throws NPE
294	–	*/
295	–	public void testAddAll2() {
296	–	try {
297	–	DelayQueue q = new DelayQueue();
298	–	PDelay[] ints = new PDelay[SIZE];
299	–	q.addAll(Arrays.asList(ints));
300	–	shouldThrow();
301	–	}
302	–	catch (NullPointerException success) {}
303	–	}
304	–	/**
257		* addAll of a collection with any null elements throws NPE after
258		* possibly adding some elements
259		*/
#	Line 313 | Line 265 | public class DelayQueueTest extends JSR1
265		ints[i] = new PDelay(i);
266		q.addAll(Arrays.asList(ints));
267		shouldThrow();
268	<	}
317	<	catch (NullPointerException success) {}
268	>	} catch (NullPointerException success) {}
269		}
270
271		/**
272		* Queue contains all elements of successful addAll
273		*/
274		public void testAddAll5() {
275	<	try {
276	<	PDelay[] empty = new PDelay[0];
277	<	PDelay[] ints = new PDelay[SIZE];
278	<	for (int i = SIZE-1; i >= 0; --i)
279	<	ints[i] = new PDelay(i);
280	<	DelayQueue q = new DelayQueue();
281	<	assertFalse(q.addAll(Arrays.asList(empty)));
282	<	assertTrue(q.addAll(Arrays.asList(ints)));
283	<	for (int i = 0; i < SIZE; ++i)
333	<	assertEquals(ints[i], q.poll());
334	<	}
335	<	finally {}
275	>	PDelay[] empty = new PDelay[0];
276	>	PDelay[] ints = new PDelay[SIZE];
277	>	for (int i = SIZE-1; i >= 0; --i)
278	>	ints[i] = new PDelay(i);
279	>	DelayQueue q = new DelayQueue();
280	>	assertFalse(q.addAll(Arrays.asList(empty)));
281	>	assertTrue(q.addAll(Arrays.asList(ints)));
282	>	for (int i = 0; i < SIZE; ++i)
283	>	assertEquals(ints[i], q.poll());
284		}
285
286		/**
339	–	* put(null) throws NPE
340	–	*/
341	–	public void testPutNull() {
342	–	try {
343	–	DelayQueue q = new DelayQueue();
344	–	q.put(null);
345	–	shouldThrow();
346	–	}
347	–	catch (NullPointerException success) {
348	–	}
349	–	}
350	–
351	–	/**
287		* all elements successfully put are contained
288		*/
289	<	public void testPut() {
290	<	try {
291	<	DelayQueue q = new DelayQueue();
292	<	for (int i = 0; i < SIZE; ++i) {
293	<	PDelay I = new PDelay(i);
294	<	q.put(I);
360	<	assertTrue(q.contains(I));
361	<	}
362	<	assertEquals(SIZE, q.size());
363	<	}
364	<	finally {
289	>	public void testPut() {
290	>	DelayQueue q = new DelayQueue();
291	>	for (int i = 0; i < SIZE; ++i) {
292	>	PDelay x = new PDelay(i);
293	>	q.put(x);
294	>	assertTrue(q.contains(x));
295		}
296	+	assertEquals(SIZE, q.size());
297		}
298
299		/**
300		* put doesn't block waiting for take
301		*/
302	<	public void testPutWithTake() {
302	>	public void testPutWithTake() throws InterruptedException {
303		final DelayQueue q = new DelayQueue();
304	<	Thread t = new Thread(new Runnable() {
305	<	public void run() {
306	<	int added = 0;
307	<	try {
308	<	q.put(new PDelay(0));
309	<	++added;
310	<	q.put(new PDelay(0));
311	<	++added;
312	<	q.put(new PDelay(0));
313	<	++added;
383	<	q.put(new PDelay(0));
384	<	++added;
385	<	threadAssertTrue(added == 4);
386	<	} finally {
387	<	}
388	<	}
389	<	});
390	<	try {
391	<	t.start();
392	<	Thread.sleep(SHORT_DELAY_MS);
393	<	q.take();
394	<	t.interrupt();
395	<	t.join();
396	<	} catch (Exception e) {
397	<	unexpectedException();
398	<	}
304	>	Thread t = newStartedThread(new CheckedRunnable() {
305	>	public void realRun() {
306	>	q.put(new PDelay(0));
307	>	q.put(new PDelay(0));
308	>	q.put(new PDelay(0));
309	>	q.put(new PDelay(0));
310	>	}});
311	>
312	>	awaitTermination(t);
313	>	assertEquals(4, q.size());
314		}
315
316		/**
317		* timed offer does not time out
318		*/
319	<	public void testTimedOffer() {
319	>	public void testTimedOffer() throws InterruptedException {
320		final DelayQueue q = new DelayQueue();
321	<	Thread t = new Thread(new Runnable() {
322	<	public void run() {
323	<	try {
324	<	q.put(new PDelay(0));
325	<	q.put(new PDelay(0));
326	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
327	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
413	<	} finally { }
414	<	}
415	<	});
321	>	Thread t = newStartedThread(new CheckedRunnable() {
322	>	public void realRun() throws InterruptedException {
323	>	q.put(new PDelay(0));
324	>	q.put(new PDelay(0));
325	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
326	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
327	>	}});
328
329	<	try {
418	<	t.start();
419	<	Thread.sleep(SMALL_DELAY_MS);
420	<	t.interrupt();
421	<	t.join();
422	<	} catch (Exception e) {
423	<	unexpectedException();
424	<	}
329	>	awaitTermination(t);
330		}
331
332		/**
333		* take retrieves elements in priority order
334		*/
335	<	public void testTake() {
336	<	try {
337	<	DelayQueue q = populatedQueue(SIZE);
338	<	for (int i = 0; i < SIZE; ++i) {
434	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
435	<	}
436	<	} catch (InterruptedException e) {
437	<	unexpectedException();
335	>	public void testTake() throws InterruptedException {
336	>	DelayQueue q = populatedQueue(SIZE);
337	>	for (int i = 0; i < SIZE; ++i) {
338	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
339		}
340		}
341
342		/**
343	<	* take blocks interruptibly when empty
343	>	* Take removes existing elements until empty, then blocks interruptibly
344		*/
345	<	public void testTakeFromEmpty() {
346	<	final DelayQueue q = new DelayQueue();
347	<	Thread t = new Thread(new Runnable() {
348	<	public void run() {
349	<	try {
350	<	q.take();
351	<	threadShouldThrow();
451	<	} catch (InterruptedException success) { }
345	>	public void testBlockingTake() throws InterruptedException {
346	>	final DelayQueue q = populatedQueue(SIZE);
347	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
348	>	Thread t = newStartedThread(new CheckedRunnable() {
349	>	public void realRun() throws InterruptedException {
350	>	for (int i = 0; i < SIZE; ++i) {
351	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
352		}
453	–	});
454	–	try {
455	–	t.start();
456	–	Thread.sleep(SHORT_DELAY_MS);
457	–	t.interrupt();
458	–	t.join();
459	–	} catch (Exception e) {
460	–	unexpectedException();
461	–	}
462	–	}
353
354	<	/**
355	<	* Take removes existing elements until empty, then blocks interruptibly
356	<	*/
357	<	public void testBlockingTake() {
358	<	Thread t = new Thread(new Runnable() {
359	<	public void run() {
470	<	try {
471	<	DelayQueue q = populatedQueue(SIZE);
472	<	for (int i = 0; i < SIZE; ++i) {
473	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
474	<	}
475	<	q.take();
476	<	threadShouldThrow();
477	<	} catch (InterruptedException success) {
478	<	}
479	<	}});
480	<	t.start();
481	<	try {
482	<	Thread.sleep(SHORT_DELAY_MS);
483	<	t.interrupt();
484	<	t.join();
485	<	}
486	<	catch (InterruptedException ie) {
487	<	unexpectedException();
488	<	}
489	<	}
354	>	Thread.currentThread().interrupt();
355	>	try {
356	>	q.take();
357	>	shouldThrow();
358	>	} catch (InterruptedException success) {}
359	>	assertFalse(Thread.interrupted());
360
361	+	pleaseInterrupt.countDown();
362	+	try {
363	+	q.take();
364	+	shouldThrow();
365	+	} catch (InterruptedException success) {}
366	+	assertFalse(Thread.interrupted());
367	+	}});
368	+
369	+	await(pleaseInterrupt);
370	+	assertThreadStaysAlive(t);
371	+	t.interrupt();
372	+	awaitTermination(t);
373	+	}
374
375		/**
376		* poll succeeds unless empty
#	Line 501 | Line 384 | public class DelayQueueTest extends JSR1
384		}
385
386		/**
387	<	* timed pool with zero timeout succeeds when non-empty, else times out
387	>	* timed poll with zero timeout succeeds when non-empty, else times out
388		*/
389	<	public void testTimedPoll0() {
390	<	try {
391	<	DelayQueue q = populatedQueue(SIZE);
392	<	for (int i = 0; i < SIZE; ++i) {
510	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
511	<	}
512	<	assertNull(q.poll(0, MILLISECONDS));
513	<	} catch (InterruptedException e) {
514	<	unexpectedException();
389	>	public void testTimedPoll0() throws InterruptedException {
390	>	DelayQueue q = populatedQueue(SIZE);
391	>	for (int i = 0; i < SIZE; ++i) {
392	>	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
393		}
394	+	assertNull(q.poll(0, MILLISECONDS));
395		}
396
397		/**
398	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
398	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
399		*/
400	<	public void testTimedPoll() {
401	<	try {
402	<	DelayQueue q = populatedQueue(SIZE);
403	<	for (int i = 0; i < SIZE; ++i) {
404	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
405	<	}
527	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
528	<	} catch (InterruptedException e) {
529	<	unexpectedException();
400	>	public void testTimedPoll() throws InterruptedException {
401	>	DelayQueue q = populatedQueue(SIZE);
402	>	for (int i = 0; i < SIZE; ++i) {
403	>	long startTime = System.nanoTime();
404	>	assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
405	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
406		}
407	+	long startTime = System.nanoTime();
408	+	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
409	+	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
410	+	checkEmpty(q);
411		}
412
413		/**
414		* Interrupted timed poll throws InterruptedException instead of
415		* returning timeout status
416		*/
417	<	public void testInterruptedTimedPoll() {
418	<	Thread t = new Thread(new Runnable() {
419	<	public void run() {
420	<	try {
421	<	DelayQueue q = populatedQueue(SIZE);
422	<	for (int i = 0; i < SIZE; ++i) {
423	<	threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
544	<	}
545	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
546	<	} catch (InterruptedException success) {
547	<	}
548	<	}});
549	<	t.start();
550	<	try {
551	<	Thread.sleep(SHORT_DELAY_MS);
552	<	t.interrupt();
553	<	t.join();
554	<	}
555	<	catch (InterruptedException ie) {
556	<	unexpectedException();
557	<	}
558	<	}
559	<
560	<	/**
561	<	*  timed poll before a delayed offer fails; after offer succeeds;
562	<	*  on interruption throws
563	<	*/
564	<	public void testTimedPollWithOffer() {
565	<	final DelayQueue q = new DelayQueue();
566	<	Thread t = new Thread(new Runnable() {
567	<	public void run() {
568	<	try {
569	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
570	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
571	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
572	<	threadFail("Should block");
573	<	} catch (InterruptedException success) { }
417	>	public void testInterruptedTimedPoll() throws InterruptedException {
418	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
419	>	Thread t = newStartedThread(new CheckedRunnable() {
420	>	public void realRun() throws InterruptedException {
421	>	DelayQueue q = populatedQueue(SIZE);
422	>	for (int i = 0; i < SIZE; ++i) {
423	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
424		}
575	–	});
576	–	try {
577	–	t.start();
578	–	Thread.sleep(SMALL_DELAY_MS);
579	–	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
580	–	t.interrupt();
581	–	t.join();
582	–	} catch (Exception e) {
583	–	unexpectedException();
584	–	}
585	–	}
425
426	+	Thread.currentThread().interrupt();
427	+	try {
428	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
429	+	shouldThrow();
430	+	} catch (InterruptedException success) {}
431	+	assertFalse(Thread.interrupted());
432	+
433	+	pleaseInterrupt.countDown();
434	+	try {
435	+	q.poll(LONG_DELAY_MS, MILLISECONDS);
436	+	shouldThrow();
437	+	} catch (InterruptedException success) {}
438	+	assertFalse(Thread.interrupted());
439	+	}});
440	+
441	+	await(pleaseInterrupt);
442	+	assertThreadStaysAlive(t);
443	+	t.interrupt();
444	+	awaitTermination(t);
445	+	}
446
447		/**
448		* peek returns next element, or null if empty
#	Line 592 | Line 451 | public class DelayQueueTest extends JSR1
451		DelayQueue q = populatedQueue(SIZE);
452		for (int i = 0; i < SIZE; ++i) {
453		assertEquals(new PDelay(i), ((PDelay)q.peek()));
454	<	q.poll();
454	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
455		if (q.isEmpty())
456		assertNull(q.peek());
457		else
458	<	assertTrue(i != ((PDelay)q.peek()).intValue());
458	>	assertFalse(new PDelay(i).equals(q.peek()));
459		}
460		assertNull(q.peek());
461		}
#	Line 613 | Line 472 | public class DelayQueueTest extends JSR1
472		try {
473		q.element();
474		shouldThrow();
475	<	}
617	<	catch (NoSuchElementException success) {}
475	>	} catch (NoSuchElementException success) {}
476		}
477
478		/**
#	Line 628 | Line 486 | public class DelayQueueTest extends JSR1
486		try {
487		q.remove();
488		shouldThrow();
489	<	} catch (NoSuchElementException success) {
632	<	}
633	<	}
634	<
635	<	/**
636	<	* remove(x) removes x and returns true if present
637	<	*/
638	<	public void testRemoveElement() {
639	<	DelayQueue q = populatedQueue(SIZE);
640	<	for (int i = 1; i < SIZE; i+=2) {
641	<	assertTrue(q.remove(new PDelay(i)));
642	<	}
643	<	for (int i = 0; i < SIZE; i+=2) {
644	<	assertTrue(q.remove(new PDelay(i)));
645	<	assertFalse(q.remove(new PDelay(i+1)));
646	<	}
647	<	assertTrue(q.isEmpty());
489	>	} catch (NoSuchElementException success) {}
490		}
491
492		/**
#	Line 719 | Line 561 | public class DelayQueueTest extends JSR1
561		assertTrue(q.removeAll(p));
562		assertEquals(SIZE-i, q.size());
563		for (int j = 0; j < i; ++j) {
564	<	PDelay I = (PDelay)(p.remove());
565	<	assertFalse(q.contains(I));
564	>	PDelay x = (PDelay)(p.remove());
565	>	assertFalse(q.contains(x));
566		}
567		}
568		}
#	Line 728 | Line 570 | public class DelayQueueTest extends JSR1
570		/**
571		* toArray contains all elements
572		*/
573	<	public void testToArray() {
573	>	public void testToArray() throws InterruptedException {
574		DelayQueue q = populatedQueue(SIZE);
575		Object[] o = q.toArray();
576		Arrays.sort(o);
735	–	try {
577		for (int i = 0; i < o.length; i++)
578	<	assertEquals(o[i], q.take());
738	<	} catch (InterruptedException e) {
739	<	unexpectedException();
740	<	}
578	>	assertSame(o[i], q.take());
579		}
580
581		/**
582		* toArray(a) contains all elements
583		*/
584		public void testToArray2() {
585	<	DelayQueue q = populatedQueue(SIZE);
585	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
586		PDelay[] ints = new PDelay[SIZE];
587	<	ints = (PDelay[])q.toArray(ints);
587	>	PDelay[] array = q.toArray(ints);
588	>	assertSame(ints, array);
589		Arrays.sort(ints);
590	<	try {
591	<	for (int i = 0; i < ints.length; i++)
753	<	assertEquals(ints[i], q.take());
754	<	} catch (InterruptedException e) {
755	<	unexpectedException();
756	<	}
590	>	for (int i = 0; i < ints.length; i++)
591	>	assertSame(ints[i], q.remove());
592		}
593
759	–
594		/**
595	<	* toArray(null) throws NPE
762	<	*/
763	<	public void testToArray_BadArg() {
764	<	try {
765	<	DelayQueue q = populatedQueue(SIZE);
766	<	Object o[] = q.toArray(null);
767	<	shouldThrow();
768	<	} catch (NullPointerException success) {}
769	<	}
770	<
771	<	/**
772	<	* toArray with incompatible array type throws CCE
595	>	* toArray(incompatible array type) throws ArrayStoreException
596		*/
597		public void testToArray1_BadArg() {
598	+	DelayQueue q = populatedQueue(SIZE);
599		try {
600	<	DelayQueue q = populatedQueue(SIZE);
777	<	Object o[] = q.toArray(new String[10] );
600	>	q.toArray(new String[10]);
601		shouldThrow();
602	<	} catch (ArrayStoreException  success) {}
602	>	} catch (ArrayStoreException success) {}
603		}
604
605		/**
#	Line 796 | Line 619 | public class DelayQueueTest extends JSR1
619		/**
620		* iterator.remove removes current element
621		*/
622	<	public void testIteratorRemove () {
622	>	public void testIteratorRemove() {
623		final DelayQueue q = new DelayQueue();
624		q.add(new PDelay(2));
625		q.add(new PDelay(1));
#	Line 805 | Line 628 | public class DelayQueueTest extends JSR1
628		it.next();
629		it.remove();
630		it = q.iterator();
631	<	assertEquals(it.next(), new PDelay(2));
632	<	assertEquals(it.next(), new PDelay(3));
631	>	assertEquals(new PDelay(2), it.next());
632	>	assertEquals(new PDelay(3), it.next());
633		assertFalse(it.hasNext());
634		}
635
813	–
636		/**
637		* toString contains toStrings of elements
638		*/
639		public void testToString() {
640		DelayQueue q = populatedQueue(SIZE);
641		String s = q.toString();
642	<	for (int i = 0; i < SIZE; ++i) {
643	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
822	<	}
642	>	for (Object e : q)
643	>	assertTrue(s.contains(e.toString()));
644		}
645
646		/**
647	<	* offer transfers elements across Executor tasks
647	>	* timed poll transfers elements across Executor tasks
648		*/
649		public void testPollInExecutor() {
650		final DelayQueue q = new DelayQueue();
651	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
652		ExecutorService executor = Executors.newFixedThreadPool(2);
653	<	executor.execute(new Runnable() {
654	<	public void run() {
655	<	threadAssertNull(q.poll());
656	<	try {
657	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
658	<	threadAssertTrue(q.isEmpty());
659	<	}
660	<	catch (InterruptedException e) {
661	<	threadUnexpectedException();
662	<	}
663	<	}
664	<	});
653	>	executor.execute(new CheckedRunnable() {
654	>	public void realRun() throws InterruptedException {
655	>	assertNull(q.poll());
656	>	threadsStarted.await();
657	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
658	>	checkEmpty(q);
659	>	}});
660	>
661	>	executor.execute(new CheckedRunnable() {
662	>	public void realRun() throws InterruptedException {
663	>	threadsStarted.await();
664	>	q.put(new PDelay(1));
665	>	}});
666
844	–	executor.execute(new Runnable() {
845	–	public void run() {
846	–	try {
847	–	Thread.sleep(SHORT_DELAY_MS);
848	–	q.put(new PDelay(1));
849	–	}
850	–	catch (InterruptedException e) {
851	–	threadUnexpectedException();
852	–	}
853	–	}
854	–	});
667		joinPool(executor);
856	–
668		}
669
859	–
670		/**
671		* Delayed actions do not occur until their delay elapses
672		*/
673	<	public void testDelay() {
674	<	DelayQueue q = new DelayQueue();
675	<	NanoDelay[] elements = new NanoDelay[SIZE];
676	<	for (int i = 0; i < SIZE; ++i) {
867	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
868	<	}
869	<	for (int i = 0; i < SIZE; ++i) {
870	<	q.add(elements[i]);
871	<	}
673	>	public void testDelay() throws InterruptedException {
674	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
675	>	for (int i = 0; i < SIZE; ++i)
676	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
677
678	<	try {
679	<	long last = 0;
680	<	for (int i = 0; i < SIZE; ++i) {
681	<	NanoDelay e = (NanoDelay)(q.take());
682	<	long tt = e.getTriggerTime();
683	<	assertTrue(tt <= System.nanoTime());
684	<	if (i != 0)
685	<	assertTrue(tt >= last);
881	<	last = tt;
882	<	}
883	<	}
884	<	catch (InterruptedException ie) {
885	<	unexpectedException();
678	>	long last = 0;
679	>	for (int i = 0; i < SIZE; ++i) {
680	>	NanoDelay e = q.take();
681	>	long tt = e.getTriggerTime();
682	>	assertTrue(System.nanoTime() - tt >= 0);
683	>	if (i != 0)
684	>	assertTrue(tt >= last);
685	>	last = tt;
686		}
687	+	assertTrue(q.isEmpty());
688		}
689
690		/**
#	Line 892 | Line 693 | public class DelayQueueTest extends JSR1
693		public void testPeekDelayed() {
694		DelayQueue q = new DelayQueue();
695		q.add(new NanoDelay(Long.MAX_VALUE));
696	<	assert(q.peek() != null);
696	>	assertNotNull(q.peek());
697		}
698
898	–
699		/**
700		* poll of a non-empty queue returns null if no expired elements.
701		*/
#	Line 908 | Line 708 | public class DelayQueueTest extends JSR1
708		/**
709		* timed poll of a non-empty queue returns null if no expired elements.
710		*/
711	<	public void testTimedPollDelayed() {
711	>	public void testTimedPollDelayed() throws InterruptedException {
712		DelayQueue q = new DelayQueue();
713		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
714	<	try {
915	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
916	<	} catch (Exception ex) {
917	<	unexpectedException();
918	<	}
919	<	}
920	<
921	<	/**
922	<	* drainTo(null) throws NPE
923	<	*/
924	<	public void testDrainToNull() {
925	<	DelayQueue q = populatedQueue(SIZE);
926	<	try {
927	<	q.drainTo(null);
928	<	shouldThrow();
929	<	} catch (NullPointerException success) {
930	<	}
931	<	}
932	<
933	<	/**
934	<	* drainTo(this) throws IAE
935	<	*/
936	<	public void testDrainToSelf() {
937	<	DelayQueue q = populatedQueue(SIZE);
938	<	try {
939	<	q.drainTo(q);
940	<	shouldThrow();
941	<	} catch (IllegalArgumentException success) {
942	<	}
714	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
715		}
716
717		/**
#	Line 954 | Line 726 | public class DelayQueueTest extends JSR1
726		}
727		ArrayList l = new ArrayList();
728		q.drainTo(l);
729	<	assertEquals(q.size(), 0);
729	>	assertEquals(0, q.size());
730		for (int i = 0; i < SIZE; ++i)
731	<	assertEquals(l.get(i), elems[i]);
731	>	assertEquals(elems[i], l.get(i));
732		q.add(elems[0]);
733		q.add(elems[1]);
734		assertFalse(q.isEmpty());
#	Line 964 | Line 736 | public class DelayQueueTest extends JSR1
736		assertTrue(q.contains(elems[1]));
737		l.clear();
738		q.drainTo(l);
739	<	assertEquals(q.size(), 0);
740	<	assertEquals(l.size(), 2);
739	>	assertEquals(0, q.size());
740	>	assertEquals(2, l.size());
741		for (int i = 0; i < 2; ++i)
742	<	assertEquals(l.get(i), elems[i]);
742	>	assertEquals(elems[i], l.get(i));
743		}
744
745		/**
746		* drainTo empties queue
747		*/
748	<	public void testDrainToWithActivePut() {
748	>	public void testDrainToWithActivePut() throws InterruptedException {
749		final DelayQueue q = populatedQueue(SIZE);
750	<	Thread t = new Thread(new Runnable() {
751	<	public void run() {
752	<	q.put(new PDelay(SIZE+1));
753	<	}
982	<	});
983	<	try {
984	<	t.start();
985	<	ArrayList l = new ArrayList();
986	<	q.drainTo(l);
987	<	assertTrue(l.size() >= SIZE);
988	<	t.join();
989	<	assertTrue(q.size() + l.size() >= SIZE);
990	<	} catch (Exception e) {
991	<	unexpectedException();
992	<	}
993	<	}
750	>	Thread t = new Thread(new CheckedRunnable() {
751	>	public void realRun() {
752	>	q.put(new PDelay(SIZE+1));
753	>	}});
754
755	<	/**
756	<	* drainTo(null, n) throws NPE
757	<	*/
758	<	public void testDrainToNullN() {
759	<	DelayQueue q = populatedQueue(SIZE);
760	<	try {
1001	<	q.drainTo(null, 0);
1002	<	shouldThrow();
1003	<	} catch (NullPointerException success) {
1004	<	}
1005	<	}
1006	<
1007	<	/**
1008	<	* drainTo(this, n) throws IAE
1009	<	*/
1010	<	public void testDrainToSelfN() {
1011	<	DelayQueue q = populatedQueue(SIZE);
1012	<	try {
1013	<	q.drainTo(q, 0);
1014	<	shouldThrow();
1015	<	} catch (IllegalArgumentException success) {
1016	<	}
755	>	t.start();
756	>	ArrayList l = new ArrayList();
757	>	q.drainTo(l);
758	>	assertTrue(l.size() >= SIZE);
759	>	t.join();
760	>	assertTrue(q.size() + l.size() >= SIZE);
761		}
762
763		/**
764	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
764	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
765		*/
766		public void testDrainToN() {
767		for (int i = 0; i < SIZE + 2; ++i) {
768		DelayQueue q = populatedQueue(SIZE);
769		ArrayList l = new ArrayList();
770		q.drainTo(l, i);
771	<	int k = (i < SIZE)? i : SIZE;
772	<	assertEquals(q.size(), SIZE-k);
773	<	assertEquals(l.size(), k);
771	>	int k = (i < SIZE) ? i : SIZE;
772	>	assertEquals(SIZE-k, q.size());
773	>	assertEquals(k, l.size());
774		}
775		}
776
777	<
777	>	/**
778	>	* remove(null), contains(null) always return false
779	>	*/
780	>	public void testNeverContainsNull() {
781	>	Collection<?> q = populatedQueue(SIZE);
782	>	assertFalse(q.contains(null));
783	>	assertFalse(q.remove(null));
784	>	}
785		}

Diff Legend

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