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.6 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.29 by jsr166, Tue Dec 1 09:48:12 2009 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by members of JCP JSR-166 Expert Group and released to the
3	<	* public domain. Use, modify, and redistribute this code in any way
4	<	* without acknowledgement. Other contributors include Andrew Wright,
5	<	* Jeffrey Hayes, Pat Fischer, Mike Judd.
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.
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 implmentation for testing.
27	<	* Most  tests use Pseudodelays, where delays are all elapsed
26	>	* A delayed implementation for testing.
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;
41	<	int j = ((PDelay)y).pseudodelay;
42	<	if (i < j) return -1;
43	<	if (i > j) return 1;
44	<	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 68 | 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;
86	<	long j = ((NanoDelay)y).trigger;
87	<	if (i < j) return -1;
88	<	if (i > j) return 1;
89	<	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 118 | 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 142 | Line 136 | public class DelayQueueTest extends JSR1
136		try {
137		DelayQueue q = new DelayQueue(null);
138		shouldThrow();
139	<	}
146	<	catch (NullPointerException success) {}
139	>	} catch (NullPointerException success) {}
140		}
141
142		/**
#	Line 154 | Line 147 | public class DelayQueueTest extends JSR1
147		PDelay[] ints = new PDelay[SIZE];
148		DelayQueue q = new DelayQueue(Arrays.asList(ints));
149		shouldThrow();
150	<	}
158	<	catch (NullPointerException success) {}
150	>	} catch (NullPointerException success) {}
151		}
152
153		/**
#	Line 168 | Line 160 | public class DelayQueueTest extends JSR1
160		ints[i] = new PDelay(i);
161		DelayQueue q = new DelayQueue(Arrays.asList(ints));
162		shouldThrow();
163	<	}
172	<	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)
185	<	assertEquals(ints[i], q.poll());
186	<	}
187	<	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 224 | 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 270 | Line 258 | public class DelayQueueTest extends JSR1
258		DelayQueue q = new DelayQueue();
259		q.addAll(null);
260		shouldThrow();
261	<	}
274	<	catch (NullPointerException success) {}
261	>	} catch (NullPointerException success) {}
262		}
263
264
#	Line 283 | Line 270 | public class DelayQueueTest extends JSR1
270		DelayQueue q = populatedQueue(SIZE);
271		q.addAll(q);
272		shouldThrow();
273	<	}
287	<	catch (IllegalArgumentException success) {}
273	>	} catch (IllegalArgumentException success) {}
274		}
275
276		/**
#	Line 296 | Line 282 | public class DelayQueueTest extends JSR1
282		PDelay[] ints = new PDelay[SIZE];
283		q.addAll(Arrays.asList(ints));
284		shouldThrow();
285	<	}
300	<	catch (NullPointerException success) {}
285	>	} catch (NullPointerException success) {}
286		}
287		/**
288		* addAll of a collection with any null elements throws NPE after
#	Line 311 | Line 296 | public class DelayQueueTest extends JSR1
296		ints[i] = new PDelay(i);
297		q.addAll(Arrays.asList(ints));
298		shouldThrow();
299	<	}
315	<	catch (NullPointerException success) {}
299	>	} catch (NullPointerException success) {}
300		}
301
302		/**
303		* Queue contains all elements of successful addAll
304		*/
305		public void testAddAll5() {
306	<	try {
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)
331	<	assertEquals(ints[i], q.poll());
332	<	}
333	<	finally {}
306	>	PDelay[] empty = new PDelay[0];
307	>	PDelay[] ints = new PDelay[SIZE];
308	>	for (int i = SIZE-1; i >= 0; --i)
309	>	ints[i] = new PDelay(i);
310	>	DelayQueue q = new DelayQueue();
311	>	assertFalse(q.addAll(Arrays.asList(empty)));
312	>	assertTrue(q.addAll(Arrays.asList(ints)));
313	>	for (int i = 0; i < SIZE; ++i)
314	>	assertEquals(ints[i], q.poll());
315		}
316
317		/**
318		* put(null) throws NPE
319		*/
320		public void testPutNull() {
321	<	try {
321	>	try {
322		DelayQueue q = new DelayQueue();
323		q.put(null);
324		shouldThrow();
325	<	}
345	<	catch (NullPointerException success){
346	<	}
325	>	} catch (NullPointerException success) {}
326		}
327
328		/**
329		* all elements successfully put are contained
330		*/
331		public void testPut() {
332	<	try {
333	<	DelayQueue q = new DelayQueue();
334	<	for (int i = 0; i < SIZE; ++i) {
335	<	PDelay I = new PDelay(i);
336	<	q.put(I);
358	<	assertTrue(q.contains(I));
359	<	}
360	<	assertEquals(SIZE, q.size());
332	>	DelayQueue q = new DelayQueue();
333	>	for (int i = 0; i < SIZE; ++i) {
334	>	PDelay I = new PDelay(i);
335	>	q.put(I);
336	>	assertTrue(q.contains(I));
337		}
338	<	finally {
363	<	}
338	>	assertEquals(SIZE, q.size());
339		}
340
341		/**
342		* put doesn't block waiting for take
343		*/
344	<	public void testPutWithTake() {
344	>	public void testPutWithTake() throws InterruptedException {
345		final DelayQueue q = new DelayQueue();
346	<	Thread t = new Thread(new Runnable() {
347	<	public void run() {
348	<	int added = 0;
349	<	try {
350	<	q.put(new PDelay(0));
351	<	++added;
352	<	q.put(new PDelay(0));
353	<	++added;
354	<	q.put(new PDelay(0));
355	<	++added;
356	<	q.put(new PDelay(0));
357	<	++added;
358	<	threadAssertTrue(added == 4);
384	<	} finally {
385	<	}
386	<	}
387	<	});
388	<	try {
389	<	t.start();
390	<	Thread.sleep(SHORT_DELAY_MS);
391	<	q.take();
392	<	t.interrupt();
393	<	t.join();
394	<	} catch (Exception e){
395	<	unexpectedException();
396	<	}
346	>	Thread t = new Thread(new CheckedRunnable() {
347	>	public void realRun() {
348	>	q.put(new PDelay(0));
349	>	q.put(new PDelay(0));
350	>	q.put(new PDelay(0));
351	>	q.put(new PDelay(0));
352	>	}});
353	>
354	>	t.start();
355	>	Thread.sleep(SHORT_DELAY_MS);
356	>	q.take();
357	>	t.interrupt();
358	>	t.join();
359		}
360
361		/**
362		* timed offer does not time out
363		*/
364	<	public void testTimedOffer() {
364	>	public void testTimedOffer() throws InterruptedException {
365		final DelayQueue q = new DelayQueue();
366	<	Thread t = new Thread(new Runnable() {
367	<	public void run() {
368	<	try {
369	<	q.put(new PDelay(0));
370	<	q.put(new PDelay(0));
371	<	threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
372	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
373	<	} finally { }
374	<	}
375	<	});
376	<
377	<	try {
416	<	t.start();
417	<	Thread.sleep(SMALL_DELAY_MS);
418	<	t.interrupt();
419	<	t.join();
420	<	} catch (Exception e){
421	<	unexpectedException();
422	<	}
366	>	Thread t = new Thread(new CheckedRunnable() {
367	>	public void realRun() throws InterruptedException {
368	>	q.put(new PDelay(0));
369	>	q.put(new PDelay(0));
370	>	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
371	>	assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
372	>	}});
373	>
374	>	t.start();
375	>	Thread.sleep(SMALL_DELAY_MS);
376	>	t.interrupt();
377	>	t.join();
378		}
379
380		/**
381		* take retrieves elements in priority order
382		*/
383	<	public void testTake() {
384	<	try {
385	<	DelayQueue q = populatedQueue(SIZE);
386	<	for (int i = 0; i < SIZE; ++i) {
387	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
433	<	}
434	<	} catch (InterruptedException e){
435	<	unexpectedException();
436	<	}
383	>	public void testTake() throws InterruptedException {
384	>	DelayQueue q = populatedQueue(SIZE);
385	>	for (int i = 0; i < SIZE; ++i) {
386	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
387	>	}
388		}
389
390		/**
391		* take blocks interruptibly when empty
392		*/
393	<	public void testTakeFromEmpty() {
393	>	public void testTakeFromEmpty() throws InterruptedException {
394		final DelayQueue q = new DelayQueue();
395	<	Thread t = new Thread(new Runnable() {
396	<	public void run() {
397	<	try {
398	<	q.take();
399	<	threadShouldThrow();
400	<	} catch (InterruptedException success){ }
401	<	}
402	<	});
403	<	try {
453	<	t.start();
454	<	Thread.sleep(SHORT_DELAY_MS);
455	<	t.interrupt();
456	<	t.join();
457	<	} catch (Exception e){
458	<	unexpectedException();
459	<	}
395	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
396	>	public void realRun() throws InterruptedException {
397	>	q.take();
398	>	}};
399	>
400	>	t.start();
401	>	Thread.sleep(SHORT_DELAY_MS);
402	>	t.interrupt();
403	>	t.join();
404		}
405
406		/**
407		* Take removes existing elements until empty, then blocks interruptibly
408		*/
409	<	public void testBlockingTake() {
410	<	Thread t = new Thread(new Runnable() {
411	<	public void run() {
412	<	try {
413	<	DelayQueue q = populatedQueue(SIZE);
414	<	for (int i = 0; i < SIZE; ++i) {
415	<	threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
416	<	}
417	<	q.take();
418	<	threadShouldThrow();
419	<	} catch (InterruptedException success){
420	<	}
421	<	}});
409	>	public void testBlockingTake() throws InterruptedException {
410	>	final DelayQueue q = populatedQueue(SIZE);
411	>	Thread t = new Thread(new CheckedRunnable() {
412	>	public void realRun() throws InterruptedException {
413	>	for (int i = 0; i < SIZE; ++i) {
414	>	assertEquals(new PDelay(i), ((PDelay)q.take()));
415	>	}
416	>	try {
417	>	q.take();
418	>	shouldThrow();
419	>	} catch (InterruptedException success) {}
420	>	}});
421	>
422		t.start();
423	<	try {
424	<	Thread.sleep(SHORT_DELAY_MS);
425	<	t.interrupt();
482	<	t.join();
483	<	}
484	<	catch (InterruptedException ie) {
485	<	unexpectedException();
486	<	}
423	>	Thread.sleep(SHORT_DELAY_MS);
424	>	t.interrupt();
425	>	t.join();
426		}
427
428
#	Line 495 | Line 434 | public class DelayQueueTest extends JSR1
434		for (int i = 0; i < SIZE; ++i) {
435		assertEquals(new PDelay(i), ((PDelay)q.poll()));
436		}
437	<	assertNull(q.poll());
437	>	assertNull(q.poll());
438		}
439
440		/**
441		* timed pool with zero timeout succeeds when non-empty, else times out
442		*/
443	<	public void testTimedPoll0() {
444	<	try {
445	<	DelayQueue q = populatedQueue(SIZE);
446	<	for (int i = 0; i < SIZE; ++i) {
447	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, TimeUnit.MILLISECONDS)));
448	<	}
510	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
511	<	} catch (InterruptedException e){
512	<	unexpectedException();
513	<	}
443	>	public void testTimedPoll0() throws InterruptedException {
444	>	DelayQueue q = populatedQueue(SIZE);
445	>	for (int i = 0; i < SIZE; ++i) {
446	>	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
447	>	}
448	>	assertNull(q.poll(0, MILLISECONDS));
449		}
450
451		/**
452		* timed pool with nonzero timeout succeeds when non-empty, else times out
453		*/
454	<	public void testTimedPoll() {
455	<	try {
456	<	DelayQueue q = populatedQueue(SIZE);
457	<	for (int i = 0; i < SIZE; ++i) {
458	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
459	<	}
525	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
526	<	} catch (InterruptedException e){
527	<	unexpectedException();
528	<	}
454	>	public void testTimedPoll() throws InterruptedException {
455	>	DelayQueue q = populatedQueue(SIZE);
456	>	for (int i = 0; i < SIZE; ++i) {
457	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
458	>	}
459	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
460		}
461
462		/**
463		* Interrupted timed poll throws InterruptedException instead of
464		* returning timeout status
465		*/
466	<	public void testInterruptedTimedPoll() {
467	<	Thread t = new Thread(new Runnable() {
468	<	public void run() {
469	<	try {
470	<	DelayQueue q = populatedQueue(SIZE);
471	<	for (int i = 0; i < SIZE; ++i) {
472	<	threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
473	<	}
474	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
475	<	} catch (InterruptedException success){
476	<	}
477	<	}});
466	>	public void testInterruptedTimedPoll() throws InterruptedException {
467	>	Thread t = new Thread(new CheckedRunnable() {
468	>	public void realRun() throws InterruptedException {
469	>	DelayQueue q = populatedQueue(SIZE);
470	>	for (int i = 0; i < SIZE; ++i) {
471	>	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
472	>	}
473	>	try {
474	>	q.poll(SMALL_DELAY_MS, MILLISECONDS);
475	>	shouldThrow();
476	>	} catch (InterruptedException success) {}
477	>	}});
478	>
479		t.start();
480	<	try {
481	<	Thread.sleep(SHORT_DELAY_MS);
482	<	t.interrupt();
551	<	t.join();
552	<	}
553	<	catch (InterruptedException ie) {
554	<	unexpectedException();
555	<	}
480	>	Thread.sleep(SHORT_DELAY_MS);
481	>	t.interrupt();
482	>	t.join();
483		}
484
485		/**
486		*  timed poll before a delayed offer fails; after offer succeeds;
487		*  on interruption throws
488		*/
489	<	public void testTimedPollWithOffer() {
489	>	public void testTimedPollWithOffer() throws InterruptedException {
490		final DelayQueue q = new DelayQueue();
491	<	Thread t = new Thread(new Runnable() {
492	<	public void run() {
493	<	try {
494	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
495	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
496	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
497	<	threadFail("Should block");
498	<	} catch (InterruptedException success) { }
499	<	}
500	<	});
501	<	try {
502	<	t.start();
503	<	Thread.sleep(SMALL_DELAY_MS);
504	<	assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
505	<	t.interrupt();
506	<	t.join();
507	<	} catch (Exception e){
581	<	unexpectedException();
582	<	}
583	<	}
491	>	final PDelay pdelay = new PDelay(0);
492	>	Thread t = new Thread(new CheckedRunnable() {
493	>	public void realRun() throws InterruptedException {
494	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
495	>	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
496	>	try {
497	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
498	>	shouldThrow();
499	>	} catch (InterruptedException success) {}
500	>	}});
501	>
502	>	t.start();
503	>	Thread.sleep(SMALL_DELAY_MS);
504	>	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
505	>	t.interrupt();
506	>	t.join();
507	>	}
508
509
510		/**
#	Line 590 | Line 514 | public class DelayQueueTest extends JSR1
514		DelayQueue q = populatedQueue(SIZE);
515		for (int i = 0; i < SIZE; ++i) {
516		assertEquals(new PDelay(i), ((PDelay)q.peek()));
517	<	q.poll();
518	<	assertTrue(q.peek() == null ||
519	<	i != ((PDelay)q.peek()).intValue());
517	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
518	>	if (q.isEmpty())
519	>	assertNull(q.peek());
520	>	else
521	>	assertFalse(new PDelay(i).equals(q.peek()));
522		}
523	<	assertNull(q.peek());
523	>	assertNull(q.peek());
524		}
525
526		/**
#	Line 609 | Line 535 | public class DelayQueueTest extends JSR1
535		try {
536		q.element();
537		shouldThrow();
538	<	}
613	<	catch (NoSuchElementException success) {}
538	>	} catch (NoSuchElementException success) {}
539		}
540
541		/**
#	Line 624 | Line 549 | public class DelayQueueTest extends JSR1
549		try {
550		q.remove();
551		shouldThrow();
552	<	} catch (NoSuchElementException success){
628	<	}
552	>	} catch (NoSuchElementException success) {}
553		}
554
555		/**
#	Line 642 | Line 566 | public class DelayQueueTest extends JSR1
566		}
567		assertTrue(q.isEmpty());
568		}
569	<
569	>
570		/**
571		* contains(x) reports true when elements added but not yet removed
572		*/
#	Line 664 | Line 588 | public class DelayQueueTest extends JSR1
588		assertTrue(q.isEmpty());
589		assertEquals(0, q.size());
590		assertEquals(NOCAP, q.remainingCapacity());
591	<	q.add(new PDelay(1));
591	>	PDelay x = new PDelay(1);
592	>	q.add(x);
593		assertFalse(q.isEmpty());
594	+	assertTrue(q.contains(x));
595		q.clear();
596		assertTrue(q.isEmpty());
597		}
#	Line 722 | Line 648 | public class DelayQueueTest extends JSR1
648		/**
649		* toArray contains all elements
650		*/
651	<	public void testToArray() {
651	>	public void testToArray() throws InterruptedException {
652		DelayQueue q = populatedQueue(SIZE);
653	<	Object[] o = q.toArray();
653	>	Object[] o = q.toArray();
654		Arrays.sort(o);
655	<	try {
656	<	for(int i = 0; i < o.length; i++)
731	<	assertEquals(o[i], q.take());
732	<	} catch (InterruptedException e){
733	<	unexpectedException();
734	<	}
655	>	for (int i = 0; i < o.length; i++)
656	>	assertEquals(o[i], q.take());
657		}
658
659		/**
660		* toArray(a) contains all elements
661		*/
662	<	public void testToArray2() {
662	>	public void testToArray2() throws InterruptedException {
663		DelayQueue q = populatedQueue(SIZE);
664	<	PDelay[] ints = new PDelay[SIZE];
665	<	ints = (PDelay[])q.toArray(ints);
664	>	PDelay[] ints = new PDelay[SIZE];
665	>	ints = (PDelay[])q.toArray(ints);
666		Arrays.sort(ints);
667	<	try {
668	<	for(int i = 0; i < ints.length; i++)
747	<	assertEquals(ints[i], q.take());
748	<	} catch (InterruptedException e){
749	<	unexpectedException();
750	<	}
667	>	for (int i = 0; i < ints.length; i++)
668	>	assertEquals(ints[i], q.take());
669		}
670
671
#	Line 755 | Line 673 | public class DelayQueueTest extends JSR1
673		* toArray(null) throws NPE
674		*/
675		public void testToArray_BadArg() {
676	<	try {
677	<	DelayQueue q = populatedQueue(SIZE);
678	<	Object o[] = q.toArray(null);
679	<	shouldThrow();
680	<	} catch(NullPointerException success){}
676	>	DelayQueue q = populatedQueue(SIZE);
677	>	try {
678	>	Object o[] = q.toArray(null);
679	>	shouldThrow();
680	>	} catch (NullPointerException success) {}
681		}
682
683		/**
684	<	* toArray with incompatable array type throws CCE
684	>	* toArray with incompatible array type throws CCE
685		*/
686		public void testToArray1_BadArg() {
687	<	try {
688	<	DelayQueue q = populatedQueue(SIZE);
689	<	Object o[] = q.toArray(new String[10] );
690	<	shouldThrow();
691	<	} catch(ArrayStoreException  success){}
687	>	DelayQueue q = populatedQueue(SIZE);
688	>	try {
689	>	Object o[] = q.toArray(new String[10]);
690	>	shouldThrow();
691	>	} catch (ArrayStoreException success) {}
692		}
693	<
693	>
694		/**
695		* iterator iterates through all elements
696		*/
697		public void testIterator() {
698		DelayQueue q = populatedQueue(SIZE);
699		int i = 0;
700	<	Iterator it = q.iterator();
701	<	while(it.hasNext()) {
700	>	Iterator it = q.iterator();
701	>	while (it.hasNext()) {
702		assertTrue(q.contains(it.next()));
703		++i;
704		}
#	Line 814 | Line 732 | public class DelayQueueTest extends JSR1
732		for (int i = 0; i < SIZE; ++i) {
733		assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
734		}
735	<	}
735	>	}
736
737		/**
738		* offer transfers elements across Executor tasks
#	Line 822 | Line 740 | public class DelayQueueTest extends JSR1
740		public void testPollInExecutor() {
741		final DelayQueue q = new DelayQueue();
742		ExecutorService executor = Executors.newFixedThreadPool(2);
743	<	executor.execute(new Runnable() {
744	<	public void run() {
745	<	threadAssertNull(q.poll());
746	<	try {
747	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
748	<	threadAssertTrue(q.isEmpty());
749	<	}
750	<	catch (InterruptedException e) {
751	<	threadUnexpectedException();
752	<	}
753	<	}
754	<	});
743	>	executor.execute(new CheckedRunnable() {
744	>	public void realRun() throws InterruptedException {
745	>	assertNull(q.poll());
746	>	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
747	>	assertTrue(q.isEmpty());
748	>	}});
749	>
750	>	executor.execute(new CheckedRunnable() {
751	>	public void realRun() throws InterruptedException {
752	>	Thread.sleep(SHORT_DELAY_MS);
753	>	q.put(new PDelay(1));
754	>	}});
755
838	–	executor.execute(new Runnable() {
839	–	public void run() {
840	–	try {
841	–	Thread.sleep(SHORT_DELAY_MS);
842	–	q.put(new PDelay(1));
843	–	}
844	–	catch (InterruptedException e) {
845	–	threadUnexpectedException();
846	–	}
847	–	}
848	–	});
756		joinPool(executor);
850	–
757		}
758
759
760		/**
761	<	* Dekayed actions do not occur until their delay elapses
761	>	* Delayed actions do not occur until their delay elapses
762		*/
763	<	public void testDelay() {
763	>	public void testDelay() throws InterruptedException {
764		DelayQueue q = new DelayQueue();
765		NanoDelay[] elements = new NanoDelay[SIZE];
766		for (int i = 0; i < SIZE; ++i) {
#	Line 864 | Line 770 | public class DelayQueueTest extends JSR1
770		q.add(elements[i]);
771		}
772
773	<	try {
774	<	long last = 0;
775	<	for (int i = 0; i < SIZE; ++i) {
776	<	NanoDelay e = (NanoDelay)(q.take());
777	<	long tt = e.getTriggerTime();
778	<	assertTrue(tt <= System.nanoTime());
779	<	if (i != 0)
780	<	assertTrue(tt >= last);
875	<	last = tt;
876	<	}
877	<	}
878	<	catch(InterruptedException ie) {
879	<	unexpectedException();
773	>	long last = 0;
774	>	for (int i = 0; i < SIZE; ++i) {
775	>	NanoDelay e = (NanoDelay)(q.take());
776	>	long tt = e.getTriggerTime();
777	>	assertTrue(tt <= System.nanoTime());
778	>	if (i != 0)
779	>	assertTrue(tt >= last);
780	>	last = tt;
781		}
782		}
783
784	+	/**
785	+	* peek of a non-empty queue returns non-null even if not expired
786	+	*/
787	+	public void testPeekDelayed() {
788	+	DelayQueue q = new DelayQueue();
789	+	q.add(new NanoDelay(Long.MAX_VALUE));
790	+	assert(q.peek() != null);
791	+	}
792	+
793	+
794	+	/**
795	+	* poll of a non-empty queue returns null if no expired elements.
796	+	*/
797	+	public void testPollDelayed() {
798	+	DelayQueue q = new DelayQueue();
799	+	q.add(new NanoDelay(Long.MAX_VALUE));
800	+	assertNull(q.poll());
801	+	}
802	+
803	+	/**
804	+	* timed poll of a non-empty queue returns null if no expired elements.
805	+	*/
806	+	public void testTimedPollDelayed() throws InterruptedException {
807	+	DelayQueue q = new DelayQueue();
808	+	q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
809	+	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
810	+	}
811
812		/**
813		* drainTo(null) throws NPE
814	<	*/
814	>	*/
815		public void testDrainToNull() {
816		DelayQueue q = populatedQueue(SIZE);
817		try {
818		q.drainTo(null);
819		shouldThrow();
820	<	} catch(NullPointerException success) {
893	<	}
820	>	} catch (NullPointerException success) {}
821		}
822
823		/**
824		* drainTo(this) throws IAE
825	<	*/
825	>	*/
826		public void testDrainToSelf() {
827		DelayQueue q = populatedQueue(SIZE);
828		try {
829		q.drainTo(q);
830		shouldThrow();
831	<	} catch(IllegalArgumentException success) {
905	<	}
831	>	} catch (IllegalArgumentException success) {}
832		}
833
834		/**
835		* drainTo(c) empties queue into another collection c
836	<	*/
836	>	*/
837		public void testDrainTo() {
838	<	DelayQueue q = populatedQueue(SIZE);
838	>	DelayQueue q = new DelayQueue();
839	>	PDelay[] elems = new PDelay[SIZE];
840	>	for (int i = 0; i < SIZE; ++i) {
841	>	elems[i] = new PDelay(i);
842	>	q.add(elems[i]);
843	>	}
844		ArrayList l = new ArrayList();
845		q.drainTo(l);
846		assertEquals(q.size(), 0);
847	<	assertEquals(l.size(), SIZE);
847	>	for (int i = 0; i < SIZE; ++i)
848	>	assertEquals(l.get(i), elems[i]);
849	>	q.add(elems[0]);
850	>	q.add(elems[1]);
851	>	assertFalse(q.isEmpty());
852	>	assertTrue(q.contains(elems[0]));
853	>	assertTrue(q.contains(elems[1]));
854	>	l.clear();
855	>	q.drainTo(l);
856	>	assertEquals(q.size(), 0);
857	>	assertEquals(l.size(), 2);
858	>	for (int i = 0; i < 2; ++i)
859	>	assertEquals(l.get(i), elems[i]);
860		}
861
862		/**
863		* drainTo empties queue
864	<	*/
865	<	public void testDrainToWithActivePut() {
864	>	*/
865	>	public void testDrainToWithActivePut() throws InterruptedException {
866		final DelayQueue q = populatedQueue(SIZE);
867	<	Thread t = new Thread(new Runnable() {
868	<	public void run() {
869	<	q.put(new PDelay(SIZE+1));
870	<	}
871	<	});
872	<	try {
873	<	t.start();
874	<	ArrayList l = new ArrayList();
875	<	q.drainTo(l);
876	<	assertTrue(l.size() >= SIZE);
877	<	t.join();
935	<	assertTrue(q.size() + l.size() == SIZE+1);
936	<	} catch(Exception e){
937	<	unexpectedException();
938	<	}
867	>	Thread t = new Thread(new CheckedRunnable() {
868	>	public void realRun() {
869	>	q.put(new PDelay(SIZE+1));
870	>	}});
871	>
872	>	t.start();
873	>	ArrayList l = new ArrayList();
874	>	q.drainTo(l);
875	>	assertTrue(l.size() >= SIZE);
876	>	t.join();
877	>	assertTrue(q.size() + l.size() >= SIZE);
878		}
879
880		/**
881		* drainTo(null, n) throws NPE
882	<	*/
882	>	*/
883		public void testDrainToNullN() {
884		DelayQueue q = populatedQueue(SIZE);
885		try {
886		q.drainTo(null, 0);
887		shouldThrow();
888	<	} catch(NullPointerException success) {
950	<	}
888	>	} catch (NullPointerException success) {}
889		}
890
891		/**
892		* drainTo(this, n) throws IAE
893	<	*/
893	>	*/
894		public void testDrainToSelfN() {
895		DelayQueue q = populatedQueue(SIZE);
896		try {
897		q.drainTo(q, 0);
898		shouldThrow();
899	<	} catch(IllegalArgumentException success) {
962	<	}
899	>	} catch (IllegalArgumentException success) {}
900		}
901
902		/**
903		* drainTo(c, n) empties first max {n, size} elements of queue into c
904	<	*/
904	>	*/
905		public void testDrainToN() {
906		for (int i = 0; i < SIZE + 2; ++i) {
907		DelayQueue q = populatedQueue(SIZE);

Diff Legend

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