ViewVC Help

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

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

Comparing jsr166/src/test/tck/ThreadPoolExecutorTest.java (file contents):
Revision 1.59 by jsr166, Mon Sep 14 03:14:43 2015 UTC vs.
Revision 1.95 by jsr166, Sun Oct 4 03:58:22 2015 UTC

#	Line 29 | Line 29 | import java.util.concurrent.SynchronousQ
29		import java.util.concurrent.ThreadFactory;
30		import java.util.concurrent.ThreadPoolExecutor;
31		import java.util.concurrent.TimeUnit;
32	+	import java.util.concurrent.atomic.AtomicInteger;
33
34		import junit.framework.Test;
35		import junit.framework.TestSuite;
#	Line 86 | Line 87 | public class ThreadPoolExecutorTest exte
87		new ThreadPoolExecutor(1, 1,
88		LONG_DELAY_MS, MILLISECONDS,
89		new ArrayBlockingQueue<Runnable>(10));
90	<	final CountDownLatch done = new CountDownLatch(1);
91	<	final Runnable task = new CheckedRunnable() {
92	<	public void realRun() {
93	<	done.countDown();
93	<	}};
94	<	try {
90	>	try (PoolCleaner cleaner = cleaner(p)) {
91	>	final CountDownLatch done = new CountDownLatch(1);
92	>	final Runnable task = new CheckedRunnable() {
93	>	public void realRun() { done.countDown(); }};
94		p.execute(task);
95	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
97	<	} finally {
98	<	joinPool(p);
95	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
96		}
97		}
98
#	Line 108 | Line 105 | public class ThreadPoolExecutorTest exte
105		new ThreadPoolExecutor(2, 2,
106		LONG_DELAY_MS, MILLISECONDS,
107		new ArrayBlockingQueue<Runnable>(10));
108	<	final CountDownLatch threadStarted = new CountDownLatch(1);
109	<	final CountDownLatch done = new CountDownLatch(1);
110	<	try {
108	>	try (PoolCleaner cleaner = cleaner(p)) {
109	>	final CountDownLatch threadStarted = new CountDownLatch(1);
110	>	final CountDownLatch done = new CountDownLatch(1);
111		assertEquals(0, p.getActiveCount());
112		p.execute(new CheckedRunnable() {
113		public void realRun() throws InterruptedException {
#	Line 118 | Line 115 | public class ThreadPoolExecutorTest exte
115		assertEquals(1, p.getActiveCount());
116		done.await();
117		}});
118	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
118	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
119		assertEquals(1, p.getActiveCount());
123	–	} finally {
120		done.countDown();
125	–	joinPool(p);
121		}
122		}
123
#	Line 131 | Line 126 | public class ThreadPoolExecutorTest exte
126		*/
127		public void testPrestartCoreThread() {
128		final ThreadPoolExecutor p =
129	<	new ThreadPoolExecutor(2, 2,
129	>	new ThreadPoolExecutor(2, 6,
130		LONG_DELAY_MS, MILLISECONDS,
131		new ArrayBlockingQueue<Runnable>(10));
132	<	assertEquals(0, p.getPoolSize());
133	<	assertTrue(p.prestartCoreThread());
134	<	assertEquals(1, p.getPoolSize());
135	<	assertTrue(p.prestartCoreThread());
136	<	assertEquals(2, p.getPoolSize());
137	<	assertFalse(p.prestartCoreThread());
138	<	assertEquals(2, p.getPoolSize());
139	<	joinPool(p);
132	>	try (PoolCleaner cleaner = cleaner(p)) {
133	>	assertEquals(0, p.getPoolSize());
134	>	assertTrue(p.prestartCoreThread());
135	>	assertEquals(1, p.getPoolSize());
136	>	assertTrue(p.prestartCoreThread());
137	>	assertEquals(2, p.getPoolSize());
138	>	assertFalse(p.prestartCoreThread());
139	>	assertEquals(2, p.getPoolSize());
140	>	p.setCorePoolSize(4);
141	>	assertTrue(p.prestartCoreThread());
142	>	assertEquals(3, p.getPoolSize());
143	>	assertTrue(p.prestartCoreThread());
144	>	assertEquals(4, p.getPoolSize());
145	>	assertFalse(p.prestartCoreThread());
146	>	assertEquals(4, p.getPoolSize());
147	>	}
148		}
149
150		/**
#	Line 149 | Line 152 | public class ThreadPoolExecutorTest exte
152		*/
153		public void testPrestartAllCoreThreads() {
154		final ThreadPoolExecutor p =
155	<	new ThreadPoolExecutor(2, 2,
155	>	new ThreadPoolExecutor(2, 6,
156		LONG_DELAY_MS, MILLISECONDS,
157		new ArrayBlockingQueue<Runnable>(10));
158	<	assertEquals(0, p.getPoolSize());
159	<	p.prestartAllCoreThreads();
160	<	assertEquals(2, p.getPoolSize());
161	<	p.prestartAllCoreThreads();
162	<	assertEquals(2, p.getPoolSize());
163	<	joinPool(p);
158	>	try (PoolCleaner cleaner = cleaner(p)) {
159	>	assertEquals(0, p.getPoolSize());
160	>	p.prestartAllCoreThreads();
161	>	assertEquals(2, p.getPoolSize());
162	>	p.prestartAllCoreThreads();
163	>	assertEquals(2, p.getPoolSize());
164	>	p.setCorePoolSize(4);
165	>	p.prestartAllCoreThreads();
166	>	assertEquals(4, p.getPoolSize());
167	>	p.prestartAllCoreThreads();
168	>	assertEquals(4, p.getPoolSize());
169	>	}
170		}
171
172		/**
#	Line 169 | Line 178 | public class ThreadPoolExecutorTest exte
178		new ThreadPoolExecutor(2, 2,
179		LONG_DELAY_MS, MILLISECONDS,
180		new ArrayBlockingQueue<Runnable>(10));
181	<	final CountDownLatch threadStarted = new CountDownLatch(1);
182	<	final CountDownLatch threadProceed = new CountDownLatch(1);
183	<	final CountDownLatch threadDone = new CountDownLatch(1);
184	<	try {
181	>	try (PoolCleaner cleaner = cleaner(p)) {
182	>	final CountDownLatch threadStarted = new CountDownLatch(1);
183	>	final CountDownLatch threadProceed = new CountDownLatch(1);
184	>	final CountDownLatch threadDone = new CountDownLatch(1);
185		assertEquals(0, p.getCompletedTaskCount());
186		p.execute(new CheckedRunnable() {
187		public void realRun() throws InterruptedException {
#	Line 191 | Line 200 | public class ThreadPoolExecutorTest exte
200		fail("timed out");
201		Thread.yield();
202		}
194	–	} finally {
195	–	joinPool(p);
203		}
204		}
205
#	Line 204 | Line 211 | public class ThreadPoolExecutorTest exte
211		new ThreadPoolExecutor(1, 1,
212		LONG_DELAY_MS, MILLISECONDS,
213		new ArrayBlockingQueue<Runnable>(10));
214	<	assertEquals(1, p.getCorePoolSize());
215	<	joinPool(p);
214	>	try (PoolCleaner cleaner = cleaner(p)) {
215	>	assertEquals(1, p.getCorePoolSize());
216	>	}
217		}
218
219		/**
#	Line 216 | Line 224 | public class ThreadPoolExecutorTest exte
224		new ThreadPoolExecutor(2, 2,
225		1000, MILLISECONDS,
226		new ArrayBlockingQueue<Runnable>(10));
227	<	assertEquals(1, p.getKeepAliveTime(SECONDS));
228	<	joinPool(p);
227	>	try (PoolCleaner cleaner = cleaner(p)) {
228	>	assertEquals(1, p.getKeepAliveTime(SECONDS));
229	>	}
230		}
231
232		/**
233		* getThreadFactory returns factory in constructor if not set
234		*/
235		public void testGetThreadFactory() {
236	<	ThreadFactory tf = new SimpleThreadFactory();
236	>	ThreadFactory threadFactory = new SimpleThreadFactory();
237		final ThreadPoolExecutor p =
238		new ThreadPoolExecutor(1, 2,
239		LONG_DELAY_MS, MILLISECONDS,
240		new ArrayBlockingQueue<Runnable>(10),
241	<	tf,
241	>	threadFactory,
242		new NoOpREHandler());
243	<	assertSame(tf, p.getThreadFactory());
244	<	joinPool(p);
243	>	try (PoolCleaner cleaner = cleaner(p)) {
244	>	assertSame(threadFactory, p.getThreadFactory());
245	>	}
246		}
247
248		/**
#	Line 243 | Line 253 | public class ThreadPoolExecutorTest exte
253		new ThreadPoolExecutor(1, 2,
254		LONG_DELAY_MS, MILLISECONDS,
255		new ArrayBlockingQueue<Runnable>(10));
256	<	ThreadFactory tf = new SimpleThreadFactory();
257	<	p.setThreadFactory(tf);
258	<	assertSame(tf, p.getThreadFactory());
259	<	joinPool(p);
256	>	try (PoolCleaner cleaner = cleaner(p)) {
257	>	ThreadFactory threadFactory = new SimpleThreadFactory();
258	>	p.setThreadFactory(threadFactory);
259	>	assertSame(threadFactory, p.getThreadFactory());
260	>	}
261		}
262
263		/**
#	Line 257 | Line 268 | public class ThreadPoolExecutorTest exte
268		new ThreadPoolExecutor(1, 2,
269		LONG_DELAY_MS, MILLISECONDS,
270		new ArrayBlockingQueue<Runnable>(10));
271	<	try {
272	<	p.setThreadFactory(null);
273	<	shouldThrow();
274	<	} catch (NullPointerException success) {
275	<	} finally {
265	<	joinPool(p);
271	>	try (PoolCleaner cleaner = cleaner(p)) {
272	>	try {
273	>	p.setThreadFactory(null);
274	>	shouldThrow();
275	>	} catch (NullPointerException success) {}
276		}
277		}
278
#	Line 270 | Line 280 | public class ThreadPoolExecutorTest exte
280		* getRejectedExecutionHandler returns handler in constructor if not set
281		*/
282		public void testGetRejectedExecutionHandler() {
283	<	final RejectedExecutionHandler h = new NoOpREHandler();
283	>	final RejectedExecutionHandler handler = new NoOpREHandler();
284		final ThreadPoolExecutor p =
285		new ThreadPoolExecutor(1, 2,
286		LONG_DELAY_MS, MILLISECONDS,
287		new ArrayBlockingQueue<Runnable>(10),
288	<	h);
289	<	assertSame(h, p.getRejectedExecutionHandler());
290	<	joinPool(p);
288	>	handler);
289	>	try (PoolCleaner cleaner = cleaner(p)) {
290	>	assertSame(handler, p.getRejectedExecutionHandler());
291	>	}
292		}
293
294		/**
#	Line 289 | Line 300 | public class ThreadPoolExecutorTest exte
300		new ThreadPoolExecutor(1, 2,
301		LONG_DELAY_MS, MILLISECONDS,
302		new ArrayBlockingQueue<Runnable>(10));
303	<	RejectedExecutionHandler h = new NoOpREHandler();
304	<	p.setRejectedExecutionHandler(h);
305	<	assertSame(h, p.getRejectedExecutionHandler());
306	<	joinPool(p);
303	>	try (PoolCleaner cleaner = cleaner(p)) {
304	>	RejectedExecutionHandler handler = new NoOpREHandler();
305	>	p.setRejectedExecutionHandler(handler);
306	>	assertSame(handler, p.getRejectedExecutionHandler());
307	>	}
308		}
309
310		/**
#	Line 303 | Line 315 | public class ThreadPoolExecutorTest exte
315		new ThreadPoolExecutor(1, 2,
316		LONG_DELAY_MS, MILLISECONDS,
317		new ArrayBlockingQueue<Runnable>(10));
318	<	try {
319	<	p.setRejectedExecutionHandler(null);
320	<	shouldThrow();
321	<	} catch (NullPointerException success) {
322	<	} finally {
311	<	joinPool(p);
318	>	try (PoolCleaner cleaner = cleaner(p)) {
319	>	try {
320	>	p.setRejectedExecutionHandler(null);
321	>	shouldThrow();
322	>	} catch (NullPointerException success) {}
323		}
324		}
325
#	Line 322 | Line 333 | public class ThreadPoolExecutorTest exte
333		new ThreadPoolExecutor(THREADS, THREADS,
334		LONG_DELAY_MS, MILLISECONDS,
335		new ArrayBlockingQueue<Runnable>(10));
336	<	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
337	<	final CountDownLatch done = new CountDownLatch(1);
338	<	try {
336	>	try (PoolCleaner cleaner = cleaner(p)) {
337	>	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
338	>	final CountDownLatch done = new CountDownLatch(1);
339		assertEquals(0, p.getLargestPoolSize());
340		for (int i = 0; i < THREADS; i++)
341		p.execute(new CheckedRunnable() {
#	Line 333 | Line 344 | public class ThreadPoolExecutorTest exte
344		done.await();
345		assertEquals(THREADS, p.getLargestPoolSize());
346		}});
347	<	assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
337	<	assertEquals(THREADS, p.getLargestPoolSize());
338	<	} finally {
339	<	done.countDown();
340	<	joinPool(p);
347	>	assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
348		assertEquals(THREADS, p.getLargestPoolSize());
349	+	done.countDown();   // release pool
350		}
351	+	assertEquals(THREADS, p.getLargestPoolSize());
352		}
353
354		/**
#	Line 351 | Line 360 | public class ThreadPoolExecutorTest exte
360		new ThreadPoolExecutor(2, 3,
361		LONG_DELAY_MS, MILLISECONDS,
362		new ArrayBlockingQueue<Runnable>(10));
363	<	assertEquals(3, p.getMaximumPoolSize());
364	<	joinPool(p);
363	>	try (PoolCleaner cleaner = cleaner(p)) {
364	>	assertEquals(3, p.getMaximumPoolSize());
365	>	p.setMaximumPoolSize(5);
366	>	assertEquals(5, p.getMaximumPoolSize());
367	>	p.setMaximumPoolSize(4);
368	>	assertEquals(4, p.getMaximumPoolSize());
369	>	}
370		}
371
372		/**
#	Line 364 | Line 378 | public class ThreadPoolExecutorTest exte
378		new ThreadPoolExecutor(1, 1,
379		LONG_DELAY_MS, MILLISECONDS,
380		new ArrayBlockingQueue<Runnable>(10));
381	<	final CountDownLatch threadStarted = new CountDownLatch(1);
382	<	final CountDownLatch done = new CountDownLatch(1);
383	<	try {
381	>	try (PoolCleaner cleaner = cleaner(p)) {
382	>	final CountDownLatch threadStarted = new CountDownLatch(1);
383	>	final CountDownLatch done = new CountDownLatch(1);
384		assertEquals(0, p.getPoolSize());
385		p.execute(new CheckedRunnable() {
386		public void realRun() throws InterruptedException {
#	Line 374 | Line 388 | public class ThreadPoolExecutorTest exte
388		assertEquals(1, p.getPoolSize());
389		done.await();
390		}});
391	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
391	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
392		assertEquals(1, p.getPoolSize());
393	<	} finally {
380	<	done.countDown();
381	<	joinPool(p);
393	>	done.countDown();   // release pool
394		}
395		}
396
#	Line 390 | Line 402 | public class ThreadPoolExecutorTest exte
402		new ThreadPoolExecutor(1, 1,
403		LONG_DELAY_MS, MILLISECONDS,
404		new ArrayBlockingQueue<Runnable>(10));
405	<	final CountDownLatch threadStarted = new CountDownLatch(1);
406	<	final CountDownLatch done = new CountDownLatch(1);
407	<	try {
405	>	try (PoolCleaner cleaner = cleaner(p)) {
406	>	final CountDownLatch threadStarted = new CountDownLatch(1);
407	>	final CountDownLatch done = new CountDownLatch(1);
408		assertEquals(0, p.getTaskCount());
409		p.execute(new CheckedRunnable() {
410		public void realRun() throws InterruptedException {
#	Line 400 | Line 412 | public class ThreadPoolExecutorTest exte
412		assertEquals(1, p.getTaskCount());
413		done.await();
414		}});
415	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
415	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
416		assertEquals(1, p.getTaskCount());
405	–	} finally {
417		done.countDown();
407	–	joinPool(p);
418		}
419		}
420
#	Line 416 | Line 426 | public class ThreadPoolExecutorTest exte
426		new ThreadPoolExecutor(1, 1,
427		LONG_DELAY_MS, MILLISECONDS,
428		new ArrayBlockingQueue<Runnable>(10));
429	<	assertFalse(p.isShutdown());
430	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
431	<	assertTrue(p.isShutdown());
432	<	joinPool(p);
429	>	try (PoolCleaner cleaner = cleaner(p)) {
430	>	assertFalse(p.isShutdown());
431	>	try { p.shutdown(); } catch (SecurityException ok) { return; }
432	>	assertTrue(p.isShutdown());
433	>	}
434		}
435
436		/**
#	Line 430 | Line 441 | public class ThreadPoolExecutorTest exte
441		new ThreadPoolExecutor(1, 1,
442		LONG_DELAY_MS, MILLISECONDS,
443		new ArrayBlockingQueue<Runnable>(10));
444	<	assertFalse(p.isTerminated());
445	<	assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
446	<	assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
447	<	assertFalse(p.awaitTermination(-1L, NANOSECONDS));
448	<	assertFalse(p.awaitTermination(-1L, MILLISECONDS));
449	<	assertFalse(p.awaitTermination(0L, NANOSECONDS));
450	<	assertFalse(p.awaitTermination(0L, MILLISECONDS));
451	<	long timeoutNanos = 999999L;
452	<	long startTime = System.nanoTime();
453	<	assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
454	<	assertTrue(System.nanoTime() - startTime >= timeoutNanos);
455	<	assertFalse(p.isTerminated());
456	<	startTime = System.nanoTime();
457	<	long timeoutMillis = timeoutMillis();
458	<	assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
459	<	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
460	<	assertFalse(p.isTerminated());
461	<	p.shutdown();
462	<	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
463	<	assertTrue(p.isTerminated());
444	>	try (PoolCleaner cleaner = cleaner(p)) {
445	>	assertFalse(p.isTerminated());
446	>	assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
447	>	assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
448	>	assertFalse(p.awaitTermination(-1L, NANOSECONDS));
449	>	assertFalse(p.awaitTermination(-1L, MILLISECONDS));
450	>	assertFalse(p.awaitTermination(0L, NANOSECONDS));
451	>	assertFalse(p.awaitTermination(0L, MILLISECONDS));
452	>	long timeoutNanos = 999999L;
453	>	long startTime = System.nanoTime();
454	>	assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
455	>	assertTrue(System.nanoTime() - startTime >= timeoutNanos);
456	>	assertFalse(p.isTerminated());
457	>	startTime = System.nanoTime();
458	>	long timeoutMillis = timeoutMillis();
459	>	assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
460	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
461	>	assertFalse(p.isTerminated());
462	>	try { p.shutdown(); } catch (SecurityException ok) { return; }
463	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
464	>	assertTrue(p.isTerminated());
465	>	}
466		}
467
468		/**
#	Line 460 | Line 473 | public class ThreadPoolExecutorTest exte
473		new ThreadPoolExecutor(1, 1,
474		LONG_DELAY_MS, MILLISECONDS,
475		new ArrayBlockingQueue<Runnable>(10));
476	<	final CountDownLatch threadStarted = new CountDownLatch(1);
477	<	final CountDownLatch done = new CountDownLatch(1);
478	<	assertFalse(p.isTerminated());
479	<	try {
476	>	try (PoolCleaner cleaner = cleaner(p)) {
477	>	final CountDownLatch threadStarted = new CountDownLatch(1);
478	>	final CountDownLatch done = new CountDownLatch(1);
479	>	assertFalse(p.isTerminating());
480		p.execute(new CheckedRunnable() {
481		public void realRun() throws InterruptedException {
482	<	assertFalse(p.isTerminated());
482	>	assertFalse(p.isTerminating());
483		threadStarted.countDown();
484		done.await();
485		}});
486	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
486	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
487		assertFalse(p.isTerminating());
488		done.countDown();
476	–	} finally {
489		try { p.shutdown(); } catch (SecurityException ok) { return; }
490	+	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
491	+	assertTrue(p.isTerminated());
492	+	assertFalse(p.isTerminating());
493		}
479	–	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
480	–	assertTrue(p.isTerminated());
494		}
495
496		/**
#	Line 488 | Line 501 | public class ThreadPoolExecutorTest exte
501		new ThreadPoolExecutor(1, 1,
502		LONG_DELAY_MS, MILLISECONDS,
503		new ArrayBlockingQueue<Runnable>(10));
504	<	final CountDownLatch threadStarted = new CountDownLatch(1);
505	<	final CountDownLatch done = new CountDownLatch(1);
506	<	try {
504	>	try (PoolCleaner cleaner = cleaner(p)) {
505	>	final CountDownLatch threadStarted = new CountDownLatch(1);
506	>	final CountDownLatch done = new CountDownLatch(1);
507		assertFalse(p.isTerminating());
508		p.execute(new CheckedRunnable() {
509		public void realRun() throws InterruptedException {
#	Line 498 | Line 511 | public class ThreadPoolExecutorTest exte
511		threadStarted.countDown();
512		done.await();
513		}});
514	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
514	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
515		assertFalse(p.isTerminating());
516		done.countDown();
504	–	} finally {
517		try { p.shutdown(); } catch (SecurityException ok) { return; }
518	+	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
519	+	assertTrue(p.isTerminated());
520	+	assertFalse(p.isTerminating());
521		}
507	–	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
508	–	assertTrue(p.isTerminated());
509	–	assertFalse(p.isTerminating());
522		}
523
524		/**
#	Line 518 | Line 530 | public class ThreadPoolExecutorTest exte
530		new ThreadPoolExecutor(1, 1,
531		LONG_DELAY_MS, MILLISECONDS,
532		q);
533	<	final CountDownLatch threadStarted = new CountDownLatch(1);
534	<	final CountDownLatch done = new CountDownLatch(1);
535	<	try {
533	>	try (PoolCleaner cleaner = cleaner(p)) {
534	>	final CountDownLatch threadStarted = new CountDownLatch(1);
535	>	final CountDownLatch done = new CountDownLatch(1);
536		FutureTask[] tasks = new FutureTask[5];
537		for (int i = 0; i < tasks.length; i++) {
538		Callable task = new CheckedCallable<Boolean>() {
#	Line 533 | Line 545 | public class ThreadPoolExecutorTest exte
545		tasks[i] = new FutureTask(task);
546		p.execute(tasks[i]);
547		}
548	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
548	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
549		assertSame(q, p.getQueue());
550		assertFalse(q.contains(tasks[0]));
551		assertTrue(q.contains(tasks[tasks.length - 1]));
552		assertEquals(tasks.length - 1, q.size());
541	–	} finally {
553		done.countDown();
543	–	joinPool(p);
554		}
555		}
556
#	Line 553 | Line 563 | public class ThreadPoolExecutorTest exte
563		new ThreadPoolExecutor(1, 1,
564		LONG_DELAY_MS, MILLISECONDS,
565		q);
566	<	Runnable[] tasks = new Runnable[5];
567	<	final CountDownLatch threadStarted = new CountDownLatch(1);
568	<	final CountDownLatch done = new CountDownLatch(1);
569	<	try {
566	>	try (PoolCleaner cleaner = cleaner(p)) {
567	>	Runnable[] tasks = new Runnable[6];
568	>	final CountDownLatch threadStarted = new CountDownLatch(1);
569	>	final CountDownLatch done = new CountDownLatch(1);
570		for (int i = 0; i < tasks.length; i++) {
571		tasks[i] = new CheckedRunnable() {
572		public void realRun() throws InterruptedException {
#	Line 565 | Line 575 | public class ThreadPoolExecutorTest exte
575		}};
576		p.execute(tasks[i]);
577		}
578	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
578	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
579		assertFalse(p.remove(tasks[0]));
580		assertTrue(q.contains(tasks[4]));
581		assertTrue(q.contains(tasks[3]));
#	Line 575 | Line 585 | public class ThreadPoolExecutorTest exte
585		assertTrue(q.contains(tasks[3]));
586		assertTrue(p.remove(tasks[3]));
587		assertFalse(q.contains(tasks[3]));
578	–	} finally {
588		done.countDown();
580	–	joinPool(p);
589		}
590		}
591
#	Line 592 | Line 600 | public class ThreadPoolExecutorTest exte
600		new ThreadPoolExecutor(1, 1,
601		LONG_DELAY_MS, MILLISECONDS,
602		q);
603	<	FutureTask[] tasks = new FutureTask[5];
604	<	try {
603	>	try (PoolCleaner cleaner = cleaner(p)) {
604	>	FutureTask[] tasks = new FutureTask[5];
605		for (int i = 0; i < tasks.length; i++) {
606		Callable task = new CheckedCallable<Boolean>() {
607		public Boolean realCall() throws InterruptedException {
#	Line 604 | Line 612 | public class ThreadPoolExecutorTest exte
612		tasks[i] = new FutureTask(task);
613		p.execute(tasks[i]);
614		}
615	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
615	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
616		assertEquals(tasks.length, p.getTaskCount());
617		assertEquals(tasks.length - 1, q.size());
618		assertEquals(1L, p.getActiveCount());
#	Line 617 | Line 625 | public class ThreadPoolExecutorTest exte
625		p.purge();         // Nothing to do
626		assertEquals(tasks.length - 3, q.size());
627		assertEquals(tasks.length - 2, p.getTaskCount());
620	–	} finally {
628		done.countDown();
622	–	joinPool(p);
629		}
630		}
631
632		/**
633	<	* shutdownNow returns a list containing tasks that were not run
633	>	* shutdownNow returns a list containing tasks that were not run,
634	>	* and those tasks are drained from the queue
635		*/
636	<	public void testShutdownNow() {
636	>	public void testShutdownNow() throws InterruptedException {
637	>	final int poolSize = 2;
638	>	final int count = 5;
639	>	final AtomicInteger ran = new AtomicInteger(0);
640		final ThreadPoolExecutor p =
641	<	new ThreadPoolExecutor(1, 1,
641	>	new ThreadPoolExecutor(poolSize, poolSize,
642		LONG_DELAY_MS, MILLISECONDS,
643		new ArrayBlockingQueue<Runnable>(10));
644	<	List l;
645	<	try {
646	<	for (int i = 0; i < 5; i++)
637	<	p.execute(new MediumPossiblyInterruptedRunnable());
638	<	}
639	<	finally {
644	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
645	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
646	>	threadsStarted.countDown();
647		try {
648	<	l = p.shutdownNow();
649	<	} catch (SecurityException ok) { return; }
648	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
649	>	} catch (InterruptedException success) {}
650	>	ran.getAndIncrement();
651	>	}};
652	>	for (int i = 0; i < count; i++)
653	>	p.execute(waiter);
654	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
655	>	assertEquals(poolSize, p.getActiveCount());
656	>	assertEquals(0, p.getCompletedTaskCount());
657	>	final List<Runnable> queuedTasks;
658	>	try {
659	>	queuedTasks = p.shutdownNow();
660	>	} catch (SecurityException ok) {
661	>	return; // Allowed in case test doesn't have privs
662		}
663		assertTrue(p.isShutdown());
664	<	assertTrue(l.size() <= 4);
664	>	assertTrue(p.getQueue().isEmpty());
665	>	assertEquals(count - poolSize, queuedTasks.size());
666	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
667	>	assertTrue(p.isTerminated());
668	>	assertEquals(poolSize, ran.get());
669	>	assertEquals(poolSize, p.getCompletedTaskCount());
670		}
671
672		// Exception Tests
#	Line 994 | Line 1018 | public class ThreadPoolExecutorTest exte
1018		60, SECONDS,
1019		new ArrayBlockingQueue<Runnable>(10));
1020
1021	<	final CountDownLatch threadStarted = new CountDownLatch(1);
1022	<	final CountDownLatch done = new CountDownLatch(1);
1023	<	try {
1021	>	try (PoolCleaner cleaner = cleaner(p)) {
1022	>	final CountDownLatch threadStarted = new CountDownLatch(1);
1023	>	final CountDownLatch done = new CountDownLatch(1);
1024		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1025		public void realRun() throws Exception {
1026		Callable task = new CheckedCallable<Boolean>() {
#	Line 1008 | Line 1032 | public class ThreadPoolExecutorTest exte
1032		p.submit(task).get();
1033		}});
1034
1035	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1035	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
1036		t.interrupt();
1037		awaitTermination(t, MEDIUM_DELAY_MS);
1014	–	} finally {
1038		done.countDown();
1016	–	joinPool(p);
1039		}
1040		}
1041
#	Line 1021 | Line 1043 | public class ThreadPoolExecutorTest exte
1043		* execute throws RejectedExecutionException if saturated.
1044		*/
1045		public void testSaturatedExecute() {
1046	<	ThreadPoolExecutor p =
1046	>	final ThreadPoolExecutor p =
1047		new ThreadPoolExecutor(1, 1,
1048		LONG_DELAY_MS, MILLISECONDS,
1049		new ArrayBlockingQueue<Runnable>(1));
1050	<	final CountDownLatch done = new CountDownLatch(1);
1051	<	try {
1050	>	try (PoolCleaner cleaner = cleaner(p)) {
1051	>	final CountDownLatch done = new CountDownLatch(1);
1052		Runnable task = new CheckedRunnable() {
1053		public void realRun() throws InterruptedException {
1054		done.await();
#	Line 1040 | Line 1062 | public class ThreadPoolExecutorTest exte
1062		} catch (RejectedExecutionException success) {}
1063		assertTrue(p.getTaskCount() <= 2);
1064		}
1043	–	} finally {
1065		done.countDown();
1045	–	joinPool(p);
1066		}
1067		}
1068
#	Line 1108 | Line 1128 | public class ThreadPoolExecutorTest exte
1128		* executor using CallerRunsPolicy runs task if saturated.
1129		*/
1130		public void testSaturatedExecute2() {
1111	–	RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1131		final ThreadPoolExecutor p =
1132		new ThreadPoolExecutor(1, 1,
1133		LONG_DELAY_MS,
1134		MILLISECONDS,
1135		new ArrayBlockingQueue<Runnable>(1),
1136	<	h);
1137	<	try {
1136	>	new ThreadPoolExecutor.CallerRunsPolicy());
1137	>	try (PoolCleaner cleaner = cleaner(p)) {
1138	>	final CountDownLatch done = new CountDownLatch(1);
1139	>	Runnable blocker = new CheckedRunnable() {
1140	>	public void realRun() throws InterruptedException {
1141	>	done.await();
1142	>	}};
1143	>	p.execute(blocker);
1144		TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1145	<	for (int i = 0; i < tasks.length; ++i)
1145	>	for (int i = 0; i < tasks.length; i++)
1146		tasks[i] = new TrackedNoOpRunnable();
1147	<	TrackedLongRunnable mr = new TrackedLongRunnable();
1123	<	p.execute(mr);
1124	<	for (int i = 0; i < tasks.length; ++i)
1147	>	for (int i = 0; i < tasks.length; i++)
1148		p.execute(tasks[i]);
1149	<	for (int i = 1; i < tasks.length; ++i)
1149	>	for (int i = 1; i < tasks.length; i++)
1150		assertTrue(tasks[i].done);
1151	<	try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1152	<	} finally {
1130	<	joinPool(p);
1151	>	assertFalse(tasks[0].done); // waiting in queue
1152	>	done.countDown();
1153		}
1154		}
1155
#	Line 1135 | Line 1157 | public class ThreadPoolExecutorTest exte
1157		* executor using DiscardPolicy drops task if saturated.
1158		*/
1159		public void testSaturatedExecute3() {
1160	<	RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1160	>	final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1161	>	for (int i = 0; i < tasks.length; ++i)
1162	>	tasks[i] = new TrackedNoOpRunnable();
1163		final ThreadPoolExecutor p =
1164		new ThreadPoolExecutor(1, 1,
1165	<	LONG_DELAY_MS, MILLISECONDS,
1166	<	new ArrayBlockingQueue<Runnable>(1),
1167	<	h);
1168	<	try {
1169	<	TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1170	<	for (int i = 0; i < tasks.length; ++i)
1171	<	tasks[i] = new TrackedNoOpRunnable();
1148	<	p.execute(new TrackedLongRunnable());
1165	>	LONG_DELAY_MS, MILLISECONDS,
1166	>	new ArrayBlockingQueue<Runnable>(1),
1167	>	new ThreadPoolExecutor.DiscardPolicy());
1168	>	try (PoolCleaner cleaner = cleaner(p)) {
1169	>	final CountDownLatch done = new CountDownLatch(1);
1170	>	p.execute(awaiter(done));
1171	>
1172		for (TrackedNoOpRunnable task : tasks)
1173		p.execute(task);
1174	<	for (TrackedNoOpRunnable task : tasks)
1175	<	assertFalse(task.done);
1176	<	try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1154	<	} finally {
1155	<	joinPool(p);
1174	>	for (int i = 1; i < tasks.length; i++)
1175	>	assertFalse(tasks[i].done);
1176	>	done.countDown();
1177		}
1178	+	for (int i = 1; i < tasks.length; i++)
1179	+	assertFalse(tasks[i].done);
1180	+	assertTrue(tasks[0].done); // was waiting in queue
1181		}
1182
1183		/**
1184		* executor using DiscardOldestPolicy drops oldest task if saturated.
1185		*/
1186		public void testSaturatedExecute4() {
1187	<	RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1187	>	final CountDownLatch done = new CountDownLatch(1);
1188	>	LatchAwaiter r1 = awaiter(done);
1189	>	LatchAwaiter r2 = awaiter(done);
1190	>	LatchAwaiter r3 = awaiter(done);
1191		final ThreadPoolExecutor p =
1192		new ThreadPoolExecutor(1, 1,
1193		LONG_DELAY_MS, MILLISECONDS,
1194		new ArrayBlockingQueue<Runnable>(1),
1195	<	h);
1196	<	try {
1197	<	p.execute(new TrackedLongRunnable());
1198	<	TrackedLongRunnable r2 = new TrackedLongRunnable();
1195	>	new ThreadPoolExecutor.DiscardOldestPolicy());
1196	>	try (PoolCleaner cleaner = cleaner(p)) {
1197	>	assertEquals(LatchAwaiter.NEW, r1.state);
1198	>	assertEquals(LatchAwaiter.NEW, r2.state);
1199	>	assertEquals(LatchAwaiter.NEW, r3.state);
1200	>	p.execute(r1);
1201		p.execute(r2);
1202		assertTrue(p.getQueue().contains(r2));
1174	–	TrackedNoOpRunnable r3 = new TrackedNoOpRunnable();
1203		p.execute(r3);
1204		assertFalse(p.getQueue().contains(r2));
1205		assertTrue(p.getQueue().contains(r3));
1206	<	try { p.shutdownNow(); } catch (SecurityException ok) { return; }
1179	<	} finally {
1180	<	joinPool(p);
1206	>	done.countDown();
1207		}
1208	+	assertEquals(LatchAwaiter.DONE, r1.state);
1209	+	assertEquals(LatchAwaiter.NEW, r2.state);
1210	+	assertEquals(LatchAwaiter.DONE, r3.state);
1211		}
1212
1213		/**
#	Line 1190 | Line 1219 | public class ThreadPoolExecutorTest exte
1219		LONG_DELAY_MS, MILLISECONDS,
1220		new ArrayBlockingQueue<Runnable>(1));
1221		try { p.shutdown(); } catch (SecurityException ok) { return; }
1222	<	try {
1223	<	p.execute(new NoOpRunnable());
1224	<	shouldThrow();
1225	<	} catch (RejectedExecutionException success) {}
1226	<
1227	<	joinPool(p);
1222	>	try (PoolCleaner cleaner = cleaner(p)) {
1223	>	try {
1224	>	p.execute(new NoOpRunnable());
1225	>	shouldThrow();
1226	>	} catch (RejectedExecutionException success) {}
1227	>	}
1228		}
1229
1230		/**
#	Line 1209 | Line 1238 | public class ThreadPoolExecutorTest exte
1238		new ArrayBlockingQueue<Runnable>(1), h);
1239
1240		try { p.shutdown(); } catch (SecurityException ok) { return; }
1241	<	try {
1241	>	try (PoolCleaner cleaner = cleaner(p)) {
1242		TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1243		p.execute(r);
1244		assertFalse(r.done);
1216	–	} finally {
1217	–	joinPool(p);
1245		}
1246		}
1247
#	Line 1222 | Line 1249 | public class ThreadPoolExecutorTest exte
1249		* execute using DiscardPolicy drops task on shutdown
1250		*/
1251		public void testDiscardOnShutdown() {
1252	<	RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardPolicy();
1226	<	ThreadPoolExecutor p =
1252	>	final ThreadPoolExecutor p =
1253		new ThreadPoolExecutor(1, 1,
1254		LONG_DELAY_MS, MILLISECONDS,
1255		new ArrayBlockingQueue<Runnable>(1),
1256	<	h);
1256	>	new ThreadPoolExecutor.DiscardPolicy());
1257
1258		try { p.shutdown(); } catch (SecurityException ok) { return; }
1259	<	try {
1259	>	try (PoolCleaner cleaner = cleaner(p)) {
1260		TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1261		p.execute(r);
1262		assertFalse(r.done);
1237	–	} finally {
1238	–	joinPool(p);
1263		}
1264		}
1265
#	Line 1243 | Line 1267 | public class ThreadPoolExecutorTest exte
1267		* execute using DiscardOldestPolicy drops task on shutdown
1268		*/
1269		public void testDiscardOldestOnShutdown() {
1270	<	RejectedExecutionHandler h = new ThreadPoolExecutor.DiscardOldestPolicy();
1247	<	ThreadPoolExecutor p =
1270	>	final ThreadPoolExecutor p =
1271		new ThreadPoolExecutor(1, 1,
1272		LONG_DELAY_MS, MILLISECONDS,
1273		new ArrayBlockingQueue<Runnable>(1),
1274	<	h);
1274	>	new ThreadPoolExecutor.DiscardOldestPolicy());
1275
1276		try { p.shutdown(); } catch (SecurityException ok) { return; }
1277	<	try {
1277	>	try (PoolCleaner cleaner = cleaner(p)) {
1278		TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1279		p.execute(r);
1280		assertFalse(r.done);
1258	–	} finally {
1259	–	joinPool(p);
1281		}
1282		}
1283
#	Line 1264 | Line 1285 | public class ThreadPoolExecutorTest exte
1285		* execute(null) throws NPE
1286		*/
1287		public void testExecuteNull() {
1288	<	ThreadPoolExecutor p =
1289	<	new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1288	>	final ThreadPoolExecutor p =
1289	>	new ThreadPoolExecutor(1, 2,
1290	>	1L, SECONDS,
1291		new ArrayBlockingQueue<Runnable>(10));
1292	<	try {
1293	<	p.execute(null);
1294	<	shouldThrow();
1295	<	} catch (NullPointerException success) {}
1296	<
1297	<	joinPool(p);
1292	>	try (PoolCleaner cleaner = cleaner(p)) {
1293	>	try {
1294	>	p.execute(null);
1295	>	shouldThrow();
1296	>	} catch (NullPointerException success) {}
1297	>	}
1298		}
1299
1300		/**
#	Line 1875 | Line 1897 | public class ThreadPoolExecutorTest exte
1897		l.add(new StringTask());
1898		l.add(new StringTask());
1899		List<Future<String>> futures =
1900	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1900	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1901		assertEquals(2, futures.size());
1902		for (Future<String> future : futures)
1903		assertSame(TEST_STRING, future.get());
#	Line 2043 | Line 2065 | public class ThreadPoolExecutorTest exte
2065		}
2066		}
2067
2068	+	/**
2069	+	* get(cancelled task) throws CancellationException
2070	+	*/
2071	+	public void testGet_cancelled() throws Exception {
2072	+	final ExecutorService e =
2073	+	new ThreadPoolExecutor(1, 1,
2074	+	LONG_DELAY_MS, MILLISECONDS,
2075	+	new LinkedBlockingQueue<Runnable>());
2076	+	try {
2077	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
2078	+	final CountDownLatch done = new CountDownLatch(1);
2079	+	final List<Future<?>> futures = new ArrayList<>();
2080	+	for (int i = 0; i < 2; i++) {
2081	+	Runnable r = new CheckedRunnable() { public void realRun()
2082	+	throws Throwable {
2083	+	blockerStarted.countDown();
2084	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
2085	+	}};
2086	+	futures.add(e.submit(r));
2087	+	}
2088	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2089	+	for (Future<?> future : futures) future.cancel(false);
2090	+	for (Future<?> future : futures) {
2091	+	try {
2092	+	future.get();
2093	+	shouldThrow();
2094	+	} catch (CancellationException success) {}
2095	+	try {
2096	+	future.get(LONG_DELAY_MS, MILLISECONDS);
2097	+	shouldThrow();
2098	+	} catch (CancellationException success) {}
2099	+	assertTrue(future.isCancelled());
2100	+	assertTrue(future.isDone());
2101	+	}
2102	+	done.countDown();
2103	+	} finally {
2104	+	joinPool(e);
2105	+	}
2106	+	}
2107	+
2108		}

Diff Legend

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