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.11 by dl, Sun Oct 31 14:55:14 2004 UTC vs.
Revision 1.46 by jsr166, Thu Nov 18 18:49:18 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(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(Delayed 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;
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(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(Delayed 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;
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 116 | Line 109 | public class DelayQueueTest extends JSR1
109		* Create a queue of given size containing consecutive
110		* PDelays 0 ... n.
111		*/
112	<	private DelayQueue populatedQueue(int n) {
113	<	DelayQueue q = new DelayQueue();
112	>	private DelayQueue<PDelay> populatedQueue(int n) {
113	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
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() {
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 {
405	<	t.start();
406	<	Thread.sleep(SHORT_DELAY_MS);
407	<	t.interrupt();
408	<	t.join();
409	<	} catch (Exception e){
410	<	unexpectedException();
411	<	}
394	>	public void testTakeFromEmptyBlocksInterruptibly()
395	>	throws InterruptedException {
396	>	final BlockingQueue q = new DelayQueue();
397	>	final CountDownLatch threadStarted = new CountDownLatch(1);
398	>	Thread t = newStartedThread(new CheckedRunnable() {
399	>	public void realRun() {
400	>	long t0 = System.nanoTime();
401	>	threadStarted.countDown();
402	>	try {
403	>	q.take();
404	>	shouldThrow();
405	>	} catch (InterruptedException success) {}
406	>	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
407	>	}});
408	>	threadStarted.await();
409	>	Thread.sleep(SHORT_DELAY_MS);
410	>	assertTrue(t.isAlive());
411	>	t.interrupt();
412	>	awaitTermination(t, MEDIUM_DELAY_MS);
413	>	assertFalse(t.isAlive());
414		}
415
416		/**
417		* Take removes existing elements until empty, then blocks interruptibly
418		*/
419	<	public void testBlockingTake() {
420	<	Thread t = new Thread(new Runnable() {
421	<	public void run() {
422	<	try {
423	<	DelayQueue q = populatedQueue(SIZE);
424	<	for (int i = 0; i < SIZE; ++i) {
425	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
426	<	}
427	<	q.take();
428	<	threadShouldThrow();
429	<	} catch (InterruptedException success){
430	<	}
431	<	}});
419	>	public void testBlockingTake() throws InterruptedException {
420	>	final DelayQueue q = populatedQueue(SIZE);
421	>	Thread t = new Thread(new CheckedRunnable() {
422	>	public void realRun() throws InterruptedException {
423	>	for (int i = 0; i < SIZE; ++i) {
424	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
425	>	}
426	>	try {
427	>	q.take();
428	>	shouldThrow();
429	>	} catch (InterruptedException success) {}
430	>	}});
431	>
432		t.start();
433	<	try {
434	<	Thread.sleep(SHORT_DELAY_MS);
435	<	t.interrupt();
483	<	t.join();
484	<	}
485	<	catch (InterruptedException ie) {
486	<	unexpectedException();
487	<	}
433	>	Thread.sleep(SHORT_DELAY_MS);
434	>	t.interrupt();
435	>	t.join();
436		}
437
438
#	Line 496 | Line 444 | public class DelayQueueTest extends JSR1
444		for (int i = 0; i < SIZE; ++i) {
445		assertEquals(new PDelay(i), ((PDelay)q.poll()));
446		}
447	<	assertNull(q.poll());
447	>	assertNull(q.poll());
448		}
449
450		/**
451	<	* timed pool with zero timeout succeeds when non-empty, else times out
451	>	* timed poll with zero timeout succeeds when non-empty, else times out
452		*/
453	<	public void testTimedPoll0() {
454	<	try {
455	<	DelayQueue q = populatedQueue(SIZE);
456	<	for (int i = 0; i < SIZE; ++i) {
457	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, TimeUnit.MILLISECONDS)));
458	<	}
511	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
512	<	} catch (InterruptedException e){
513	<	unexpectedException();
514	<	}
453	>	public void testTimedPoll0() throws InterruptedException {
454	>	DelayQueue q = populatedQueue(SIZE);
455	>	for (int i = 0; i < SIZE; ++i) {
456	>	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
457	>	}
458	>	assertNull(q.poll(0, MILLISECONDS));
459		}
460
461		/**
462	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
462	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
463		*/
464	<	public void testTimedPoll() {
465	<	try {
466	<	DelayQueue q = populatedQueue(SIZE);
467	<	for (int i = 0; i < SIZE; ++i) {
468	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
469	<	}
526	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
527	<	} catch (InterruptedException e){
528	<	unexpectedException();
529	<	}
464	>	public void testTimedPoll() throws InterruptedException {
465	>	DelayQueue q = populatedQueue(SIZE);
466	>	for (int i = 0; i < SIZE; ++i) {
467	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
468	>	}
469	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
470		}
471
472		/**
473		* Interrupted timed poll throws InterruptedException instead of
474		* returning timeout status
475		*/
476	<	public void testInterruptedTimedPoll() {
477	<	Thread t = new Thread(new Runnable() {
478	<	public void run() {
479	<	try {
480	<	DelayQueue q = populatedQueue(SIZE);
481	<	for (int i = 0; i < SIZE; ++i) {
482	<	threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
483	<	}
484	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
485	<	} catch (InterruptedException success){
486	<	}
487	<	}});
476	>	public void testInterruptedTimedPoll() throws InterruptedException {
477	>	Thread t = new Thread(new CheckedRunnable() {
478	>	public void realRun() throws InterruptedException {
479	>	DelayQueue q = populatedQueue(SIZE);
480	>	for (int i = 0; i < SIZE; ++i) {
481	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
482	>	}
483	>	try {
484	>	q.poll(SMALL_DELAY_MS, MILLISECONDS);
485	>	shouldThrow();
486	>	} catch (InterruptedException success) {}
487	>	}});
488	>
489		t.start();
490	<	try {
491	<	Thread.sleep(SHORT_DELAY_MS);
492	<	t.interrupt();
552	<	t.join();
553	<	}
554	<	catch (InterruptedException ie) {
555	<	unexpectedException();
556	<	}
490	>	Thread.sleep(SHORT_DELAY_MS);
491	>	t.interrupt();
492	>	t.join();
493		}
494
495		/**
496	<	*  timed poll before a delayed offer fails; after offer succeeds;
497	<	*  on interruption throws
496	>	* timed poll before a delayed offer fails; after offer succeeds;
497	>	* on interruption throws
498		*/
499	<	public void testTimedPollWithOffer() {
499	>	public void testTimedPollWithOffer() throws InterruptedException {
500		final DelayQueue q = new DelayQueue();
501	<	Thread t = new Thread(new Runnable() {
502	<	public void run() {
503	<	try {
504	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
505	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
506	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
507	<	threadFail("Should block");
508	<	} catch (InterruptedException success) { }
509	<	}
510	<	});
511	<	try {
512	<	t.start();
513	<	Thread.sleep(SMALL_DELAY_MS);
514	<	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
515	<	t.interrupt();
516	<	t.join();
517	<	} catch (Exception e){
518	<	unexpectedException();
519	<	}
520	<	}
501	>	final PDelay pdelay = new PDelay(0);
502	>	final CheckedBarrier barrier = new CheckedBarrier(2);
503	>	Thread t = new Thread(new CheckedRunnable() {
504	>	public void realRun() throws InterruptedException {
505	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
506	>
507	>	barrier.await();
508	>	assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
509	>
510	>	Thread.currentThread().interrupt();
511	>	try {
512	>	q.poll(SHORT_DELAY_MS, MILLISECONDS);
513	>	shouldThrow();
514	>	} catch (InterruptedException success) {}
515	>
516	>	barrier.await();
517	>	try {
518	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
519	>	shouldThrow();
520	>	} catch (InterruptedException success) {}
521	>	}});
522	>
523	>	t.start();
524	>	barrier.await();
525	>	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
526	>	barrier.await();
527	>	sleep(SHORT_DELAY_MS);
528	>	t.interrupt();
529	>	t.join();
530	>	}
531
532
533		/**
#	Line 591 | Line 537 | public class DelayQueueTest extends JSR1
537		DelayQueue q = populatedQueue(SIZE);
538		for (int i = 0; i < SIZE; ++i) {
539		assertEquals(new PDelay(i), ((PDelay)q.peek()));
540	<	q.poll();
541	<	assertTrue(q.peek() == null ||
542	<	i != ((PDelay)q.peek()).intValue());
540	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
541	>	if (q.isEmpty())
542	>	assertNull(q.peek());
543	>	else
544	>	assertFalse(new PDelay(i).equals(q.peek()));
545		}
546	<	assertNull(q.peek());
546	>	assertNull(q.peek());
547		}
548
549		/**
#	Line 610 | Line 558 | public class DelayQueueTest extends JSR1
558		try {
559		q.element();
560		shouldThrow();
561	<	}
614	<	catch (NoSuchElementException success) {}
561	>	} catch (NoSuchElementException success) {}
562		}
563
564		/**
#	Line 625 | Line 572 | public class DelayQueueTest extends JSR1
572		try {
573		q.remove();
574		shouldThrow();
575	<	} catch (NoSuchElementException success){
629	<	}
575	>	} catch (NoSuchElementException success) {}
576		}
577
578		/**
#	Line 643 | Line 589 | public class DelayQueueTest extends JSR1
589		}
590		assertTrue(q.isEmpty());
591		}
592	<
592	>
593		/**
594		* contains(x) reports true when elements added but not yet removed
595		*/
#	Line 725 | Line 671 | public class DelayQueueTest extends JSR1
671		/**
672		* toArray contains all elements
673		*/
674	<	public void testToArray() {
674	>	public void testToArray() throws InterruptedException {
675		DelayQueue q = populatedQueue(SIZE);
676	<	Object[] o = q.toArray();
676	>	Object[] o = q.toArray();
677		Arrays.sort(o);
678	<	try {
679	<	for(int i = 0; i < o.length; i++)
734	<	assertEquals(o[i], q.take());
735	<	} catch (InterruptedException e){
736	<	unexpectedException();
737	<	}
678	>	for (int i = 0; i < o.length; i++)
679	>	assertSame(o[i], q.take());
680		}
681
682		/**
683		* toArray(a) contains all elements
684		*/
685		public void testToArray2() {
686	<	DelayQueue q = populatedQueue(SIZE);
687	<	PDelay[] ints = new PDelay[SIZE];
688	<	ints = (PDelay[])q.toArray(ints);
686	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
687	>	PDelay[] ints = new PDelay[SIZE];
688	>	PDelay[] array = q.toArray(ints);
689	>	assertSame(ints, array);
690		Arrays.sort(ints);
691	<	try {
692	<	for(int i = 0; i < ints.length; i++)
750	<	assertEquals(ints[i], q.take());
751	<	} catch (InterruptedException e){
752	<	unexpectedException();
753	<	}
691	>	for (int i = 0; i < ints.length; i++)
692	>	assertSame(ints[i], q.remove());
693		}
694
695
696		/**
697	<	* toArray(null) throws NPE
697	>	* toArray(null) throws NullPointerException
698		*/
699	<	public void testToArray_BadArg() {
700	<	try {
701	<	DelayQueue q = populatedQueue(SIZE);
702	<	Object o[] = q.toArray(null);
703	<	shouldThrow();
704	<	} catch(NullPointerException success){}
699	>	public void testToArray_NullArg() {
700	>	DelayQueue q = populatedQueue(SIZE);
701	>	try {
702	>	q.toArray(null);
703	>	shouldThrow();
704	>	} catch (NullPointerException success) {}
705		}
706
707		/**
708	<	* toArray with incompatible array type throws CCE
708	>	* toArray(incompatible array type) throws ArrayStoreException
709		*/
710		public void testToArray1_BadArg() {
711	<	try {
712	<	DelayQueue q = populatedQueue(SIZE);
713	<	Object o[] = q.toArray(new String[10] );
714	<	shouldThrow();
715	<	} catch(ArrayStoreException  success){}
711	>	DelayQueue q = populatedQueue(SIZE);
712	>	try {
713	>	q.toArray(new String[10]);
714	>	shouldThrow();
715	>	} catch (ArrayStoreException success) {}
716		}
717	<
717	>
718		/**
719		* iterator iterates through all elements
720		*/
721		public void testIterator() {
722		DelayQueue q = populatedQueue(SIZE);
723		int i = 0;
724	<	Iterator it = q.iterator();
725	<	while(it.hasNext()) {
724	>	Iterator it = q.iterator();
725	>	while (it.hasNext()) {
726		assertTrue(q.contains(it.next()));
727		++i;
728		}
#	Line 793 | Line 732 | public class DelayQueueTest extends JSR1
732		/**
733		* iterator.remove removes current element
734		*/
735	<	public void testIteratorRemove () {
735	>	public void testIteratorRemove() {
736		final DelayQueue q = new DelayQueue();
737		q.add(new PDelay(2));
738		q.add(new PDelay(1));
#	Line 817 | Line 756 | public class DelayQueueTest extends JSR1
756		for (int i = 0; i < SIZE; ++i) {
757		assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
758		}
759	<	}
759	>	}
760
761		/**
762		* offer transfers elements across Executor tasks
#	Line 825 | Line 764 | public class DelayQueueTest extends JSR1
764		public void testPollInExecutor() {
765		final DelayQueue q = new DelayQueue();
766		ExecutorService executor = Executors.newFixedThreadPool(2);
767	<	executor.execute(new Runnable() {
768	<	public void run() {
769	<	threadAssertNull(q.poll());
770	<	try {
771	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
772	<	threadAssertTrue(q.isEmpty());
773	<	}
774	<	catch (InterruptedException e) {
775	<	threadUnexpectedException();
776	<	}
777	<	}
778	<	});
767	>	executor.execute(new CheckedRunnable() {
768	>	public void realRun() throws InterruptedException {
769	>	assertNull(q.poll());
770	>	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
771	>	assertTrue(q.isEmpty());
772	>	}});
773	>
774	>	executor.execute(new CheckedRunnable() {
775	>	public void realRun() throws InterruptedException {
776	>	Thread.sleep(SHORT_DELAY_MS);
777	>	q.put(new PDelay(1));
778	>	}});
779
841	–	executor.execute(new Runnable() {
842	–	public void run() {
843	–	try {
844	–	Thread.sleep(SHORT_DELAY_MS);
845	–	q.put(new PDelay(1));
846	–	}
847	–	catch (InterruptedException e) {
848	–	threadUnexpectedException();
849	–	}
850	–	}
851	–	});
780		joinPool(executor);
853	–
781		}
782
783
784		/**
785		* Delayed actions do not occur until their delay elapses
786		*/
787	<	public void testDelay() {
788	<	DelayQueue q = new DelayQueue();
789	<	NanoDelay[] elements = new NanoDelay[SIZE];
790	<	for (int i = 0; i < SIZE; ++i) {
791	<	elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
792	<	}
793	<	for (int i = 0; i < SIZE; ++i) {
794	<	q.add(elements[i]);
787	>	public void testDelay() throws InterruptedException {
788	>	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
789	>	for (int i = 0; i < SIZE; ++i)
790	>	q.add(new NanoDelay(1000000L * (SIZE - i)));
791	>
792	>	long last = 0;
793	>	for (int i = 0; i < SIZE; ++i) {
794	>	NanoDelay e = q.take();
795	>	long tt = e.getTriggerTime();
796	>	assertTrue(System.nanoTime() - tt >= 0);
797	>	if (i != 0)
798	>	assertTrue(tt >= last);
799	>	last = tt;
800		}
801	+	assertTrue(q.isEmpty());
802	+	}
803
804	<	try {
805	<	long last = 0;
806	<	for (int i = 0; i < SIZE; ++i) {
807	<	NanoDelay e = (NanoDelay)(q.take());
808	<	long tt = e.getTriggerTime();
809	<	assertTrue(tt <= System.nanoTime());
810	<	if (i != 0)
877	<	assertTrue(tt >= last);
878	<	last = tt;
879	<	}
880	<	}
881	<	catch(InterruptedException ie) {
882	<	unexpectedException();
883	<	}
804	>	/**
805	>	* peek of a non-empty queue returns non-null even if not expired
806	>	*/
807	>	public void testPeekDelayed() {
808	>	DelayQueue q = new DelayQueue();
809	>	q.add(new NanoDelay(Long.MAX_VALUE));
810	>	assertNotNull(q.peek());
811		}
812
813
814		/**
815	+	* poll of a non-empty queue returns null if no expired elements.
816	+	*/
817	+	public void testPollDelayed() {
818	+	DelayQueue q = new DelayQueue();
819	+	q.add(new NanoDelay(Long.MAX_VALUE));
820	+	assertNull(q.poll());
821	+	}
822	+
823	+	/**
824	+	* timed poll of a non-empty queue returns null if no expired elements.
825	+	*/
826	+	public void testTimedPollDelayed() throws InterruptedException {
827	+	DelayQueue q = new DelayQueue();
828	+	q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
829	+	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
830	+	}
831	+
832	+	/**
833		* drainTo(null) throws NPE
834	<	*/
834	>	*/
835		public void testDrainToNull() {
836		DelayQueue q = populatedQueue(SIZE);
837		try {
838		q.drainTo(null);
839		shouldThrow();
840	<	} catch(NullPointerException success) {
896	<	}
840	>	} catch (NullPointerException success) {}
841		}
842
843		/**
844		* drainTo(this) throws IAE
845	<	*/
845	>	*/
846		public void testDrainToSelf() {
847		DelayQueue q = populatedQueue(SIZE);
848		try {
849		q.drainTo(q);
850		shouldThrow();
851	<	} catch(IllegalArgumentException success) {
908	<	}
851	>	} catch (IllegalArgumentException success) {}
852		}
853
854		/**
855		* drainTo(c) empties queue into another collection c
856	<	*/
856	>	*/
857		public void testDrainTo() {
858		DelayQueue q = new DelayQueue();
859		PDelay[] elems = new PDelay[SIZE];
#	Line 921 | Line 864 | public class DelayQueueTest extends JSR1
864		ArrayList l = new ArrayList();
865		q.drainTo(l);
866		assertEquals(q.size(), 0);
867	<	for (int i = 0; i < SIZE; ++i)
867	>	for (int i = 0; i < SIZE; ++i)
868		assertEquals(l.get(i), elems[i]);
869		q.add(elems[0]);
870		q.add(elems[1]);
#	Line 932 | Line 875 | public class DelayQueueTest extends JSR1
875		q.drainTo(l);
876		assertEquals(q.size(), 0);
877		assertEquals(l.size(), 2);
878	<	for (int i = 0; i < 2; ++i)
878	>	for (int i = 0; i < 2; ++i)
879		assertEquals(l.get(i), elems[i]);
880		}
881
882		/**
883		* drainTo empties queue
884	<	*/
885	<	public void testDrainToWithActivePut() {
884	>	*/
885	>	public void testDrainToWithActivePut() throws InterruptedException {
886		final DelayQueue q = populatedQueue(SIZE);
887	<	Thread t = new Thread(new Runnable() {
888	<	public void run() {
889	<	q.put(new PDelay(SIZE+1));
890	<	}
891	<	});
892	<	try {
893	<	t.start();
894	<	ArrayList l = new ArrayList();
895	<	q.drainTo(l);
896	<	assertTrue(l.size() >= SIZE);
897	<	t.join();
955	<	assertTrue(q.size() + l.size() >= SIZE);
956	<	} catch(Exception e){
957	<	unexpectedException();
958	<	}
887	>	Thread t = new Thread(new CheckedRunnable() {
888	>	public void realRun() {
889	>	q.put(new PDelay(SIZE+1));
890	>	}});
891	>
892	>	t.start();
893	>	ArrayList l = new ArrayList();
894	>	q.drainTo(l);
895	>	assertTrue(l.size() >= SIZE);
896	>	t.join();
897	>	assertTrue(q.size() + l.size() >= SIZE);
898		}
899
900		/**
901		* drainTo(null, n) throws NPE
902	<	*/
902	>	*/
903		public void testDrainToNullN() {
904		DelayQueue q = populatedQueue(SIZE);
905		try {
906		q.drainTo(null, 0);
907		shouldThrow();
908	<	} catch(NullPointerException success) {
970	<	}
908	>	} catch (NullPointerException success) {}
909		}
910
911		/**
912		* drainTo(this, n) throws IAE
913	<	*/
913	>	*/
914		public void testDrainToSelfN() {
915		DelayQueue q = populatedQueue(SIZE);
916		try {
917		q.drainTo(q, 0);
918		shouldThrow();
919	<	} catch(IllegalArgumentException success) {
982	<	}
919	>	} catch (IllegalArgumentException success) {}
920		}
921
922		/**
923	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
924	<	*/
923	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
924	>	*/
925		public void testDrainToN() {
926		for (int i = 0; i < SIZE + 2; ++i) {
927		DelayQueue q = populatedQueue(SIZE);
928		ArrayList l = new ArrayList();
929		q.drainTo(l, i);
930	<	int k = (i < SIZE)? i : SIZE;
930	>	int k = (i < SIZE) ? i : SIZE;
931		assertEquals(q.size(), SIZE-k);
932		assertEquals(l.size(), k);
933		}

Diff Legend

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