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.8 by dl, Mon Dec 29 19:05:40 2003 UTC vs.
Revision 1.36 by jsr166, Mon Oct 11 04:19:16 2010 UTC

#	Line 2 | Line 2
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
5	<	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	<	* Pat Fisher, Mike Judd.
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
10		import java.util.*;
11	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
12		import java.util.concurrent.*;
13
14		public class DelayQueueTest extends JSR166TestCase {
15		public static void main(String[] args) {
16	<	junit.textui.TestRunner.run (suite());
16	>	junit.textui.TestRunner.run(suite());
17		}
18
19		public static Test suite() {
20	<	return new TestSuite(DelayQueueTest.class);
20	>	return new TestSuite(DelayQueueTest.class);
21		}
22
23		private static final int NOCAP = Integer.MAX_VALUE;
24
25		/**
26		* A delayed implementation for testing.
27	<	* Most  tests use Pseudodelays, where delays are all elapsed
27	>	* Most tests use Pseudodelays, where delays are all elapsed
28		* (so, no blocking solely for delays) but are still ordered
29	<	*/
30	<	static class PDelay implements Delayed {
29	>	*/
30	>	static class PDelay implements Delayed {
31		int pseudodelay;
32		PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
33	<	public int compareTo(Object y) {
33	>	public int compareTo(PDelay y) {
34		int i = pseudodelay;
35	<	int j = ((PDelay)y).pseudodelay;
35	>	int j = y.pseudodelay;
36		if (i < j) return -1;
37		if (i > j) return 1;
38		return 0;
39		}
40
41	<	public int compareTo(PDelay y) {
42	<	int i = pseudodelay;
42	<	int j = ((PDelay)y).pseudodelay;
43	<	if (i < j) return -1;
44	<	if (i > j) return 1;
45	<	return 0;
41	>	public int compareTo(Delayed y) {
42	>	return compareTo((PDelay)y);
43		}
44
45		public boolean equals(Object other) {
46	<	return ((PDelay)other).pseudodelay == pseudodelay;
46	>	return equals((PDelay)other);
47		}
48		public boolean equals(PDelay other) {
49	<	return ((PDelay)other).pseudodelay == pseudodelay;
49	>	return other.pseudodelay == pseudodelay;
50		}
51
52
#	Line 69 | Line 66 | public class DelayQueueTest extends JSR1
66		/**
67		* Delayed implementation that actually delays
68		*/
69	<	static class NanoDelay implements Delayed {
69	>	static class NanoDelay implements Delayed {
70		long trigger;
71	<	NanoDelay(long i) {
71	>	NanoDelay(long i) {
72		trigger = System.nanoTime() + i;
73		}
74	<	public int compareTo(Object y) {
74	>	public int compareTo(NanoDelay y) {
75		long i = trigger;
76	<	long j = ((NanoDelay)y).trigger;
76	>	long j = y.trigger;
77		if (i < j) return -1;
78		if (i > j) return 1;
79		return 0;
80		}
81
82	<	public int compareTo(NanoDelay y) {
83	<	long i = trigger;
87	<	long j = ((NanoDelay)y).trigger;
88	<	if (i < j) return -1;
89	<	if (i > j) return 1;
90	<	return 0;
82	>	public int compareTo(Delayed y) {
83	>	return compareTo((NanoDelay)y);
84		}
85
86		public boolean equals(Object other) {
87	<	return ((NanoDelay)other).trigger == trigger;
87	>	return equals((NanoDelay)other);
88		}
89		public boolean equals(NanoDelay other) {
90	<	return ((NanoDelay)other).trigger == trigger;
90	>	return other.trigger == trigger;
91		}
92
93		public long getDelay(TimeUnit unit) {
#	Line 119 | Line 112 | public class DelayQueueTest extends JSR1
112		private DelayQueue populatedQueue(int n) {
113		DelayQueue q = new DelayQueue();
114		assertTrue(q.isEmpty());
115	<	for(int i = n-1; i >= 0; i-=2)
116	<	assertTrue(q.offer(new PDelay(i)));
117	<	for(int i = (n & 1); i < n; i+=2)
118	<	assertTrue(q.offer(new PDelay(i)));
115	>	for (int i = n-1; i >= 0; i-=2)
116	>	assertTrue(q.offer(new PDelay(i)));
117	>	for (int i = (n & 1); i < n; i+=2)
118	>	assertTrue(q.offer(new PDelay(i)));
119		assertFalse(q.isEmpty());
120		assertEquals(NOCAP, q.remainingCapacity());
121	<	assertEquals(n, q.size());
121	>	assertEquals(n, q.size());
122		return q;
123		}
124	<
124	>
125		/**
126		* A new queue has unbounded capacity
127		*/
#	Line 143 | Line 136 | public class DelayQueueTest extends JSR1
136		try {
137		DelayQueue q = new DelayQueue(null);
138		shouldThrow();
139	<	}
147	<	catch (NullPointerException success) {}
139	>	} catch (NullPointerException success) {}
140		}
141
142		/**
#	Line 155 | Line 147 | public class DelayQueueTest extends JSR1
147		PDelay[] ints = new PDelay[SIZE];
148		DelayQueue q = new DelayQueue(Arrays.asList(ints));
149		shouldThrow();
150	<	}
159	<	catch (NullPointerException success) {}
150	>	} catch (NullPointerException success) {}
151		}
152
153		/**
#	Line 169 | Line 160 | public class DelayQueueTest extends JSR1
160		ints[i] = new PDelay(i);
161		DelayQueue q = new DelayQueue(Arrays.asList(ints));
162		shouldThrow();
163	<	}
173	<	catch (NullPointerException success) {}
163	>	} catch (NullPointerException success) {}
164		}
165
166		/**
167		* Queue contains all elements of collection used to initialize
168		*/
169		public void testConstructor6() {
170	<	try {
171	<	PDelay[] ints = new PDelay[SIZE];
172	<	for (int i = 0; i < SIZE; ++i)
173	<	ints[i] = new PDelay(i);
174	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
175	<	for (int i = 0; i < SIZE; ++i)
186	<	assertEquals(ints[i], q.poll());
187	<	}
188	<	finally {}
170	>	PDelay[] ints = new PDelay[SIZE];
171	>	for (int i = 0; i < SIZE; ++i)
172	>	ints[i] = new PDelay(i);
173	>	DelayQueue q = new DelayQueue(Arrays.asList(ints));
174	>	for (int i = 0; i < SIZE; ++i)
175	>	assertEquals(ints[i], q.poll());
176		}
177
178		/**
#	Line 204 | Line 191 | public class DelayQueueTest extends JSR1
191		}
192
193		/**
194	<	* remainingCapacity does not change when elementa added or removed,
194	>	* remainingCapacity does not change when elements added or removed,
195		* but size does
196		*/
197		public void testRemainingCapacity() {
#	Line 225 | Line 212 | public class DelayQueueTest extends JSR1
212		* offer(null) throws NPE
213		*/
214		public void testOfferNull() {
215	<	try {
215	>	try {
216		DelayQueue q = new DelayQueue();
217		q.offer(null);
218		shouldThrow();
219	<	} catch (NullPointerException success) { }
219	>	} catch (NullPointerException success) {}
220		}
221
222		/**
223		* add(null) throws NPE
224		*/
225		public void testAddNull() {
226	<	try {
226	>	try {
227		DelayQueue q = new DelayQueue();
228		q.add(null);
229		shouldThrow();
230	<	} catch (NullPointerException success) { }
230	>	} catch (NullPointerException success) {}
231		}
232
233		/**
#	Line 271 | Line 258 | public class DelayQueueTest extends JSR1
258		DelayQueue q = new DelayQueue();
259		q.addAll(null);
260		shouldThrow();
261	<	}
275	<	catch (NullPointerException success) {}
261	>	} catch (NullPointerException success) {}
262		}
263
264
#	Line 284 | Line 270 | public class DelayQueueTest extends JSR1
270		DelayQueue q = populatedQueue(SIZE);
271		q.addAll(q);
272		shouldThrow();
273	<	}
288	<	catch (IllegalArgumentException success) {}
273	>	} catch (IllegalArgumentException success) {}
274		}
275
276		/**
#	Line 297 | Line 282 | public class DelayQueueTest extends JSR1
282		PDelay[] ints = new PDelay[SIZE];
283		q.addAll(Arrays.asList(ints));
284		shouldThrow();
285	<	}
301	<	catch (NullPointerException success) {}
285	>	} catch (NullPointerException success) {}
286		}
287	+
288		/**
289		* addAll of a collection with any null elements throws NPE after
290		* possibly adding some elements
#	Line 312 | Line 297 | public class DelayQueueTest extends JSR1
297		ints[i] = new PDelay(i);
298		q.addAll(Arrays.asList(ints));
299		shouldThrow();
300	<	}
316	<	catch (NullPointerException success) {}
300	>	} catch (NullPointerException success) {}
301		}
302
303		/**
304		* Queue contains all elements of successful addAll
305		*/
306		public void testAddAll5() {
307	<	try {
308	<	PDelay[] empty = new PDelay[0];
309	<	PDelay[] ints = new PDelay[SIZE];
310	<	for (int i = SIZE-1; i >= 0; --i)
311	<	ints[i] = new PDelay(i);
312	<	DelayQueue q = new DelayQueue();
313	<	assertFalse(q.addAll(Arrays.asList(empty)));
314	<	assertTrue(q.addAll(Arrays.asList(ints)));
315	<	for (int i = 0; i < SIZE; ++i)
332	<	assertEquals(ints[i], q.poll());
333	<	}
334	<	finally {}
307	>	PDelay[] empty = new PDelay[0];
308	>	PDelay[] ints = new PDelay[SIZE];
309	>	for (int i = SIZE-1; i >= 0; --i)
310	>	ints[i] = new PDelay(i);
311	>	DelayQueue q = new DelayQueue();
312	>	assertFalse(q.addAll(Arrays.asList(empty)));
313	>	assertTrue(q.addAll(Arrays.asList(ints)));
314	>	for (int i = 0; i < SIZE; ++i)
315	>	assertEquals(ints[i], q.poll());
316		}
317
318		/**
319		* put(null) throws NPE
320		*/
321		public void testPutNull() {
322	<	try {
322	>	try {
323		DelayQueue q = new DelayQueue();
324		q.put(null);
325		shouldThrow();
326	<	}
346	<	catch (NullPointerException success){
347	<	}
326	>	} catch (NullPointerException success) {}
327		}
328
329		/**
330		* all elements successfully put are contained
331		*/
332		public void testPut() {
333	<	try {
334	<	DelayQueue q = new DelayQueue();
335	<	for (int i = 0; i < SIZE; ++i) {
336	<	PDelay I = new PDelay(i);
337	<	q.put(I);
359	<	assertTrue(q.contains(I));
360	<	}
361	<	assertEquals(SIZE, q.size());
333	>	DelayQueue q = new DelayQueue();
334	>	for (int i = 0; i < SIZE; ++i) {
335	>	PDelay I = new PDelay(i);
336	>	q.put(I);
337	>	assertTrue(q.contains(I));
338		}
339	<	finally {
364	<	}
339	>	assertEquals(SIZE, q.size());
340		}
341
342		/**
343		* put doesn't block waiting for take
344		*/
345	<	public void testPutWithTake() {
345	>	public void testPutWithTake() throws InterruptedException {
346		final DelayQueue q = new DelayQueue();
347	<	Thread t = new Thread(new Runnable() {
348	<	public void run() {
349	<	int added = 0;
350	<	try {
351	<	q.put(new PDelay(0));
352	<	++added;
353	<	q.put(new PDelay(0));
354	<	++added;
355	<	q.put(new PDelay(0));
356	<	++added;
357	<	q.put(new PDelay(0));
358	<	++added;
359	<	threadAssertTrue(added == 4);
385	<	} finally {
386	<	}
387	<	}
388	<	});
389	<	try {
390	<	t.start();
391	<	Thread.sleep(SHORT_DELAY_MS);
392	<	q.take();
393	<	t.interrupt();
394	<	t.join();
395	<	} catch (Exception e){
396	<	unexpectedException();
397	<	}
347	>	Thread t = new Thread(new CheckedRunnable() {
348	>	public void realRun() {
349	>	q.put(new PDelay(0));
350	>	q.put(new PDelay(0));
351	>	q.put(new PDelay(0));
352	>	q.put(new PDelay(0));
353	>	}});
354	>
355	>	t.start();
356	>	Thread.sleep(SHORT_DELAY_MS);
357	>	q.take();
358	>	t.interrupt();
359	>	t.join();
360		}
361
362		/**
363		* timed offer does not time out
364		*/
365	<	public void testTimedOffer() {
365	>	public void testTimedOffer() throws InterruptedException {
366		final DelayQueue q = new DelayQueue();
367	<	Thread t = new Thread(new Runnable() {
368	<	public void run() {
369	<	try {
370	<	q.put(new PDelay(0));
371	<	q.put(new PDelay(0));
372	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
373	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
374	<	} finally { }
375	<	}
376	<	});
377	<
378	<	try {
417	<	t.start();
418	<	Thread.sleep(SMALL_DELAY_MS);
419	<	t.interrupt();
420	<	t.join();
421	<	} catch (Exception e){
422	<	unexpectedException();
423	<	}
367	>	Thread t = new Thread(new CheckedRunnable() {
368	>	public void realRun() throws InterruptedException {
369	>	q.put(new PDelay(0));
370	>	q.put(new PDelay(0));
371	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
372	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
373	>	}});
374	>
375	>	t.start();
376	>	Thread.sleep(SMALL_DELAY_MS);
377	>	t.interrupt();
378	>	t.join();
379		}
380
381		/**
382		* take retrieves elements in priority order
383		*/
384	<	public void testTake() {
385	<	try {
386	<	DelayQueue q = populatedQueue(SIZE);
387	<	for (int i = 0; i < SIZE; ++i) {
388	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
434	<	}
435	<	} catch (InterruptedException e){
436	<	unexpectedException();
437	<	}
384	>	public void testTake() throws InterruptedException {
385	>	DelayQueue q = populatedQueue(SIZE);
386	>	for (int i = 0; i < SIZE; ++i) {
387	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
388	>	}
389		}
390
391		/**
392		* take blocks interruptibly when empty
393		*/
394	<	public void testTakeFromEmpty() {
394	>	public void testTakeFromEmpty() throws InterruptedException {
395		final DelayQueue q = new DelayQueue();
396	<	Thread t = new Thread(new Runnable() {
397	<	public void run() {
398	<	try {
399	<	q.take();
400	<	threadShouldThrow();
401	<	} catch (InterruptedException success){ }
402	<	}
403	<	});
404	<	try {
454	<	t.start();
455	<	Thread.sleep(SHORT_DELAY_MS);
456	<	t.interrupt();
457	<	t.join();
458	<	} catch (Exception e){
459	<	unexpectedException();
460	<	}
396	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
397	>	public void realRun() throws InterruptedException {
398	>	q.take();
399	>	}};
400	>
401	>	t.start();
402	>	Thread.sleep(SHORT_DELAY_MS);
403	>	t.interrupt();
404	>	t.join();
405		}
406
407		/**
408		* Take removes existing elements until empty, then blocks interruptibly
409		*/
410	<	public void testBlockingTake() {
411	<	Thread t = new Thread(new Runnable() {
412	<	public void run() {
413	<	try {
414	<	DelayQueue q = populatedQueue(SIZE);
415	<	for (int i = 0; i < SIZE; ++i) {
416	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
417	<	}
418	<	q.take();
419	<	threadShouldThrow();
420	<	} catch (InterruptedException success){
421	<	}
422	<	}});
410	>	public void testBlockingTake() throws InterruptedException {
411	>	final DelayQueue q = populatedQueue(SIZE);
412	>	Thread t = new Thread(new CheckedRunnable() {
413	>	public void realRun() throws InterruptedException {
414	>	for (int i = 0; i < SIZE; ++i) {
415	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
416	>	}
417	>	try {
418	>	q.take();
419	>	shouldThrow();
420	>	} catch (InterruptedException success) {}
421	>	}});
422	>
423		t.start();
424	<	try {
425	<	Thread.sleep(SHORT_DELAY_MS);
426	<	t.interrupt();
483	<	t.join();
484	<	}
485	<	catch (InterruptedException ie) {
486	<	unexpectedException();
487	<	}
424	>	Thread.sleep(SHORT_DELAY_MS);
425	>	t.interrupt();
426	>	t.join();
427		}
428
429
#	Line 496 | Line 435 | public class DelayQueueTest extends JSR1
435		for (int i = 0; i < SIZE; ++i) {
436		assertEquals(new PDelay(i), ((PDelay)q.poll()));
437		}
438	<	assertNull(q.poll());
438	>	assertNull(q.poll());
439		}
440
441		/**
442		* timed pool with zero timeout succeeds when non-empty, else times out
443		*/
444	<	public void testTimedPoll0() {
445	<	try {
446	<	DelayQueue q = populatedQueue(SIZE);
447	<	for (int i = 0; i < SIZE; ++i) {
448	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, TimeUnit.MILLISECONDS)));
449	<	}
511	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
512	<	} catch (InterruptedException e){
513	<	unexpectedException();
514	<	}
444	>	public void testTimedPoll0() throws InterruptedException {
445	>	DelayQueue q = populatedQueue(SIZE);
446	>	for (int i = 0; i < SIZE; ++i) {
447	>	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
448	>	}
449	>	assertNull(q.poll(0, MILLISECONDS));
450		}
451
452		/**
453		* timed pool with nonzero timeout succeeds when non-empty, else times out
454		*/
455	<	public void testTimedPoll() {
456	<	try {
457	<	DelayQueue q = populatedQueue(SIZE);
458	<	for (int i = 0; i < SIZE; ++i) {
459	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
460	<	}
526	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
527	<	} catch (InterruptedException e){
528	<	unexpectedException();
529	<	}
455	>	public void testTimedPoll() throws InterruptedException {
456	>	DelayQueue q = populatedQueue(SIZE);
457	>	for (int i = 0; i < SIZE; ++i) {
458	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
459	>	}
460	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
461		}
462
463		/**
464		* Interrupted timed poll throws InterruptedException instead of
465		* returning timeout status
466		*/
467	<	public void testInterruptedTimedPoll() {
468	<	Thread t = new Thread(new Runnable() {
469	<	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.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
474	<	}
475	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
476	<	} catch (InterruptedException success){
477	<	}
478	<	}});
467	>	public void testInterruptedTimedPoll() throws InterruptedException {
468	>	Thread t = new Thread(new CheckedRunnable() {
469	>	public void realRun() throws InterruptedException {
470	>	DelayQueue q = populatedQueue(SIZE);
471	>	for (int i = 0; i < SIZE; ++i) {
472	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
473	>	}
474	>	try {
475	>	q.poll(SMALL_DELAY_MS, MILLISECONDS);
476	>	shouldThrow();
477	>	} catch (InterruptedException success) {}
478	>	}});
479	>
480		t.start();
481	<	try {
482	<	Thread.sleep(SHORT_DELAY_MS);
483	<	t.interrupt();
552	<	t.join();
553	<	}
554	<	catch (InterruptedException ie) {
555	<	unexpectedException();
556	<	}
481	>	Thread.sleep(SHORT_DELAY_MS);
482	>	t.interrupt();
483	>	t.join();
484		}
485
486		/**
487	<	*  timed poll before a delayed offer fails; after offer succeeds;
488	<	*  on interruption throws
487	>	* timed poll before a delayed offer fails; after offer succeeds;
488	>	* on interruption throws
489		*/
490	<	public void testTimedPollWithOffer() {
490	>	public void testTimedPollWithOffer() throws InterruptedException {
491		final DelayQueue q = new DelayQueue();
492	<	Thread t = new Thread(new Runnable() {
493	<	public void run() {
494	<	try {
495	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
496	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
497	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
498	<	threadFail("Should block");
499	<	} catch (InterruptedException success) { }
500	<	}
501	<	});
502	<	try {
503	<	t.start();
504	<	Thread.sleep(SMALL_DELAY_MS);
505	<	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
506	<	t.interrupt();
507	<	t.join();
508	<	} catch (Exception e){
509	<	unexpectedException();
510	<	}
511	<	}
492	>	final PDelay pdelay = new PDelay(0);
493	>	final CheckedBarrier barrier = new CheckedBarrier(2);
494	>	Thread t = new Thread(new CheckedRunnable() {
495	>	public void realRun() throws InterruptedException {
496	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
497	>
498	>	barrier.await();
499	>	assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
500	>
501	>	Thread.currentThread().interrupt();
502	>	try {
503	>	q.poll(SHORT_DELAY_MS, MILLISECONDS);
504	>	shouldThrow();
505	>	} catch (InterruptedException success) {}
506	>
507	>	barrier.await();
508	>	try {
509	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
510	>	shouldThrow();
511	>	} catch (InterruptedException success) {}
512	>	}});
513	>
514	>	t.start();
515	>	barrier.await();
516	>	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
517	>	barrier.await();
518	>	sleep(SHORT_DELAY_MS);
519	>	t.interrupt();
520	>	t.join();
521	>	}
522
523
524		/**
#	Line 591 | Line 528 | public class DelayQueueTest extends JSR1
528		DelayQueue q = populatedQueue(SIZE);
529		for (int i = 0; i < SIZE; ++i) {
530		assertEquals(new PDelay(i), ((PDelay)q.peek()));
531	<	q.poll();
532	<	assertTrue(q.peek() == null ||
533	<	i != ((PDelay)q.peek()).intValue());
531	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
532	>	if (q.isEmpty())
533	>	assertNull(q.peek());
534	>	else
535	>	assertFalse(new PDelay(i).equals(q.peek()));
536		}
537	<	assertNull(q.peek());
537	>	assertNull(q.peek());
538		}
539
540		/**
#	Line 610 | Line 549 | public class DelayQueueTest extends JSR1
549		try {
550		q.element();
551		shouldThrow();
552	<	}
614	<	catch (NoSuchElementException success) {}
552	>	} catch (NoSuchElementException success) {}
553		}
554
555		/**
#	Line 625 | Line 563 | public class DelayQueueTest extends JSR1
563		try {
564		q.remove();
565		shouldThrow();
566	<	} catch (NoSuchElementException success){
629	<	}
566	>	} catch (NoSuchElementException success) {}
567		}
568
569		/**
#	Line 643 | Line 580 | public class DelayQueueTest extends JSR1
580		}
581		assertTrue(q.isEmpty());
582		}
583	<
583	>
584		/**
585		* contains(x) reports true when elements added but not yet removed
586		*/
#	Line 665 | Line 602 | public class DelayQueueTest extends JSR1
602		assertTrue(q.isEmpty());
603		assertEquals(0, q.size());
604		assertEquals(NOCAP, q.remainingCapacity());
605	<	q.add(new PDelay(1));
605	>	PDelay x = new PDelay(1);
606	>	q.add(x);
607		assertFalse(q.isEmpty());
608	+	assertTrue(q.contains(x));
609		q.clear();
610		assertTrue(q.isEmpty());
611		}
#	Line 723 | Line 662 | public class DelayQueueTest extends JSR1
662		/**
663		* toArray contains all elements
664		*/
665	<	public void testToArray() {
665	>	public void testToArray() throws InterruptedException {
666		DelayQueue q = populatedQueue(SIZE);
667	<	Object[] o = q.toArray();
667	>	Object[] o = q.toArray();
668		Arrays.sort(o);
669	<	try {
670	<	for(int i = 0; i < o.length; i++)
732	<	assertEquals(o[i], q.take());
733	<	} catch (InterruptedException e){
734	<	unexpectedException();
735	<	}
669	>	for (int i = 0; i < o.length; i++)
670	>	assertEquals(o[i], q.take());
671		}
672
673		/**
674		* toArray(a) contains all elements
675		*/
676	<	public void testToArray2() {
676	>	public void testToArray2() throws InterruptedException {
677		DelayQueue q = populatedQueue(SIZE);
678	<	PDelay[] ints = new PDelay[SIZE];
679	<	ints = (PDelay[])q.toArray(ints);
678	>	PDelay[] ints = new PDelay[SIZE];
679	>	ints = (PDelay[])q.toArray(ints);
680		Arrays.sort(ints);
681	<	try {
682	<	for(int i = 0; i < ints.length; i++)
748	<	assertEquals(ints[i], q.take());
749	<	} catch (InterruptedException e){
750	<	unexpectedException();
751	<	}
681	>	for (int i = 0; i < ints.length; i++)
682	>	assertEquals(ints[i], q.take());
683		}
684
685
#	Line 756 | Line 687 | public class DelayQueueTest extends JSR1
687		* toArray(null) throws NPE
688		*/
689		public void testToArray_BadArg() {
690	<	try {
691	<	DelayQueue q = populatedQueue(SIZE);
692	<	Object o[] = q.toArray(null);
693	<	shouldThrow();
694	<	} catch(NullPointerException success){}
690	>	DelayQueue q = populatedQueue(SIZE);
691	>	try {
692	>	Object o[] = q.toArray(null);
693	>	shouldThrow();
694	>	} catch (NullPointerException success) {}
695		}
696
697		/**
698		* toArray with incompatible array type throws CCE
699		*/
700		public void testToArray1_BadArg() {
701	<	try {
702	<	DelayQueue q = populatedQueue(SIZE);
703	<	Object o[] = q.toArray(new String[10] );
704	<	shouldThrow();
705	<	} catch(ArrayStoreException  success){}
701	>	DelayQueue q = populatedQueue(SIZE);
702	>	try {
703	>	Object o[] = q.toArray(new String[10]);
704	>	shouldThrow();
705	>	} catch (ArrayStoreException success) {}
706		}
707	<
707	>
708		/**
709		* iterator iterates through all elements
710		*/
711		public void testIterator() {
712		DelayQueue q = populatedQueue(SIZE);
713		int i = 0;
714	<	Iterator it = q.iterator();
715	<	while(it.hasNext()) {
714	>	Iterator it = q.iterator();
715	>	while (it.hasNext()) {
716		assertTrue(q.contains(it.next()));
717		++i;
718		}
#	Line 791 | Line 722 | public class DelayQueueTest extends JSR1
722		/**
723		* iterator.remove removes current element
724		*/
725	<	public void testIteratorRemove () {
725	>	public void testIteratorRemove() {
726		final DelayQueue q = new DelayQueue();
727		q.add(new PDelay(2));
728		q.add(new PDelay(1));
#	Line 815 | Line 746 | public class DelayQueueTest extends JSR1
746		for (int i = 0; i < SIZE; ++i) {
747		assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
748		}
749	<	}
749	>	}
750
751		/**
752		* offer transfers elements across Executor tasks
#	Line 823 | Line 754 | public class DelayQueueTest extends JSR1
754		public void testPollInExecutor() {
755		final DelayQueue q = new DelayQueue();
756		ExecutorService executor = Executors.newFixedThreadPool(2);
757	<	executor.execute(new Runnable() {
758	<	public void run() {
759	<	threadAssertNull(q.poll());
760	<	try {
761	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
762	<	threadAssertTrue(q.isEmpty());
763	<	}
764	<	catch (InterruptedException e) {
765	<	threadUnexpectedException();
766	<	}
767	<	}
768	<	});
757	>	executor.execute(new CheckedRunnable() {
758	>	public void realRun() throws InterruptedException {
759	>	assertNull(q.poll());
760	>	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
761	>	assertTrue(q.isEmpty());
762	>	}});
763	>
764	>	executor.execute(new CheckedRunnable() {
765	>	public void realRun() throws InterruptedException {
766	>	Thread.sleep(SHORT_DELAY_MS);
767	>	q.put(new PDelay(1));
768	>	}});
769
839	–	executor.execute(new Runnable() {
840	–	public void run() {
841	–	try {
842	–	Thread.sleep(SHORT_DELAY_MS);
843	–	q.put(new PDelay(1));
844	–	}
845	–	catch (InterruptedException e) {
846	–	threadUnexpectedException();
847	–	}
848	–	}
849	–	});
770		joinPool(executor);
851	–
771		}
772
773
774		/**
775		* Delayed actions do not occur until their delay elapses
776		*/
777	<	public void testDelay() {
777	>	public void testDelay() throws InterruptedException {
778		DelayQueue q = new DelayQueue();
779		NanoDelay[] elements = new NanoDelay[SIZE];
780		for (int i = 0; i < SIZE; ++i) {
#	Line 865 | Line 784 | public class DelayQueueTest extends JSR1
784		q.add(elements[i]);
785		}
786
787	<	try {
788	<	long last = 0;
789	<	for (int i = 0; i < SIZE; ++i) {
790	<	NanoDelay e = (NanoDelay)(q.take());
791	<	long tt = e.getTriggerTime();
792	<	assertTrue(tt <= System.nanoTime());
793	<	if (i != 0)
794	<	assertTrue(tt >= last);
876	<	last = tt;
877	<	}
878	<	}
879	<	catch(InterruptedException ie) {
880	<	unexpectedException();
787	>	long last = 0;
788	>	for (int i = 0; i < SIZE; ++i) {
789	>	NanoDelay e = (NanoDelay)(q.take());
790	>	long tt = e.getTriggerTime();
791	>	assertTrue(tt - System.nanoTime() <= 0);
792	>	if (i != 0)
793	>	assertTrue(tt >= last);
794	>	last = tt;
795		}
796		}
797
798	+	/**
799	+	* peek of a non-empty queue returns non-null even if not expired
800	+	*/
801	+	public void testPeekDelayed() {
802	+	DelayQueue q = new DelayQueue();
803	+	q.add(new NanoDelay(Long.MAX_VALUE));
804	+	assertNotNull(q.peek());
805	+	}
806	+
807	+
808	+	/**
809	+	* poll of a non-empty queue returns null if no expired elements.
810	+	*/
811	+	public void testPollDelayed() {
812	+	DelayQueue q = new DelayQueue();
813	+	q.add(new NanoDelay(Long.MAX_VALUE));
814	+	assertNull(q.poll());
815	+	}
816	+
817	+	/**
818	+	* timed poll of a non-empty queue returns null if no expired elements.
819	+	*/
820	+	public void testTimedPollDelayed() throws InterruptedException {
821	+	DelayQueue q = new DelayQueue();
822	+	q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
823	+	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
824	+	}
825
826		/**
827		* drainTo(null) throws NPE
828	<	*/
828	>	*/
829		public void testDrainToNull() {
830		DelayQueue q = populatedQueue(SIZE);
831		try {
832		q.drainTo(null);
833		shouldThrow();
834	<	} catch(NullPointerException success) {
894	<	}
834	>	} catch (NullPointerException success) {}
835		}
836
837		/**
838		* drainTo(this) throws IAE
839	<	*/
839	>	*/
840		public void testDrainToSelf() {
841		DelayQueue q = populatedQueue(SIZE);
842		try {
843		q.drainTo(q);
844		shouldThrow();
845	<	} catch(IllegalArgumentException success) {
906	<	}
845	>	} catch (IllegalArgumentException success) {}
846		}
847
848		/**
849		* drainTo(c) empties queue into another collection c
850	<	*/
850	>	*/
851		public void testDrainTo() {
852	<	DelayQueue q = populatedQueue(SIZE);
852	>	DelayQueue q = new DelayQueue();
853	>	PDelay[] elems = new PDelay[SIZE];
854	>	for (int i = 0; i < SIZE; ++i) {
855	>	elems[i] = new PDelay(i);
856	>	q.add(elems[i]);
857	>	}
858		ArrayList l = new ArrayList();
859		q.drainTo(l);
860		assertEquals(q.size(), 0);
861	<	assertEquals(l.size(), SIZE);
861	>	for (int i = 0; i < SIZE; ++i)
862	>	assertEquals(l.get(i), elems[i]);
863	>	q.add(elems[0]);
864	>	q.add(elems[1]);
865	>	assertFalse(q.isEmpty());
866	>	assertTrue(q.contains(elems[0]));
867	>	assertTrue(q.contains(elems[1]));
868	>	l.clear();
869	>	q.drainTo(l);
870	>	assertEquals(q.size(), 0);
871	>	assertEquals(l.size(), 2);
872	>	for (int i = 0; i < 2; ++i)
873	>	assertEquals(l.get(i), elems[i]);
874		}
875
876		/**
877		* drainTo empties queue
878	<	*/
879	<	public void testDrainToWithActivePut() {
878	>	*/
879	>	public void testDrainToWithActivePut() throws InterruptedException {
880		final DelayQueue q = populatedQueue(SIZE);
881	<	Thread t = new Thread(new Runnable() {
882	<	public void run() {
883	<	q.put(new PDelay(SIZE+1));
884	<	}
885	<	});
886	<	try {
887	<	t.start();
888	<	ArrayList l = new ArrayList();
889	<	q.drainTo(l);
890	<	assertTrue(l.size() >= SIZE);
891	<	t.join();
936	<	assertTrue(q.size() + l.size() == SIZE+1);
937	<	} catch(Exception e){
938	<	unexpectedException();
939	<	}
881	>	Thread t = new Thread(new CheckedRunnable() {
882	>	public void realRun() {
883	>	q.put(new PDelay(SIZE+1));
884	>	}});
885	>
886	>	t.start();
887	>	ArrayList l = new ArrayList();
888	>	q.drainTo(l);
889	>	assertTrue(l.size() >= SIZE);
890	>	t.join();
891	>	assertTrue(q.size() + l.size() >= SIZE);
892		}
893
894		/**
895		* drainTo(null, n) throws NPE
896	<	*/
896	>	*/
897		public void testDrainToNullN() {
898		DelayQueue q = populatedQueue(SIZE);
899		try {
900		q.drainTo(null, 0);
901		shouldThrow();
902	<	} catch(NullPointerException success) {
951	<	}
902	>	} catch (NullPointerException success) {}
903		}
904
905		/**
906		* drainTo(this, n) throws IAE
907	<	*/
907	>	*/
908		public void testDrainToSelfN() {
909		DelayQueue q = populatedQueue(SIZE);
910		try {
911		q.drainTo(q, 0);
912		shouldThrow();
913	<	} catch(IllegalArgumentException success) {
963	<	}
913	>	} catch (IllegalArgumentException success) {}
914		}
915
916		/**
917		* drainTo(c, n) empties first max {n, size} elements of queue into c
918	<	*/
918	>	*/
919		public void testDrainToN() {
920		for (int i = 0; i < SIZE + 2; ++i) {
921		DelayQueue q = populatedQueue(SIZE);

Diff Legend

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