ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/DelayQueueTest.java

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.19 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.28 by jsr166, Tue Dec 1 06:39:23 2009 UTC

#	Line 24 | Line 24 | public class DelayQueueTest extends JSR1
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 {
#	Line 32 | Line 32 | public class DelayQueueTest extends JSR1
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;
43	<	int j = ((PDelay)y).pseudodelay;
44	<	if (i < j) return -1;
45	<	if (i > j) return 1;
46	<	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 77 | Line 73 | public class DelayQueueTest extends JSR1
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;
88	<	long j = ((NanoDelay)y).trigger;
89	<	if (i < j) return -1;
90	<	if (i > j) return 1;
91	<	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 144 | Line 136 | public class DelayQueueTest extends JSR1
136		try {
137		DelayQueue q = new DelayQueue(null);
138		shouldThrow();
139	<	}
148	<	catch (NullPointerException success) {}
139	>	} catch (NullPointerException success) {}
140		}
141
142		/**
#	Line 156 | Line 147 | public class DelayQueueTest extends JSR1
147		PDelay[] ints = new PDelay[SIZE];
148		DelayQueue q = new DelayQueue(Arrays.asList(ints));
149		shouldThrow();
150	<	}
160	<	catch (NullPointerException success) {}
150	>	} catch (NullPointerException success) {}
151		}
152
153		/**
#	Line 170 | Line 160 | public class DelayQueueTest extends JSR1
160		ints[i] = new PDelay(i);
161		DelayQueue q = new DelayQueue(Arrays.asList(ints));
162		shouldThrow();
163	<	}
174	<	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)
187	<	assertEquals(ints[i], q.poll());
188	<	}
189	<	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 230 | Line 216 | public class DelayQueueTest extends JSR1
216		DelayQueue q = new DelayQueue();
217		q.offer(null);
218		shouldThrow();
219	<	} catch (NullPointerException success) { }
219	>	} catch (NullPointerException success) {}
220		}
221
222		/**
#	Line 241 | Line 227 | public class DelayQueueTest extends JSR1
227		DelayQueue q = new DelayQueue();
228		q.add(null);
229		shouldThrow();
230	<	} catch (NullPointerException success) { }
230	>	} catch (NullPointerException success) {}
231		}
232
233		/**
#	Line 272 | Line 258 | public class DelayQueueTest extends JSR1
258		DelayQueue q = new DelayQueue();
259		q.addAll(null);
260		shouldThrow();
261	<	}
276	<	catch (NullPointerException success) {}
261	>	} catch (NullPointerException success) {}
262		}
263
264
#	Line 285 | Line 270 | public class DelayQueueTest extends JSR1
270		DelayQueue q = populatedQueue(SIZE);
271		q.addAll(q);
272		shouldThrow();
273	<	}
289	<	catch (IllegalArgumentException success) {}
273	>	} catch (IllegalArgumentException success) {}
274		}
275
276		/**
#	Line 298 | Line 282 | public class DelayQueueTest extends JSR1
282		PDelay[] ints = new PDelay[SIZE];
283		q.addAll(Arrays.asList(ints));
284		shouldThrow();
285	<	}
302	<	catch (NullPointerException success) {}
285	>	} catch (NullPointerException success) {}
286		}
287		/**
288		* addAll of a collection with any null elements throws NPE after
#	Line 313 | Line 296 | public class DelayQueueTest extends JSR1
296		ints[i] = new PDelay(i);
297		q.addAll(Arrays.asList(ints));
298		shouldThrow();
299	<	}
317	<	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)
333	<	assertEquals(ints[i], q.poll());
334	<	}
335	<	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		/**
#	Line 343 | Line 322 | public class DelayQueueTest extends JSR1
322		DelayQueue q = new DelayQueue();
323		q.put(null);
324		shouldThrow();
325	<	}
347	<	catch (NullPointerException success) {
348	<	}
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);
360	<	assertTrue(q.contains(I));
361	<	}
362	<	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 {
365	<	}
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);
386	<	} finally {
387	<	}
388	<	}
389	<	});
390	<	try {
391	<	t.start();
392	<	Thread.sleep(SHORT_DELAY_MS);
393	<	q.take();
394	<	t.interrupt();
395	<	t.join();
396	<	} catch (Exception e) {
397	<	unexpectedException();
398	<	}
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, MILLISECONDS));
372	<	threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
413	<	} finally { }
414	<	}
415	<	});
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	<	try {
375	<	t.start();
376	<	Thread.sleep(SMALL_DELAY_MS);
377	<	t.interrupt();
421	<	t.join();
422	<	} catch (Exception e) {
423	<	unexpectedException();
424	<	}
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) {
434	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
435	<	}
436	<	} catch (InterruptedException e) {
437	<	unexpectedException();
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 {
455	<	t.start();
456	<	Thread.sleep(SHORT_DELAY_MS);
457	<	t.interrupt();
458	<	t.join();
459	<	} catch (Exception e) {
460	<	unexpectedException();
461	<	}
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();
484	<	t.join();
485	<	}
486	<	catch (InterruptedException ie) {
487	<	unexpectedException();
488	<	}
423	>	Thread.sleep(SHORT_DELAY_MS);
424	>	t.interrupt();
425	>	t.join();
426		}
427
428
#	Line 503 | Line 440 | public class DelayQueueTest extends JSR1
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) {
510	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
511	<	}
512	<	assertNull(q.poll(0, MILLISECONDS));
513	<	} catch (InterruptedException e) {
514	<	unexpectedException();
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) {
525	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
526	<	}
527	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
528	<	} catch (InterruptedException e) {
529	<	unexpectedException();
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, MILLISECONDS)));
473	<	}
474	<	threadAssertNull(q.poll(SHORT_DELAY_MS, 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();
553	<	t.join();
554	<	}
555	<	catch (InterruptedException ie) {
556	<	unexpectedException();
557	<	}
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, MILLISECONDS));
495	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
496	<	q.poll(LONG_DELAY_MS, 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, MILLISECONDS));
505	<	t.interrupt();
506	<	t.join();
582	<	} catch (Exception e) {
583	<	unexpectedException();
584	<	}
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
#	Line 592 | 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();
517	>	assertEquals(new PDelay(i), ((PDelay)q.poll()));
518		if (q.isEmpty())
519		assertNull(q.peek());
520		else
521	<	assertTrue(i != ((PDelay)q.peek()).intValue());
521	>	assertFalse(new PDelay(i).equals(q.peek()));
522		}
523		assertNull(q.peek());
524		}
#	Line 613 | Line 535 | public class DelayQueueTest extends JSR1
535		try {
536		q.element();
537		shouldThrow();
538	<	}
617	<	catch (NoSuchElementException success) {}
538	>	} catch (NoSuchElementException success) {}
539		}
540
541		/**
#	Line 628 | Line 549 | public class DelayQueueTest extends JSR1
549		try {
550		q.remove();
551		shouldThrow();
552	<	} catch (NoSuchElementException success) {
632	<	}
552	>	} catch (NoSuchElementException success) {}
553		}
554
555		/**
#	Line 728 | 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();
654		Arrays.sort(o);
735	–	try {
655		for (int i = 0; i < o.length; i++)
656		assertEquals(o[i], q.take());
738	–	} catch (InterruptedException e) {
739	–	unexpectedException();
740	–	}
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);
666		Arrays.sort(ints);
667	<	try {
668	<	for (int i = 0; i < ints.length; i++)
753	<	assertEquals(ints[i], q.take());
754	<	} catch (InterruptedException e) {
755	<	unexpectedException();
756	<	}
667	>	for (int i = 0; i < ints.length; i++)
668	>	assertEquals(ints[i], q.take());
669		}
670
671
#	Line 761 | Line 673 | public class DelayQueueTest extends JSR1
673		* toArray(null) throws NPE
674		*/
675		public void testToArray_BadArg() {
676	+	DelayQueue q = populatedQueue(SIZE);
677		try {
765	–	DelayQueue q = populatedQueue(SIZE);
678		Object o[] = q.toArray(null);
679		shouldThrow();
680		} catch (NullPointerException success) {}
#	Line 772 | Line 684 | public class DelayQueueTest extends JSR1
684		* toArray with incompatible array type throws CCE
685		*/
686		public void testToArray1_BadArg() {
687	+	DelayQueue q = populatedQueue(SIZE);
688		try {
689	<	DelayQueue q = populatedQueue(SIZE);
777	<	Object o[] = q.toArray(new String[10] );
689	>	Object o[] = q.toArray(new String[10]);
690		shouldThrow();
691	<	} catch (ArrayStoreException  success) {}
691	>	} catch (ArrayStoreException success) {}
692		}
693
694		/**
#	Line 828 | 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, 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
844	–	executor.execute(new Runnable() {
845	–	public void run() {
846	–	try {
847	–	Thread.sleep(SHORT_DELAY_MS);
848	–	q.put(new PDelay(1));
849	–	}
850	–	catch (InterruptedException e) {
851	–	threadUnexpectedException();
852	–	}
853	–	}
854	–	});
756		joinPool(executor);
757
758		}
#	Line 860 | Line 761 | public class DelayQueueTest extends JSR1
761		/**
762		* Delayed actions do not occur until their delay elapses
763		*/
764	<	public void testDelay() {
764	>	public void testDelay() throws InterruptedException {
765		DelayQueue q = new DelayQueue();
766		NanoDelay[] elements = new NanoDelay[SIZE];
767		for (int i = 0; i < SIZE; ++i) {
#	Line 870 | Line 771 | public class DelayQueueTest extends JSR1
771		q.add(elements[i]);
772		}
773
774	<	try {
775	<	long last = 0;
776	<	for (int i = 0; i < SIZE; ++i) {
777	<	NanoDelay e = (NanoDelay)(q.take());
778	<	long tt = e.getTriggerTime();
779	<	assertTrue(tt <= System.nanoTime());
780	<	if (i != 0)
781	<	assertTrue(tt >= last);
881	<	last = tt;
882	<	}
883	<	}
884	<	catch (InterruptedException ie) {
885	<	unexpectedException();
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);
781	>	last = tt;
782		}
783		}
784
#	Line 908 | Line 804 | public class DelayQueueTest extends JSR1
804		/**
805		* timed poll of a non-empty queue returns null if no expired elements.
806		*/
807	<	public void testTimedPollDelayed() {
807	>	public void testTimedPollDelayed() throws InterruptedException {
808		DelayQueue q = new DelayQueue();
809		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
810	<	try {
915	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
916	<	} catch (Exception ex) {
917	<	unexpectedException();
918	<	}
810	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
811		}
812
813		/**
#	Line 926 | Line 818 | public class DelayQueueTest extends JSR1
818		try {
819		q.drainTo(null);
820		shouldThrow();
821	<	} catch (NullPointerException success) {
930	<	}
821	>	} catch (NullPointerException success) {}
822		}
823
824		/**
#	Line 938 | Line 829 | public class DelayQueueTest extends JSR1
829		try {
830		q.drainTo(q);
831		shouldThrow();
832	<	} catch (IllegalArgumentException success) {
942	<	}
832	>	} catch (IllegalArgumentException success) {}
833		}
834
835		/**
#	Line 973 | Line 863 | public class DelayQueueTest extends JSR1
863		/**
864		* drainTo empties queue
865		*/
866	<	public void testDrainToWithActivePut() {
866	>	public void testDrainToWithActivePut() throws InterruptedException {
867		final DelayQueue q = populatedQueue(SIZE);
868	<	Thread t = new Thread(new Runnable() {
869	<	public void run() {
870	<	q.put(new PDelay(SIZE+1));
871	<	}
872	<	});
873	<	try {
874	<	t.start();
875	<	ArrayList l = new ArrayList();
876	<	q.drainTo(l);
877	<	assertTrue(l.size() >= SIZE);
878	<	t.join();
989	<	assertTrue(q.size() + l.size() >= SIZE);
990	<	} catch (Exception e) {
991	<	unexpectedException();
992	<	}
868	>	Thread t = new Thread(new CheckedRunnable() {
869	>	public void realRun() {
870	>	q.put(new PDelay(SIZE+1));
871	>	}});
872	>
873	>	t.start();
874	>	ArrayList l = new ArrayList();
875	>	q.drainTo(l);
876	>	assertTrue(l.size() >= SIZE);
877	>	t.join();
878	>	assertTrue(q.size() + l.size() >= SIZE);
879		}
880
881		/**
#	Line 1000 | Line 886 | public class DelayQueueTest extends JSR1
886		try {
887		q.drainTo(null, 0);
888		shouldThrow();
889	<	} catch (NullPointerException success) {
1004	<	}
889	>	} catch (NullPointerException success) {}
890		}
891
892		/**
#	Line 1012 | Line 897 | public class DelayQueueTest extends JSR1
897		try {
898		q.drainTo(q, 0);
899		shouldThrow();
900	<	} catch (IllegalArgumentException success) {
1016	<	}
900	>	} catch (IllegalArgumentException success) {}
901		}
902
903		/**

Diff Legend

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