ViewVC Help

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

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

Comparing jsr166/src/test/tck/ScheduledExecutorTest.java (file contents):
Revision 1.62 by jsr166, Sun Oct 4 08:07:31 2015 UTC vs.
Revision 1.89 by jsr166, Tue Mar 28 18:13:10 2017 UTC

#	Line 7 | Line 7
7		*/
8
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	+	import static java.util.concurrent.TimeUnit.NANOSECONDS;
11		import static java.util.concurrent.TimeUnit.SECONDS;
12
13		import java.util.ArrayList;
#	Line 17 | Line 18 | import java.util.concurrent.Callable;
18		import java.util.concurrent.CancellationException;
19		import java.util.concurrent.CountDownLatch;
20		import java.util.concurrent.ExecutionException;
20	–	import java.util.concurrent.Executors;
21		import java.util.concurrent.ExecutorService;
22		import java.util.concurrent.Future;
23		import java.util.concurrent.RejectedExecutionException;
24		import java.util.concurrent.ScheduledFuture;
25		import java.util.concurrent.ScheduledThreadPoolExecutor;
26		import java.util.concurrent.ThreadFactory;
27	+	import java.util.concurrent.ThreadLocalRandom;
28		import java.util.concurrent.ThreadPoolExecutor;
29	+	import java.util.concurrent.atomic.AtomicBoolean;
30		import java.util.concurrent.atomic.AtomicInteger;
31	+	import java.util.concurrent.atomic.AtomicLong;
32	+	import java.util.stream.Stream;
33
34		import junit.framework.Test;
35		import junit.framework.TestSuite;
#	Line 42 | Line 46 | public class ScheduledExecutorTest exten
46		* execute successfully executes a runnable
47		*/
48		public void testExecute() throws InterruptedException {
49	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
49	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
50		try (PoolCleaner cleaner = cleaner(p)) {
51		final CountDownLatch done = new CountDownLatch(1);
52		final Runnable task = new CheckedRunnable() {
53		public void realRun() { done.countDown(); }};
54		p.execute(task);
55	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
55	>	await(done);
56		}
57		}
58
#	Line 56 | Line 60 | public class ScheduledExecutorTest exten
60		* delayed schedule of callable successfully executes after delay
61		*/
62		public void testSchedule1() throws Exception {
63	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
63	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
64		try (PoolCleaner cleaner = cleaner(p)) {
65		final long startTime = System.nanoTime();
66		final CountDownLatch done = new CountDownLatch(1);
#	Line 77 | Line 81 | public class ScheduledExecutorTest exten
81		* delayed schedule of runnable successfully executes after delay
82		*/
83		public void testSchedule3() throws Exception {
84	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
84	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
85		try (PoolCleaner cleaner = cleaner(p)) {
86		final long startTime = System.nanoTime();
87		final CountDownLatch done = new CountDownLatch(1);
#	Line 97 | Line 101 | public class ScheduledExecutorTest exten
101		* scheduleAtFixedRate executes runnable after given initial delay
102		*/
103		public void testSchedule4() throws Exception {
104	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
104	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
105		try (PoolCleaner cleaner = cleaner(p)) {
106		final long startTime = System.nanoTime();
107		final CountDownLatch done = new CountDownLatch(1);
#	Line 119 | Line 123 | public class ScheduledExecutorTest exten
123		* scheduleWithFixedDelay executes runnable after given initial delay
124		*/
125		public void testSchedule5() throws Exception {
126	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
126	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
127		try (PoolCleaner cleaner = cleaner(p)) {
128		final long startTime = System.nanoTime();
129		final CountDownLatch done = new CountDownLatch(1);
#	Line 143 | Line 147 | public class ScheduledExecutorTest exten
147		}
148
149		/**
150	<	* scheduleAtFixedRate executes series of tasks at given rate
150	>	* scheduleAtFixedRate executes series of tasks at given rate.
151	>	* Eventually, it must hold that:
152	>	*   cycles - 1 <= elapsedMillis/delay < cycles
153		*/
154		public void testFixedRateSequence() throws InterruptedException {
155	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
155	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
156		try (PoolCleaner cleaner = cleaner(p)) {
157		for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
158	<	long startTime = System.nanoTime();
159	<	int cycles = 10;
158	>	final long startTime = System.nanoTime();
159	>	final int cycles = 8;
160		final CountDownLatch done = new CountDownLatch(cycles);
161	<	Runnable task = new CheckedRunnable() {
161	>	final Runnable task = new CheckedRunnable() {
162		public void realRun() { done.countDown(); }};
163	<	ScheduledFuture h =
163	>	final ScheduledFuture periodicTask =
164		p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
165	<	done.await();
166	<	h.cancel(true);
167	<	double normalizedTime =
168	<	(double) millisElapsedSince(startTime) / delay;
169	<	if (normalizedTime >= cycles - 1 &&
170	<	normalizedTime <= cycles)
165	>	final int totalDelayMillis = (cycles - 1) * delay;
166	>	await(done, totalDelayMillis + LONG_DELAY_MS);
167	>	periodicTask.cancel(true);
168	>	final long elapsedMillis = millisElapsedSince(startTime);
169	>	assertTrue(elapsedMillis >= totalDelayMillis);
170	>	if (elapsedMillis <= cycles * delay)
171		return;
172	+	// else retry with longer delay
173		}
174	<	throw new AssertionError("unexpected execution rate");
174	>	fail("unexpected execution rate");
175		}
176		}
177
178		/**
179	<	* scheduleWithFixedDelay executes series of tasks with given period
179	>	* scheduleWithFixedDelay executes series of tasks with given period.
180	>	* Eventually, it must hold that each task starts at least delay and at
181	>	* most 2 * delay after the termination of the previous task.
182		*/
183		public void testFixedDelaySequence() throws InterruptedException {
184	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
184	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
185		try (PoolCleaner cleaner = cleaner(p)) {
186		for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
187	<	long startTime = System.nanoTime();
188	<	int cycles = 10;
187	>	final long startTime = System.nanoTime();
188	>	final AtomicLong previous = new AtomicLong(startTime);
189	>	final AtomicBoolean tryLongerDelay = new AtomicBoolean(false);
190	>	final int cycles = 8;
191		final CountDownLatch done = new CountDownLatch(cycles);
192	<	Runnable task = new CheckedRunnable() {
193	<	public void realRun() { done.countDown(); }};
194	<	ScheduledFuture h =
192	>	final int d = delay;
193	>	final Runnable task = new CheckedRunnable() {
194	>	public void realRun() {
195	>	long now = System.nanoTime();
196	>	long elapsedMillis
197	>	= NANOSECONDS.toMillis(now - previous.get());
198	>	if (done.getCount() == cycles) { // first execution
199	>	if (elapsedMillis >= d)
200	>	tryLongerDelay.set(true);
201	>	} else {
202	>	assertTrue(elapsedMillis >= d);
203	>	if (elapsedMillis >= 2 * d)
204	>	tryLongerDelay.set(true);
205	>	}
206	>	previous.set(now);
207	>	done.countDown();
208	>	}};
209	>	final ScheduledFuture periodicTask =
210		p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
211	<	done.await();
212	<	h.cancel(true);
213	<	double normalizedTime =
214	<	(double) millisElapsedSince(startTime) / delay;
215	<	if (normalizedTime >= cycles - 1 &&
216	<	normalizedTime <= cycles)
211	>	final int totalDelayMillis = (cycles - 1) * delay;
212	>	await(done, totalDelayMillis + cycles * LONG_DELAY_MS);
213	>	periodicTask.cancel(true);
214	>	final long elapsedMillis = millisElapsedSince(startTime);
215	>	assertTrue(elapsedMillis >= totalDelayMillis);
216	>	if (!tryLongerDelay.get())
217		return;
218	+	// else retry with longer delay
219		}
220	<	throw new AssertionError("unexpected execution rate");
220	>	fail("unexpected execution rate");
221		}
222		}
223
#	Line 198 | Line 225 | public class ScheduledExecutorTest exten
225		* execute(null) throws NPE
226		*/
227		public void testExecuteNull() throws InterruptedException {
228	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
228	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
229		try (PoolCleaner cleaner = cleaner(p)) {
230		try {
231		p.execute(null);
#	Line 225 | Line 252 | public class ScheduledExecutorTest exten
252		* execute throws RejectedExecutionException if shutdown
253		*/
254		public void testSchedule1_RejectedExecutionException() throws InterruptedException {
255	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
255	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
256		try (PoolCleaner cleaner = cleaner(p)) {
257		try {
258		p.shutdown();
#	Line 241 | Line 268 | public class ScheduledExecutorTest exten
268		* schedule throws RejectedExecutionException if shutdown
269		*/
270		public void testSchedule2_RejectedExecutionException() throws InterruptedException {
271	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
271	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
272		try (PoolCleaner cleaner = cleaner(p)) {
273		try {
274		p.shutdown();
#	Line 257 | Line 284 | public class ScheduledExecutorTest exten
284		* schedule callable throws RejectedExecutionException if shutdown
285		*/
286		public void testSchedule3_RejectedExecutionException() throws InterruptedException {
287	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
287	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
288		try (PoolCleaner cleaner = cleaner(p)) {
289		try {
290		p.shutdown();
#	Line 273 | Line 300 | public class ScheduledExecutorTest exten
300		* scheduleAtFixedRate throws RejectedExecutionException if shutdown
301		*/
302		public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
303	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
303	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
304		try (PoolCleaner cleaner = cleaner(p)) {
305		try {
306		p.shutdown();
#	Line 289 | Line 316 | public class ScheduledExecutorTest exten
316		* scheduleWithFixedDelay throws RejectedExecutionException if shutdown
317		*/
318		public void testScheduleWithFixedDelay1_RejectedExecutionException() throws InterruptedException {
319	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
319	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
320		try (PoolCleaner cleaner = cleaner(p)) {
321		try {
322		p.shutdown();
#	Line 306 | Line 333 | public class ScheduledExecutorTest exten
333		* thread becomes active
334		*/
335		public void testGetActiveCount() throws InterruptedException {
336	+	final CountDownLatch done = new CountDownLatch(1);
337		final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
338	<	try (PoolCleaner cleaner = cleaner(p)) {
338	>	try (PoolCleaner cleaner = cleaner(p, done)) {
339		final CountDownLatch threadStarted = new CountDownLatch(1);
312	–	final CountDownLatch done = new CountDownLatch(1);
340		assertEquals(0, p.getActiveCount());
341		p.execute(new CheckedRunnable() {
342		public void realRun() throws InterruptedException {
343		threadStarted.countDown();
344		assertEquals(1, p.getActiveCount());
345	<	done.await();
345	>	await(done);
346		}});
347	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
347	>	await(threadStarted);
348		assertEquals(1, p.getActiveCount());
322	–	done.countDown();
349		}
350		}
351
#	Line 338 | Line 364 | public class ScheduledExecutorTest exten
364		public void realRun() throws InterruptedException {
365		threadStarted.countDown();
366		assertEquals(0, p.getCompletedTaskCount());
367	<	threadProceed.await();
367	>	await(threadProceed);
368		threadDone.countDown();
369		}});
370		await(threadStarted);
371		assertEquals(0, p.getCompletedTaskCount());
372		threadProceed.countDown();
373	<	threadDone.await();
373	>	await(threadDone);
374		long startTime = System.nanoTime();
375		while (p.getCompletedTaskCount() != 1) {
376		if (millisElapsedSince(startTime) > LONG_DELAY_MS)
#	Line 373 | Line 399 | public class ScheduledExecutorTest exten
399		final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
400		final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
401		final CountDownLatch done = new CountDownLatch(1);
402	<	try (PoolCleaner cleaner = cleaner(p)) {
402	>	try (PoolCleaner cleaner = cleaner(p, done)) {
403		assertEquals(0, p.getLargestPoolSize());
404		for (int i = 0; i < THREADS; i++)
405		p.execute(new CheckedRunnable() {
406		public void realRun() throws InterruptedException {
407		threadsStarted.countDown();
408	<	done.await();
408	>	await(done);
409		assertEquals(THREADS, p.getLargestPoolSize());
410		}});
411	<	assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
411	>	await(threadsStarted);
412		assertEquals(THREADS, p.getLargestPoolSize());
387	–	done.countDown();
413		}
414		assertEquals(THREADS, p.getLargestPoolSize());
415		}
#	Line 397 | Line 422 | public class ScheduledExecutorTest exten
422		final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
423		final CountDownLatch threadStarted = new CountDownLatch(1);
424		final CountDownLatch done = new CountDownLatch(1);
425	<	try (PoolCleaner cleaner = cleaner(p)) {
425	>	try (PoolCleaner cleaner = cleaner(p, done)) {
426		assertEquals(0, p.getPoolSize());
427		p.execute(new CheckedRunnable() {
428		public void realRun() throws InterruptedException {
429		threadStarted.countDown();
430		assertEquals(1, p.getPoolSize());
431	<	done.await();
431	>	await(done);
432		}});
433	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
433	>	await(threadStarted);
434		assertEquals(1, p.getPoolSize());
410	–	done.countDown();
435		}
436		}
437
#	Line 416 | Line 440 | public class ScheduledExecutorTest exten
440		* submitted
441		*/
442		public void testGetTaskCount() throws InterruptedException {
443	+	final int TASKS = 3;
444	+	final CountDownLatch done = new CountDownLatch(1);
445		final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
446	<	try (PoolCleaner cleaner = cleaner(p)) {
446	>	try (PoolCleaner cleaner = cleaner(p, done)) {
447		final CountDownLatch threadStarted = new CountDownLatch(1);
422	–	final CountDownLatch done = new CountDownLatch(1);
423	–	final int TASKS = 5;
448		assertEquals(0, p.getTaskCount());
449	<	for (int i = 0; i < TASKS; i++)
449	>	assertEquals(0, p.getCompletedTaskCount());
450	>	p.execute(new CheckedRunnable() {
451	>	public void realRun() throws InterruptedException {
452	>	threadStarted.countDown();
453	>	await(done);
454	>	}});
455	>	await(threadStarted);
456	>	assertEquals(1, p.getTaskCount());
457	>	assertEquals(0, p.getCompletedTaskCount());
458	>	for (int i = 0; i < TASKS; i++) {
459	>	assertEquals(1 + i, p.getTaskCount());
460		p.execute(new CheckedRunnable() {
461		public void realRun() throws InterruptedException {
462		threadStarted.countDown();
463	<	done.await();
463	>	assertEquals(1 + TASKS, p.getTaskCount());
464	>	await(done);
465		}});
466	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
467	<	assertEquals(TASKS, p.getTaskCount());
468	<	done.countDown();
466	>	}
467	>	assertEquals(1 + TASKS, p.getTaskCount());
468	>	assertEquals(0, p.getCompletedTaskCount());
469		}
470	+	assertEquals(1 + TASKS, p.getTaskCount());
471	+	assertEquals(1 + TASKS, p.getCompletedTaskCount());
472		}
473
474		/**
475		* getThreadFactory returns factory in constructor if not set
476		*/
477		public void testGetThreadFactory() throws InterruptedException {
478	<	ThreadFactory threadFactory = new SimpleThreadFactory();
479	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1, threadFactory);
480	<	assertSame(threadFactory, p.getThreadFactory());
481	<	joinPool(p);
478	>	final ThreadFactory threadFactory = new SimpleThreadFactory();
479	>	final ScheduledThreadPoolExecutor p =
480	>	new ScheduledThreadPoolExecutor(1, threadFactory);
481	>	try (PoolCleaner cleaner = cleaner(p)) {
482	>	assertSame(threadFactory, p.getThreadFactory());
483	>	}
484		}
485
486		/**
#	Line 449 | Line 488 | public class ScheduledExecutorTest exten
488		*/
489		public void testSetThreadFactory() throws InterruptedException {
490		ThreadFactory threadFactory = new SimpleThreadFactory();
491	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
491	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
492		try (PoolCleaner cleaner = cleaner(p)) {
493		p.setThreadFactory(threadFactory);
494		assertSame(threadFactory, p.getThreadFactory());
#	Line 460 | Line 499 | public class ScheduledExecutorTest exten
499		* setThreadFactory(null) throws NPE
500		*/
501		public void testSetThreadFactoryNull() throws InterruptedException {
502	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
502	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
503		try (PoolCleaner cleaner = cleaner(p)) {
504		try {
505		p.setThreadFactory(null);
#	Line 470 | Line 509 | public class ScheduledExecutorTest exten
509		}
510
511		/**
512	+	* The default rejected execution handler is AbortPolicy.
513	+	*/
514	+	public void testDefaultRejectedExecutionHandler() {
515	+	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
516	+	try (PoolCleaner cleaner = cleaner(p)) {
517	+	assertTrue(p.getRejectedExecutionHandler()
518	+	instanceof ThreadPoolExecutor.AbortPolicy);
519	+	}
520	+	}
521	+
522	+	/**
523		* isShutdown is false before shutdown, true after
524		*/
525		public void testIsShutdown() {
526	<
527	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
528	<	try {
529	<	assertFalse(p.isShutdown());
530	<	}
531	<	finally {
532	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
526	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
527	>	assertFalse(p.isShutdown());
528	>	try (PoolCleaner cleaner = cleaner(p)) {
529	>	try {
530	>	p.shutdown();
531	>	assertTrue(p.isShutdown());
532	>	} catch (SecurityException ok) {}
533		}
484	–	assertTrue(p.isShutdown());
534		}
535
536		/**
#	Line 497 | Line 546 | public class ScheduledExecutorTest exten
546		public void realRun() throws InterruptedException {
547		assertFalse(p.isTerminated());
548		threadStarted.countDown();
549	<	done.await();
549	>	await(done);
550		}});
551	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
551	>	await(threadStarted);
552		assertFalse(p.isTerminating());
553		done.countDown();
554		try { p.shutdown(); } catch (SecurityException ok) { return; }
#	Line 521 | Line 570 | public class ScheduledExecutorTest exten
570		public void realRun() throws InterruptedException {
571		assertFalse(p.isTerminating());
572		threadStarted.countDown();
573	<	done.await();
573	>	await(done);
574		}});
575	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
575	>	await(threadStarted);
576		assertFalse(p.isTerminating());
577		done.countDown();
578		try { p.shutdown(); } catch (SecurityException ok) { return; }
#	Line 537 | Line 586 | public class ScheduledExecutorTest exten
586		* getQueue returns the work queue, which contains queued tasks
587		*/
588		public void testGetQueue() throws InterruptedException {
589	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
590	<	try (PoolCleaner cleaner = cleaner(p)) {
589	>	final CountDownLatch done = new CountDownLatch(1);
590	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
591	>	try (PoolCleaner cleaner = cleaner(p, done)) {
592		final CountDownLatch threadStarted = new CountDownLatch(1);
543	–	final CountDownLatch done = new CountDownLatch(1);
593		ScheduledFuture[] tasks = new ScheduledFuture[5];
594		for (int i = 0; i < tasks.length; i++) {
595		Runnable r = new CheckedRunnable() {
596		public void realRun() throws InterruptedException {
597		threadStarted.countDown();
598	<	done.await();
598	>	await(done);
599		}};
600		tasks[i] = p.schedule(r, 1, MILLISECONDS);
601		}
602	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
602	>	await(threadStarted);
603		BlockingQueue<Runnable> q = p.getQueue();
604		assertTrue(q.contains(tasks[tasks.length - 1]));
605		assertFalse(q.contains(tasks[0]));
557	–	done.countDown();
606		}
607		}
608
#	Line 562 | Line 610 | public class ScheduledExecutorTest exten
610		* remove(task) removes queued task, and fails to remove active task
611		*/
612		public void testRemove() throws InterruptedException {
613	+	final CountDownLatch done = new CountDownLatch(1);
614		final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
615	<	try (PoolCleaner cleaner = cleaner(p)) {
615	>	try (PoolCleaner cleaner = cleaner(p, done)) {
616		ScheduledFuture[] tasks = new ScheduledFuture[5];
617		final CountDownLatch threadStarted = new CountDownLatch(1);
569	–	final CountDownLatch done = new CountDownLatch(1);
618		for (int i = 0; i < tasks.length; i++) {
619		Runnable r = new CheckedRunnable() {
620		public void realRun() throws InterruptedException {
621		threadStarted.countDown();
622	<	done.await();
622	>	await(done);
623		}};
624		tasks[i] = p.schedule(r, 1, MILLISECONDS);
625		}
626	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
626	>	await(threadStarted);
627		BlockingQueue<Runnable> q = p.getQueue();
628		assertFalse(p.remove((Runnable)tasks[0]));
629		assertTrue(q.contains((Runnable)tasks[4]));
#	Line 586 | Line 634 | public class ScheduledExecutorTest exten
634		assertTrue(q.contains((Runnable)tasks[3]));
635		assertTrue(p.remove((Runnable)tasks[3]));
636		assertFalse(q.contains((Runnable)tasks[3]));
589	–	done.countDown();
637		}
638		}
639
#	Line 594 | Line 641 | public class ScheduledExecutorTest exten
641		* purge eventually removes cancelled tasks from the queue
642		*/
643		public void testPurge() throws InterruptedException {
644	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
645	<	ScheduledFuture[] tasks = new ScheduledFuture[5];
646	<	for (int i = 0; i < tasks.length; i++)
647	<	tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
648	<	LONG_DELAY_MS, MILLISECONDS);
649	<	try {
644	>	final ScheduledFuture[] tasks = new ScheduledFuture[5];
645	>	final Runnable releaser = new Runnable() { public void run() {
646	>	for (ScheduledFuture task : tasks)
647	>	if (task != null) task.cancel(true); }};
648	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
649	>	try (PoolCleaner cleaner = cleaner(p, releaser)) {
650	>	for (int i = 0; i < tasks.length; i++)
651	>	tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
652	>	LONG_DELAY_MS, MILLISECONDS);
653		int max = tasks.length;
654		if (tasks[4].cancel(true)) --max;
655		if (tasks[3].cancel(true)) --max;
#	Line 611 | Line 661 | public class ScheduledExecutorTest exten
661		long count = p.getTaskCount();
662		if (count == max)
663		return;
664	<	} while (millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
664	>	} while (millisElapsedSince(startTime) < LONG_DELAY_MS);
665		fail("Purge failed to remove cancelled tasks");
616	–	} finally {
617	–	for (ScheduledFuture task : tasks)
618	–	task.cancel(true);
619	–	joinPool(p);
666		}
667		}
668
#	Line 630 | Line 676 | public class ScheduledExecutorTest exten
676		final AtomicInteger ran = new AtomicInteger(0);
677		final ScheduledThreadPoolExecutor p =
678		new ScheduledThreadPoolExecutor(poolSize);
679	<	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
679	>	final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
680		Runnable waiter = new CheckedRunnable() { public void realRun() {
681		threadsStarted.countDown();
682		try {
#	Line 640 | Line 686 | public class ScheduledExecutorTest exten
686		}};
687		for (int i = 0; i < count; i++)
688		p.execute(waiter);
689	<	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
689	>	await(threadsStarted);
690		assertEquals(poolSize, p.getActiveCount());
691		assertEquals(0, p.getCompletedTaskCount());
692		final List<Runnable> queuedTasks;
#	Line 663 | Line 709 | public class ScheduledExecutorTest exten
709		* and those tasks are drained from the queue
710		*/
711		public void testShutdownNow_delayedTasks() throws InterruptedException {
712	<	ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
712	>	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
713		List<ScheduledFuture> tasks = new ArrayList<>();
714		for (int i = 0; i < 3; i++) {
715		Runnable r = new NoOpRunnable();
#	Line 700 | Line 746 | public class ScheduledExecutorTest exten
746		* - setContinueExistingPeriodicTasksAfterShutdownPolicy
747		*/
748		public void testShutdown_cancellation() throws Exception {
749	<	Boolean[] allBooleans = { null, Boolean.FALSE, Boolean.TRUE };
704	<	for (Boolean policy : allBooleans)
705	<	{
706	<	final int poolSize = 2;
749	>	final int poolSize = 6;
750		final ScheduledThreadPoolExecutor p
751		= new ScheduledThreadPoolExecutor(poolSize);
752	<	final boolean effectiveDelayedPolicy = (policy != Boolean.FALSE);
753	<	final boolean effectivePeriodicPolicy = (policy == Boolean.TRUE);
754	<	final boolean effectiveRemovePolicy = (policy == Boolean.TRUE);
755	<	if (policy != null) {
756	<	p.setExecuteExistingDelayedTasksAfterShutdownPolicy(policy);
757	<	p.setContinueExistingPeriodicTasksAfterShutdownPolicy(policy);
758	<	p.setRemoveOnCancelPolicy(policy);
759	<	}
752	>	final BlockingQueue<Runnable> q = p.getQueue();
753	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
754	>	final boolean effectiveDelayedPolicy;
755	>	final boolean effectivePeriodicPolicy;
756	>	final boolean effectiveRemovePolicy;
757	>
758	>	if (rnd.nextBoolean())
759	>	p.setExecuteExistingDelayedTasksAfterShutdownPolicy(
760	>	effectiveDelayedPolicy = rnd.nextBoolean());
761	>	else
762	>	effectiveDelayedPolicy = true;
763		assertEquals(effectiveDelayedPolicy,
764		p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
765	+
766	+	if (rnd.nextBoolean())
767	+	p.setContinueExistingPeriodicTasksAfterShutdownPolicy(
768	+	effectivePeriodicPolicy = rnd.nextBoolean());
769	+	else
770	+	effectivePeriodicPolicy = false;
771		assertEquals(effectivePeriodicPolicy,
772		p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
773	+
774	+	if (rnd.nextBoolean())
775	+	p.setRemoveOnCancelPolicy(
776	+	effectiveRemovePolicy = rnd.nextBoolean());
777	+	else
778	+	effectiveRemovePolicy = false;
779		assertEquals(effectiveRemovePolicy,
780		p.getRemoveOnCancelPolicy());
781	<	// Strategy: Wedge the pool with poolSize "blocker" threads
781	>
782	>	// System.err.println("effectiveDelayedPolicy="+effectiveDelayedPolicy);
783	>	// System.err.println("effectivePeriodicPolicy="+effectivePeriodicPolicy);
784	>	// System.err.println("effectiveRemovePolicy="+effectiveRemovePolicy);
785	>
786	>	// Strategy: Wedge the pool with one wave of "blocker" tasks,
787	>	// then add a second wave that waits in the queue.
788		final AtomicInteger ran = new AtomicInteger(0);
789		final CountDownLatch poolBlocked = new CountDownLatch(poolSize);
790		final CountDownLatch unblock = new CountDownLatch(1);
791	<	final CountDownLatch periodicLatch1 = new CountDownLatch(2);
792	<	final CountDownLatch periodicLatch2 = new CountDownLatch(2);
793	<	Runnable task = new CheckedRunnable() { public void realRun()
794	<	throws InterruptedException {
795	<	poolBlocked.countDown();
796	<	assertTrue(unblock.await(LONG_DELAY_MS, MILLISECONDS));
797	<	ran.getAndIncrement();
798	<	}};
799	<	List<Future<?>> blockers = new ArrayList<>();
800	<	List<Future<?>> periodics = new ArrayList<>();
801	<	List<Future<?>> delayeds = new ArrayList<>();
802	<	for (int i = 0; i < poolSize; i++)
803	<	blockers.add(p.submit(task));
804	<	assertTrue(poolBlocked.await(LONG_DELAY_MS, MILLISECONDS));
805	<
806	<	periodics.add(p.scheduleAtFixedRate(countDowner(periodicLatch1),
807	<	1, 1, MILLISECONDS));
808	<	periodics.add(p.scheduleWithFixedDelay(countDowner(periodicLatch2),
809	<	1, 1, MILLISECONDS));
791	>
792	>	class Task extends CheckedRunnable {
793	>	public void realRun() throws InterruptedException {
794	>	ran.getAndIncrement();
795	>	poolBlocked.countDown();
796	>	await(unblock);
797	>	}
798	>	}
799	>
800	>	class PeriodicTask extends Task {
801	>	PeriodicTask(int rounds) { this.rounds = rounds; }
802	>	int rounds;
803	>	public void realRun() throws InterruptedException {
804	>	if (--rounds == 0) super.realRun();
805	>	}
806	>	}
807	>
808	>	Runnable task = new Task();
809	>
810	>	List<Future<?>> immediates = new ArrayList<>();
811	>	List<Future<?>> delayeds   = new ArrayList<>();
812	>	List<Future<?>> periodics  = new ArrayList<>();
813	>
814	>	immediates.add(p.submit(task));
815		delayeds.add(p.schedule(task, 1, MILLISECONDS));
816	+	for (int rounds : new int[] { 1, 2 }) {
817	+	periodics.add(p.scheduleAtFixedRate(
818	+	new PeriodicTask(rounds), 1, 1, MILLISECONDS));
819	+	periodics.add(p.scheduleWithFixedDelay(
820	+	new PeriodicTask(rounds), 1, 1, MILLISECONDS));
821	+	}
822	+
823	+	await(poolBlocked);
824	+
825	+	assertEquals(poolSize, ran.get());
826	+	assertTrue(q.isEmpty());
827	+
828	+	// Add second wave of tasks.
829	+	immediates.add(p.submit(task));
830	+	long delay_ms = effectiveDelayedPolicy ? 1 : LONG_DELAY_MS;
831	+	delayeds.add(p.schedule(task, delay_ms, MILLISECONDS));
832	+	for (int rounds : new int[] { 1, 2 }) {
833	+	periodics.add(p.scheduleAtFixedRate(
834	+	new PeriodicTask(rounds), 1, 1, MILLISECONDS));
835	+	periodics.add(p.scheduleWithFixedDelay(
836	+	new PeriodicTask(rounds), 1, 1, MILLISECONDS));
837	+	}
838	+
839	+	assertEquals(poolSize, q.size());
840	+	assertEquals(poolSize, ran.get());
841	+
842	+	immediates.forEach(
843	+	f -> assertTrue(((ScheduledFuture)f).getDelay(NANOSECONDS) <= 0L));
844	+
845	+	Stream.of(immediates, delayeds, periodics).flatMap(c -> c.stream())
846	+	.forEach(f -> assertFalse(f.isDone()));
847
748	–	assertTrue(p.getQueue().containsAll(periodics));
749	–	assertTrue(p.getQueue().containsAll(delayeds));
848		try { p.shutdown(); } catch (SecurityException ok) { return; }
849		assertTrue(p.isShutdown());
850	+	assertTrue(p.isTerminating());
851		assertFalse(p.isTerminated());
852	<	for (Future<?> periodic : periodics) {
853	<	assertTrue(effectivePeriodicPolicy ^ periodic.isCancelled());
854	<	assertTrue(effectivePeriodicPolicy ^ periodic.isDone());
855	<	}
856	<	for (Future<?> delayed : delayeds) {
857	<	assertTrue(effectiveDelayedPolicy ^ delayed.isCancelled());
858	<	assertTrue(effectiveDelayedPolicy ^ delayed.isDone());
859	<	}
852	>
853	>	if (rnd.nextBoolean())
854	>	assertThrows(
855	>	RejectedExecutionException.class,
856	>	() -> p.submit(task),
857	>	() -> p.schedule(task, 1, SECONDS),
858	>	() -> p.scheduleAtFixedRate(
859	>	new PeriodicTask(1), 1, 1, SECONDS),
860	>	() -> p.scheduleWithFixedDelay(
861	>	new PeriodicTask(2), 1, 1, SECONDS));
862	>
863	>	assertTrue(q.contains(immediates.get(1)));
864	>	assertTrue(!effectiveDelayedPolicy
865	>	^ q.contains(delayeds.get(1)));
866	>	assertTrue(!effectivePeriodicPolicy
867	>	^ q.containsAll(periodics.subList(4, 8)));
868	>
869	>	immediates.forEach(f -> assertFalse(f.isDone()));
870	>
871	>	assertFalse(delayeds.get(0).isDone());
872	>	if (effectiveDelayedPolicy)
873	>	assertFalse(delayeds.get(1).isDone());
874	>	else
875	>	assertTrue(delayeds.get(1).isCancelled());
876	>
877		if (testImplementationDetails) {
878	<	assertEquals(effectivePeriodicPolicy,
879	<	p.getQueue().containsAll(periodics));
880	<	assertEquals(effectiveDelayedPolicy,
881	<	p.getQueue().containsAll(delayeds));
882	<	}
883	<	// Release all pool threads
884	<	unblock.countDown();
885	<
886	<	for (Future<?> delayed : delayeds) {
887	<	if (effectiveDelayedPolicy) {
772	<	assertNull(delayed.get());
773	<	}
774	<	}
775	<	if (effectivePeriodicPolicy) {
776	<	assertTrue(periodicLatch1.await(LONG_DELAY_MS, MILLISECONDS));
777	<	assertTrue(periodicLatch2.await(LONG_DELAY_MS, MILLISECONDS));
778	<	for (Future<?> periodic : periodics) {
779	<	assertTrue(periodic.cancel(false));
780	<	assertTrue(periodic.isCancelled());
781	<	assertTrue(periodic.isDone());
878	>	if (effectivePeriodicPolicy)
879	>	// TODO: ensure periodic tasks continue executing
880	>	periodics.forEach(
881	>	f -> {
882	>	assertFalse(f.isDone());
883	>	assertTrue(f.cancel(false));
884	>	});
885	>	else {
886	>	periodics.subList(0, 4).forEach(f -> assertFalse(f.isDone()));
887	>	periodics.subList(4, 8).forEach(f -> assertTrue(f.isCancelled()));
888		}
889		}
890	+
891	+	unblock.countDown();    // Release all pool threads
892	+
893		assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
894	+	assertFalse(p.isTerminating());
895		assertTrue(p.isTerminated());
896	<	assertEquals(2 + (effectiveDelayedPolicy ? 1 : 0), ran.get());
897	<	}}
896	>
897	>	assertTrue(q.isEmpty());
898	>
899	>	for (Future<?> f : immediates) assertNull(f.get());
900	>
901	>	assertNull(delayeds.get(0).get());
902	>	if (effectiveDelayedPolicy)
903	>	assertNull(delayeds.get(1).get());
904	>	else
905	>	assertTrue(delayeds.get(1).isCancelled());
906	>
907	>	periodics.forEach(f -> assertTrue(f.isDone()));
908	>	periodics.forEach(f -> assertTrue(f.isCancelled()));
909	>
910	>	assertEquals(poolSize + 1 + (effectiveDelayedPolicy ? 1 : 0), ran.get());
911	>	}
912
913		/**
914		* completed submit of callable returns result
#	Line 855 | Line 979 | public class ScheduledExecutorTest exten
979		CountDownLatch latch = new CountDownLatch(1);
980		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
981		try (PoolCleaner cleaner = cleaner(e)) {
982	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
982	>	List<Callable<String>> l = new ArrayList<>();
983		l.add(latchAwaitingStringTask(latch));
984		l.add(null);
985		try {
#	Line 872 | Line 996 | public class ScheduledExecutorTest exten
996		public void testInvokeAny4() throws Exception {
997		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
998		try (PoolCleaner cleaner = cleaner(e)) {
999	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
999	>	List<Callable<String>> l = new ArrayList<>();
1000		l.add(new NPETask());
1001		try {
1002		e.invokeAny(l);
#	Line 889 | Line 1013 | public class ScheduledExecutorTest exten
1013		public void testInvokeAny5() throws Exception {
1014		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1015		try (PoolCleaner cleaner = cleaner(e)) {
1016	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1016	>	List<Callable<String>> l = new ArrayList<>();
1017		l.add(new StringTask());
1018		l.add(new StringTask());
1019		String result = e.invokeAny(l);
#	Line 927 | Line 1051 | public class ScheduledExecutorTest exten
1051		public void testInvokeAll3() throws Exception {
1052		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1053		try (PoolCleaner cleaner = cleaner(e)) {
1054	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1054	>	List<Callable<String>> l = new ArrayList<>();
1055		l.add(new StringTask());
1056		l.add(null);
1057		try {
#	Line 943 | Line 1067 | public class ScheduledExecutorTest exten
1067		public void testInvokeAll4() throws Exception {
1068		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1069		try (PoolCleaner cleaner = cleaner(e)) {
1070	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1070	>	List<Callable<String>> l = new ArrayList<>();
1071		l.add(new NPETask());
1072		List<Future<String>> futures = e.invokeAll(l);
1073		assertEquals(1, futures.size());
#	Line 962 | Line 1086 | public class ScheduledExecutorTest exten
1086		public void testInvokeAll5() throws Exception {
1087		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1088		try (PoolCleaner cleaner = cleaner(e)) {
1089	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1089	>	List<Callable<String>> l = new ArrayList<>();
1090		l.add(new StringTask());
1091		l.add(new StringTask());
1092		List<Future<String>> futures = e.invokeAll(l);
#	Line 991 | Line 1115 | public class ScheduledExecutorTest exten
1115		public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1116		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1117		try (PoolCleaner cleaner = cleaner(e)) {
1118	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1118	>	List<Callable<String>> l = new ArrayList<>();
1119		l.add(new StringTask());
1120		try {
1121		e.invokeAny(l, MEDIUM_DELAY_MS, null);
#	Line 1020 | Line 1144 | public class ScheduledExecutorTest exten
1144		CountDownLatch latch = new CountDownLatch(1);
1145		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1146		try (PoolCleaner cleaner = cleaner(e)) {
1147	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1147	>	List<Callable<String>> l = new ArrayList<>();
1148		l.add(latchAwaitingStringTask(latch));
1149		l.add(null);
1150		try {
#	Line 1037 | Line 1161 | public class ScheduledExecutorTest exten
1161		public void testTimedInvokeAny4() throws Exception {
1162		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1163		try (PoolCleaner cleaner = cleaner(e)) {
1164	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1164	>	long startTime = System.nanoTime();
1165	>	List<Callable<String>> l = new ArrayList<>();
1166		l.add(new NPETask());
1167		try {
1168	<	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1168	>	e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1169		shouldThrow();
1170		} catch (ExecutionException success) {
1171		assertTrue(success.getCause() instanceof NullPointerException);
1172		}
1173	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1174		}
1175		}
1176
#	Line 1054 | Line 1180 | public class ScheduledExecutorTest exten
1180		public void testTimedInvokeAny5() throws Exception {
1181		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1182		try (PoolCleaner cleaner = cleaner(e)) {
1183	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1183	>	long startTime = System.nanoTime();
1184	>	List<Callable<String>> l = new ArrayList<>();
1185		l.add(new StringTask());
1186		l.add(new StringTask());
1187	<	String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1187	>	String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1188		assertSame(TEST_STRING, result);
1189	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1190		}
1191		}
1192
#	Line 1081 | Line 1209 | public class ScheduledExecutorTest exten
1209		public void testTimedInvokeAllNullTimeUnit() throws Exception {
1210		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1211		try (PoolCleaner cleaner = cleaner(e)) {
1212	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1212	>	List<Callable<String>> l = new ArrayList<>();
1213		l.add(new StringTask());
1214		try {
1215		e.invokeAll(l, MEDIUM_DELAY_MS, null);
#	Line 1108 | Line 1236 | public class ScheduledExecutorTest exten
1236		public void testTimedInvokeAll3() throws Exception {
1237		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1238		try (PoolCleaner cleaner = cleaner(e)) {
1239	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1239	>	List<Callable<String>> l = new ArrayList<>();
1240		l.add(new StringTask());
1241		l.add(null);
1242		try {
#	Line 1124 | Line 1252 | public class ScheduledExecutorTest exten
1252		public void testTimedInvokeAll4() throws Exception {
1253		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1254		try (PoolCleaner cleaner = cleaner(e)) {
1255	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1255	>	List<Callable<String>> l = new ArrayList<>();
1256		l.add(new NPETask());
1257		List<Future<String>> futures =
1258	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1258	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1259		assertEquals(1, futures.size());
1260		try {
1261		futures.get(0).get();
#	Line 1144 | Line 1272 | public class ScheduledExecutorTest exten
1272		public void testTimedInvokeAll5() throws Exception {
1273		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1274		try (PoolCleaner cleaner = cleaner(e)) {
1275	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1275	>	List<Callable<String>> l = new ArrayList<>();
1276		l.add(new StringTask());
1277		l.add(new StringTask());
1278		List<Future<String>> futures =
#	Line 1159 | Line 1287 | public class ScheduledExecutorTest exten
1287		* timed invokeAll(c) cancels tasks not completed by timeout
1288		*/
1289		public void testTimedInvokeAll6() throws Exception {
1290	<	final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1291	<	try (PoolCleaner cleaner = cleaner(e)) {
1292	<	for (long timeout = timeoutMillis();;) {
1290	>	for (long timeout = timeoutMillis();;) {
1291	>	final CountDownLatch done = new CountDownLatch(1);
1292	>	final Callable<String> waiter = new CheckedCallable<String>() {
1293	>	public String realCall() {
1294	>	try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1295	>	catch (InterruptedException ok) {}
1296	>	return "1"; }};
1297	>	final ExecutorService p = new ScheduledThreadPoolExecutor(2);
1298	>	try (PoolCleaner cleaner = cleaner(p, done)) {
1299		List<Callable<String>> tasks = new ArrayList<>();
1300		tasks.add(new StringTask("0"));
1301	<	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1301	>	tasks.add(waiter);
1302		tasks.add(new StringTask("2"));
1303		long startTime = System.nanoTime();
1304		List<Future<String>> futures =
1305	<	e.invokeAll(tasks, timeout, MILLISECONDS);
1305	>	p.invokeAll(tasks, timeout, MILLISECONDS);
1306		assertEquals(tasks.size(), futures.size());
1307		assertTrue(millisElapsedSince(startTime) >= timeout);
1308		for (Future future : futures)
#	Line 1187 | Line 1321 | public class ScheduledExecutorTest exten
1321		}
1322		}
1323
1324	+	/**
1325	+	* A fixed delay task with overflowing period should not prevent a
1326	+	* one-shot task from executing.
1327	+	* https://bugs.openjdk.java.net/browse/JDK-8051859
1328	+	*/
1329	+	public void testScheduleWithFixedDelay_overflow() throws Exception {
1330	+	final CountDownLatch delayedDone = new CountDownLatch(1);
1331	+	final CountDownLatch immediateDone = new CountDownLatch(1);
1332	+	final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
1333	+	try (PoolCleaner cleaner = cleaner(p)) {
1334	+	final Runnable immediate = new Runnable() { public void run() {
1335	+	immediateDone.countDown();
1336	+	}};
1337	+	final Runnable delayed = new Runnable() { public void run() {
1338	+	delayedDone.countDown();
1339	+	p.submit(immediate);
1340	+	}};
1341	+	p.scheduleWithFixedDelay(delayed, 0L, Long.MAX_VALUE, SECONDS);
1342	+	await(delayedDone);
1343	+	await(immediateDone);
1344	+	}
1345	+	}
1346	+
1347		}

Diff Legend

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