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.21 by jsr166, Sat Nov 21 10:29:50 2009 UTC vs.
Revision 1.71 by jsr166, Sat Apr 25 04:55:30 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
48	>	* Most tests use Pseudodelays, where delays are all elapsed
49		* (so, no blocking solely for delays) but are still ordered
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 = ((PDelay)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	<	int i = pseudodelay;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	return 0;
60	>	return compareTo((PDelay)y);
61		}
48	–
62		public boolean equals(Object other) {
63	<	return ((PDelay)other).pseudodelay == pseudodelay;
64	<	}
52	<	public boolean equals(PDelay other) {
53	<	return ((PDelay)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;
59	<	}
60	<	public int intValue() {
61	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
63	–
71		public String toString() {
72		return String.valueOf(pseudodelay);
73		}
74		}
75
69	–
76		/**
77		* Delayed implementation that actually delays
78		*/
#	Line 77 | Line 83 | public class DelayQueueTest extends JSR1
83		}
84		public int compareTo(NanoDelay y) {
85		long i = trigger;
86	<	long j = ((NanoDelay)y).trigger;
86	>	long j = y.trigger;
87		if (i < j) return -1;
88		if (i > j) return 1;
89		return 0;
90		}
91
92		public int compareTo(Delayed y) {
93	<	long i = trigger;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	return 0;
93	>	return compareTo((NanoDelay)y);
94		}
95
96		public boolean equals(Object other) {
97	<	return ((NanoDelay)other).trigger == trigger;
97	>	return equals((NanoDelay)other);
98		}
99		public boolean equals(NanoDelay other) {
100	<	return ((NanoDelay)other).trigger == trigger;
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 112 | Line 117 | public class DelayQueueTest extends JSR1
117		}
118		}
119
115	–
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 134 | 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 142 | 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 153 | Line 157 | public class DelayQueueTest extends JSR1
157		public void testConstructor4() {
158		try {
159		PDelay[] ints = new PDelay[SIZE];
160	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
160	>	new DelayQueue(Arrays.asList(ints));
161		shouldThrow();
162		} catch (NullPointerException success) {}
163		}
#	Line 166 | Line 170 | public class DelayQueueTest extends JSR1
170		PDelay[] ints = new PDelay[SIZE];
171		for (int i = 0; i < SIZE-1; ++i)
172		ints[i] = new PDelay(i);
173	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
173	>	new DelayQueue(Arrays.asList(ints));
174		shouldThrow();
175		} catch (NullPointerException success) {}
176		}
#	Line 189 | Line 193 | public class DelayQueueTest extends JSR1
193		public void testEmpty() {
194		DelayQueue q = new DelayQueue();
195		assertTrue(q.isEmpty());
196	<	assertEquals(NOCAP, q.remainingCapacity());
196	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
197		q.add(new PDelay(1));
198		assertFalse(q.isEmpty());
199		q.add(new PDelay(2));
#	Line 199 | Line 203 | public class DelayQueueTest extends JSR1
203		}
204
205		/**
206	<	* remainingCapacity does not change when elementa added or removed,
203	<	* but size does
206	>	* remainingCapacity() always returns Integer.MAX_VALUE
207		*/
208		public void testRemainingCapacity() {
209	<	DelayQueue q = populatedQueue(SIZE);
209	>	BlockingQueue q = populatedQueue(SIZE);
210		for (int i = 0; i < SIZE; ++i) {
211	<	assertEquals(NOCAP, q.remainingCapacity());
211	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
212		assertEquals(SIZE-i, q.size());
213	<	q.remove();
213	>	assertTrue(q.remove() instanceof PDelay);
214		}
215		for (int i = 0; i < SIZE; ++i) {
216	<	assertEquals(NOCAP, q.remainingCapacity());
216	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
217		assertEquals(i, q.size());
218	<	q.add(new PDelay(i));
218	>	assertTrue(q.add(new PDelay(i)));
219		}
220		}
221
222		/**
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	–	/**
223		* offer non-null succeeds
224		*/
225		public void testOffer() {
#	Line 259 | Line 240 | public class DelayQueueTest extends JSR1
240		}
241
242		/**
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	–	/**
243		* addAll(this) throws IAE
244		*/
245		public void testAddAllSelf() {
#	Line 282 | Line 251 | public class DelayQueueTest extends JSR1
251		}
252
253		/**
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	–	/**
254		* addAll of a collection with any null elements throws NPE after
255		* possibly adding some elements
256		*/
#	Line 323 | Line 281 | public class DelayQueueTest extends JSR1
281		}
282
283		/**
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	–	/**
284		* all elements successfully put are contained
285		*/
286	<	public void testPut() {
287	<	DelayQueue q = new DelayQueue();
288	<	for (int i = 0; i < SIZE; ++i) {
289	<	PDelay I = new PDelay(i);
290	<	q.put(I);
291	<	assertTrue(q.contains(I));
292	<	}
293	<	assertEquals(SIZE, q.size());
286	>	public void testPut() {
287	>	DelayQueue q = new DelayQueue();
288	>	for (int i = 0; i < SIZE; ++i) {
289	>	PDelay x = new PDelay(i);
290	>	q.put(x);
291	>	assertTrue(q.contains(x));
292	>	}
293	>	assertEquals(SIZE, q.size());
294		}
295
296		/**
#	Line 351 | Line 298 | public class DelayQueueTest extends JSR1
298		*/
299		public void testPutWithTake() throws InterruptedException {
300		final DelayQueue q = new DelayQueue();
301	<	Thread t = new Thread(new CheckedRunnable() {
301	>	Thread t = newStartedThread(new CheckedRunnable() {
302		public void realRun() {
303		q.put(new PDelay(0));
304		q.put(new PDelay(0));
#	Line 359 | Line 306 | public class DelayQueueTest extends JSR1
306		q.put(new PDelay(0));
307		}});
308
309	<	t.start();
310	<	Thread.sleep(SHORT_DELAY_MS);
364	<	q.take();
365	<	t.interrupt();
366	<	t.join();
309	>	awaitTermination(t);
310	>	assertEquals(4, q.size());
311		}
312
313		/**
#	Line 371 | Line 315 | public class DelayQueueTest extends JSR1
315		*/
316		public void testTimedOffer() throws InterruptedException {
317		final DelayQueue q = new DelayQueue();
318	<	Thread t = new Thread(new CheckedRunnable() {
318	>	Thread t = newStartedThread(new CheckedRunnable() {
319		public void realRun() throws InterruptedException {
320		q.put(new PDelay(0));
321		q.put(new PDelay(0));
322	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
323	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
322	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
323	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
324		}});
325
326	<	t.start();
383	<	Thread.sleep(SMALL_DELAY_MS);
384	<	t.interrupt();
385	<	t.join();
326	>	awaitTermination(t);
327		}
328
329		/**
#	Line 391 | Line 332 | public class DelayQueueTest extends JSR1
332		public void testTake() throws InterruptedException {
333		DelayQueue q = populatedQueue(SIZE);
334		for (int i = 0; i < SIZE; ++i) {
335	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
335	>	assertEquals(new PDelay(i), q.take());
336		}
337		}
338
339		/**
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	–	/**
340		* Take removes existing elements until empty, then blocks interruptibly
341		*/
342		public void testBlockingTake() throws InterruptedException {
343	<	Thread t = new ThreadShouldThrow(InterruptedException.class) {
343	>	final DelayQueue q = populatedQueue(SIZE);
344	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
345	>	Thread t = newStartedThread(new CheckedRunnable() {
346		public void realRun() throws InterruptedException {
420	–	DelayQueue q = populatedQueue(SIZE);
347		for (int i = 0; i < SIZE; ++i) {
348	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
348	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
349		}
424	–	q.take();
425	–	}};
350
351	<	t.start();
352	<	Thread.sleep(SHORT_DELAY_MS);
351	>	Thread.currentThread().interrupt();
352	>	try {
353	>	q.take();
354	>	shouldThrow();
355	>	} catch (InterruptedException success) {}
356	>	assertFalse(Thread.interrupted());
357	>
358	>	pleaseInterrupt.countDown();
359	>	try {
360	>	q.take();
361	>	shouldThrow();
362	>	} catch (InterruptedException success) {}
363	>	assertFalse(Thread.interrupted());
364	>	}});
365	>
366	>	await(pleaseInterrupt);
367	>	assertThreadStaysAlive(t);
368		t.interrupt();
369	<	t.join();
369	>	awaitTermination(t);
370		}
371
433	–
372		/**
373		* poll succeeds unless empty
374		*/
375		public void testPoll() {
376		DelayQueue q = populatedQueue(SIZE);
377		for (int i = 0; i < SIZE; ++i) {
378	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
378	>	assertEquals(new PDelay(i), q.poll());
379		}
380		assertNull(q.poll());
381		}
382
383		/**
384	<	* timed pool with zero timeout succeeds when non-empty, else times out
384	>	* timed poll with zero timeout succeeds when non-empty, else times out
385		*/
386		public void testTimedPoll0() throws InterruptedException {
387		DelayQueue q = populatedQueue(SIZE);
388		for (int i = 0; i < SIZE; ++i) {
389	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
389	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
390		}
391		assertNull(q.poll(0, MILLISECONDS));
392		}
393
394		/**
395	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
395	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
396		*/
397		public void testTimedPoll() throws InterruptedException {
398		DelayQueue q = populatedQueue(SIZE);
399		for (int i = 0; i < SIZE; ++i) {
400	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
401	<	}
402	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
400	>	long startTime = System.nanoTime();
401	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
402	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
403	>	}
404	>	long startTime = System.nanoTime();
405	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
406	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
407	>	checkEmpty(q);
408		}
409
410		/**
#	Line 469 | Line 412 | public class DelayQueueTest extends JSR1
412		* returning timeout status
413		*/
414		public void testInterruptedTimedPoll() throws InterruptedException {
415	<	Thread t = new Thread(new CheckedRunnable() {
415	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
416	>	Thread t = newStartedThread(new CheckedRunnable() {
417		public void realRun() throws InterruptedException {
418		DelayQueue q = populatedQueue(SIZE);
419		for (int i = 0; i < SIZE; ++i) {
420		assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
421		}
422	+
423	+	Thread.currentThread().interrupt();
424		try {
425		q.poll(LONG_DELAY_MS, MILLISECONDS);
426		shouldThrow();
427		} catch (InterruptedException success) {}
428	<	}});
428	>	assertFalse(Thread.interrupted());
429
430	<	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);
430	>	pleaseInterrupt.countDown();
431		try {
432		q.poll(LONG_DELAY_MS, MILLISECONDS);
433		shouldThrow();
434		} catch (InterruptedException success) {}
435	+	assertFalse(Thread.interrupted());
436		}});
437
438	<	t.start();
439	<	Thread.sleep(SMALL_DELAY_MS);
508	<	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
438	>	await(pleaseInterrupt);
439	>	assertThreadStaysAlive(t);
440		t.interrupt();
441	<	t.join();
441	>	awaitTermination(t);
442		}
443
513	–
444		/**
445		* peek returns next element, or null if empty
446		*/
447		public void testPeek() {
448		DelayQueue q = populatedQueue(SIZE);
449		for (int i = 0; i < SIZE; ++i) {
450	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
451	<	q.poll();
450	>	assertEquals(new PDelay(i), q.peek());
451	>	assertEquals(new PDelay(i), q.poll());
452		if (q.isEmpty())
453		assertNull(q.peek());
454		else
455	<	assertTrue(i != ((PDelay)q.peek()).intValue());
455	>	assertFalse(new PDelay(i).equals(q.peek()));
456		}
457		assertNull(q.peek());
458		}
#	Line 533 | Line 463 | public class DelayQueueTest extends JSR1
463		public void testElement() {
464		DelayQueue q = populatedQueue(SIZE);
465		for (int i = 0; i < SIZE; ++i) {
466	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
466	>	assertEquals(new PDelay(i), q.element());
467		q.poll();
468		}
469		try {
#	Line 548 | Line 478 | public class DelayQueueTest extends JSR1
478		public void testRemove() {
479		DelayQueue q = populatedQueue(SIZE);
480		for (int i = 0; i < SIZE; ++i) {
481	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
481	>	assertEquals(new PDelay(i), q.remove());
482		}
483		try {
484		q.remove();
#	Line 557 | Line 487 | public class DelayQueueTest extends JSR1
487		}
488
489		/**
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	–	/**
490		* contains(x) reports true when elements added but not yet removed
491		*/
492		public void testContains() {
#	Line 591 | Line 506 | public class DelayQueueTest extends JSR1
506		q.clear();
507		assertTrue(q.isEmpty());
508		assertEquals(0, q.size());
509	<	assertEquals(NOCAP, q.remainingCapacity());
509	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
510		PDelay x = new PDelay(1);
511		q.add(x);
512		assertFalse(q.isEmpty());
#	Line 643 | Line 558 | public class DelayQueueTest extends JSR1
558		assertTrue(q.removeAll(p));
559		assertEquals(SIZE-i, q.size());
560		for (int j = 0; j < i; ++j) {
561	<	PDelay I = (PDelay)(p.remove());
562	<	assertFalse(q.contains(I));
561	>	PDelay x = (PDelay)(p.remove());
562	>	assertFalse(q.contains(x));
563		}
564		}
565		}
#	Line 657 | Line 572 | public class DelayQueueTest extends JSR1
572		Object[] o = q.toArray();
573		Arrays.sort(o);
574		for (int i = 0; i < o.length; i++)
575	<	assertEquals(o[i], q.take());
575	>	assertSame(o[i], q.take());
576		}
577
578		/**
579		* toArray(a) contains all elements
580		*/
581	<	public void testToArray2() throws InterruptedException {
582	<	DelayQueue q = populatedQueue(SIZE);
581	>	public void testToArray2() {
582	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
583		PDelay[] ints = new PDelay[SIZE];
584	<	ints = (PDelay[])q.toArray(ints);
584	>	PDelay[] array = q.toArray(ints);
585	>	assertSame(ints, array);
586		Arrays.sort(ints);
587		for (int i = 0; i < ints.length; i++)
588	<	assertEquals(ints[i], q.take());
588	>	assertSame(ints[i], q.remove());
589		}
590
675	–
591		/**
592	<	* 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) {}
685	<	}
686	<
687	<	/**
688	<	* toArray with incompatible array type throws CCE
592	>	* toArray(incompatible array type) throws ArrayStoreException
593		*/
594		public void testToArray1_BadArg() {
595	+	DelayQueue q = populatedQueue(SIZE);
596		try {
597	<	DelayQueue q = populatedQueue(SIZE);
693	<	Object o[] = q.toArray(new String[10] );
597	>	q.toArray(new String[10]);
598		shouldThrow();
599		} catch (ArrayStoreException success) {}
600		}
#	Line 707 | Line 611 | public class DelayQueueTest extends JSR1
611		++i;
612		}
613		assertEquals(i, SIZE);
614	+	assertIteratorExhausted(it);
615	+	}
616	+
617	+	/**
618	+	* iterator of empty collection has no elements
619	+	*/
620	+	public void testEmptyIterator() {
621	+	assertIteratorExhausted(new DelayQueue().iterator());
622		}
623
624		/**
625		* iterator.remove removes current element
626		*/
627	<	public void testIteratorRemove () {
627	>	public void testIteratorRemove() {
628		final DelayQueue q = new DelayQueue();
629		q.add(new PDelay(2));
630		q.add(new PDelay(1));
#	Line 721 | Line 633 | public class DelayQueueTest extends JSR1
633		it.next();
634		it.remove();
635		it = q.iterator();
636	<	assertEquals(it.next(), new PDelay(2));
637	<	assertEquals(it.next(), new PDelay(3));
636	>	assertEquals(new PDelay(2), it.next());
637	>	assertEquals(new PDelay(3), it.next());
638		assertFalse(it.hasNext());
639		}
640
729	–
641		/**
642		* toString contains toStrings of elements
643		*/
644		public void testToString() {
645		DelayQueue q = populatedQueue(SIZE);
646		String s = q.toString();
647	<	for (int i = 0; i < SIZE; ++i) {
648	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
738	<	}
647	>	for (Object e : q)
648	>	assertTrue(s.contains(e.toString()));
649		}
650
651		/**
652	<	* offer transfers elements across Executor tasks
652	>	* timed poll transfers elements across Executor tasks
653		*/
654		public void testPollInExecutor() {
655		final DelayQueue q = new DelayQueue();
656	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
657		ExecutorService executor = Executors.newFixedThreadPool(2);
658		executor.execute(new CheckedRunnable() {
659		public void realRun() throws InterruptedException {
660	<	threadAssertNull(q.poll());
661	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
662	<	threadAssertTrue(q.isEmpty());
660	>	assertNull(q.poll());
661	>	threadsStarted.await();
662	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
663	>	checkEmpty(q);
664		}});
665
666		executor.execute(new CheckedRunnable() {
667		public void realRun() throws InterruptedException {
668	<	Thread.sleep(SHORT_DELAY_MS);
668	>	threadsStarted.await();
669		q.put(new PDelay(1));
670		}});
671
672		joinPool(executor);
761	–
673		}
674
764	–
675		/**
676		* Delayed actions do not occur until their delay elapses
677		*/
678		public void testDelay() throws InterruptedException {
679	<	DelayQueue q = new DelayQueue();
680	<	NanoDelay[] elements = new NanoDelay[SIZE];
681	<	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	<	}
679	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
680	>	for (int i = 0; i < SIZE; ++i)
681	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
682
683		long last = 0;
684		for (int i = 0; i < SIZE; ++i) {
685	<	NanoDelay e = (NanoDelay)(q.take());
685	>	NanoDelay e = q.take();
686		long tt = e.getTriggerTime();
687	<	assertTrue(tt <= System.nanoTime());
687	>	assertTrue(System.nanoTime() - tt >= 0);
688		if (i != 0)
689		assertTrue(tt >= last);
690		last = tt;
691		}
692	+	assertTrue(q.isEmpty());
693		}
694
695		/**
#	Line 792 | Line 698 | public class DelayQueueTest extends JSR1
698		public void testPeekDelayed() {
699		DelayQueue q = new DelayQueue();
700		q.add(new NanoDelay(Long.MAX_VALUE));
701	<	assert(q.peek() != null);
701	>	assertNotNull(q.peek());
702		}
703
798	–
704		/**
705		* poll of a non-empty queue returns null if no expired elements.
706		*/
#	Line 811 | Line 716 | public class DelayQueueTest extends JSR1
716		public void testTimedPollDelayed() throws InterruptedException {
717		DelayQueue q = new DelayQueue();
718		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
719	<	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) {}
719	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
720		}
721
722		/**
#	Line 848 | Line 731 | public class DelayQueueTest extends JSR1
731		}
732		ArrayList l = new ArrayList();
733		q.drainTo(l);
734	<	assertEquals(q.size(), 0);
734	>	assertEquals(0, q.size());
735		for (int i = 0; i < SIZE; ++i)
736	<	assertEquals(l.get(i), elems[i]);
736	>	assertEquals(elems[i], l.get(i));
737		q.add(elems[0]);
738		q.add(elems[1]);
739		assertFalse(q.isEmpty());
#	Line 858 | Line 741 | public class DelayQueueTest extends JSR1
741		assertTrue(q.contains(elems[1]));
742		l.clear();
743		q.drainTo(l);
744	<	assertEquals(q.size(), 0);
745	<	assertEquals(l.size(), 2);
744	>	assertEquals(0, q.size());
745	>	assertEquals(2, l.size());
746		for (int i = 0; i < 2; ++i)
747	<	assertEquals(l.get(i), elems[i]);
747	>	assertEquals(elems[i], l.get(i));
748		}
749
750		/**
#	Line 883 | Line 766 | public class DelayQueueTest extends JSR1
766		}
767
768		/**
769	<	* 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
769	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
770		*/
771		public void testDrainToN() {
772		for (int i = 0; i < SIZE + 2; ++i) {
773		DelayQueue q = populatedQueue(SIZE);
774		ArrayList l = new ArrayList();
775		q.drainTo(l, i);
776	<	int k = (i < SIZE)? i : SIZE;
777	<	assertEquals(q.size(), SIZE-k);
778	<	assertEquals(l.size(), k);
776	>	int k = (i < SIZE) ? i : SIZE;
777	>	assertEquals(SIZE-k, q.size());
778	>	assertEquals(k, l.size());
779		}
780		}
781
782	<
782	>	/**
783	>	* remove(null), contains(null) always return false
784	>	*/
785	>	public void testNeverContainsNull() {
786	>	Collection<?> q = populatedQueue(SIZE);
787	>	assertFalse(q.contains(null));
788	>	assertFalse(q.remove(null));
789	>	}
790		}

Diff Legend

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