ViewVC Help

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

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

Comparing jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java (file contents):
Revision 1.41 by jsr166, Mon Sep 28 02:41:29 2015 UTC vs.
Revision 1.73 by jsr166, Sun Oct 4 02:49:18 2015 UTC

#	Line 101 | Line 101 | public class ThreadPoolExecutorSubclassT
101		}
102		lock.lock();
103		try {
104	<	result = v;
105	<	exception = e;
106	<	done = true;
107	<	thread = null;
108	<	cond.signalAll();
104	>	if (!done) {
105	>	result = v;
106	>	exception = e;
107	>	done = true;
108	>	thread = null;
109	>	cond.signalAll();
110	>	}
111		}
112		finally { lock.unlock(); }
113		}
#	Line 114 | Line 116 | public class ThreadPoolExecutorSubclassT
116		try {
117		while (!done)
118		cond.await();
119	+	if (cancelled)
120	+	throw new CancellationException();
121		if (exception != null)
122		throw new ExecutionException(exception);
123		return result;
#	Line 125 | Line 129 | public class ThreadPoolExecutorSubclassT
129		long nanos = unit.toNanos(timeout);
130		lock.lock();
131		try {
132	<	for (;;) {
133	<	if (done) break;
130	<	if (nanos < 0)
132	>	while (!done) {
133	>	if (nanos <= 0L)
134		throw new TimeoutException();
135		nanos = cond.awaitNanos(nanos);
136		}
137	+	if (cancelled)
138	+	throw new CancellationException();
139		if (exception != null)
140		throw new ExecutionException(exception);
141		return result;
#	Line 227 | Line 232 | public class ThreadPoolExecutorSubclassT
232		public void testExecute() throws InterruptedException {
233		final ThreadPoolExecutor p =
234		new CustomTPE(1, 1,
235	<	LONG_DELAY_MS, MILLISECONDS,
235	>	2 * LONG_DELAY_MS, MILLISECONDS,
236		new ArrayBlockingQueue<Runnable>(10));
237	<	final CountDownLatch done = new CountDownLatch(1);
238	<	final Runnable task = new CheckedRunnable() {
239	<	public void realRun() {
240	<	done.countDown();
236	<	}};
237	<	try {
237	>	try (PoolCleaner cleaner = cleaner(p)) {
238	>	final CountDownLatch done = new CountDownLatch(1);
239	>	final Runnable task = new CheckedRunnable() {
240	>	public void realRun() { done.countDown(); }};
241		p.execute(task);
242	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
240	<	} finally {
241	<	joinPool(p);
242	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243		}
244		}
245
#	Line 251 | Line 252 | public class ThreadPoolExecutorSubclassT
252		new CustomTPE(2, 2,
253		LONG_DELAY_MS, MILLISECONDS,
254		new ArrayBlockingQueue<Runnable>(10));
255	<	final CountDownLatch threadStarted = new CountDownLatch(1);
256	<	final CountDownLatch done = new CountDownLatch(1);
257	<	try {
255	>	try (PoolCleaner cleaner = cleaner(p)) {
256	>	final CountDownLatch threadStarted = new CountDownLatch(1);
257	>	final CountDownLatch done = new CountDownLatch(1);
258		assertEquals(0, p.getActiveCount());
259		p.execute(new CheckedRunnable() {
260		public void realRun() throws InterruptedException {
#	Line 261 | Line 262 | public class ThreadPoolExecutorSubclassT
262		assertEquals(1, p.getActiveCount());
263		done.await();
264		}});
265	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
265	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
266		assertEquals(1, p.getActiveCount());
266	–	} finally {
267		done.countDown();
268	–	joinPool(p);
268		}
269		}
270
#	Line 273 | Line 272 | public class ThreadPoolExecutorSubclassT
272		* prestartCoreThread starts a thread if under corePoolSize, else doesn't
273		*/
274		public void testPrestartCoreThread() {
275	<	ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
276	<	assertEquals(0, p.getPoolSize());
277	<	assertTrue(p.prestartCoreThread());
278	<	assertEquals(1, p.getPoolSize());
279	<	assertTrue(p.prestartCoreThread());
280	<	assertEquals(2, p.getPoolSize());
281	<	assertFalse(p.prestartCoreThread());
282	<	assertEquals(2, p.getPoolSize());
283	<	joinPool(p);
275	>	ThreadPoolExecutor p =
276	>	new CustomTPE(2, 6,
277	>	LONG_DELAY_MS, MILLISECONDS,
278	>	new ArrayBlockingQueue<Runnable>(10));
279	>	try (PoolCleaner cleaner = cleaner(p)) {
280	>	assertEquals(0, p.getPoolSize());
281	>	assertTrue(p.prestartCoreThread());
282	>	assertEquals(1, p.getPoolSize());
283	>	assertTrue(p.prestartCoreThread());
284	>	assertEquals(2, p.getPoolSize());
285	>	assertFalse(p.prestartCoreThread());
286	>	assertEquals(2, p.getPoolSize());
287	>	p.setCorePoolSize(4);
288	>	assertTrue(p.prestartCoreThread());
289	>	assertEquals(3, p.getPoolSize());
290	>	assertTrue(p.prestartCoreThread());
291	>	assertEquals(4, p.getPoolSize());
292	>	assertFalse(p.prestartCoreThread());
293	>	assertEquals(4, p.getPoolSize());
294	>	}
295		}
296
297		/**
298		* prestartAllCoreThreads starts all corePoolSize threads
299		*/
300		public void testPrestartAllCoreThreads() {
301	<	ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
302	<	assertEquals(0, p.getPoolSize());
303	<	p.prestartAllCoreThreads();
304	<	assertEquals(2, p.getPoolSize());
305	<	p.prestartAllCoreThreads();
306	<	assertEquals(2, p.getPoolSize());
307	<	joinPool(p);
301	>	ThreadPoolExecutor p =
302	>	new CustomTPE(2, 6,
303	>	LONG_DELAY_MS, MILLISECONDS,
304	>	new ArrayBlockingQueue<Runnable>(10));
305	>	try (PoolCleaner cleaner = cleaner(p)) {
306	>	assertEquals(0, p.getPoolSize());
307	>	p.prestartAllCoreThreads();
308	>	assertEquals(2, p.getPoolSize());
309	>	p.prestartAllCoreThreads();
310	>	assertEquals(2, p.getPoolSize());
311	>	p.setCorePoolSize(4);
312	>	p.prestartAllCoreThreads();
313	>	assertEquals(4, p.getPoolSize());
314	>	p.prestartAllCoreThreads();
315	>	assertEquals(4, p.getPoolSize());
316	>	}
317		}
318
319		/**
#	Line 306 | Line 325 | public class ThreadPoolExecutorSubclassT
325		new CustomTPE(2, 2,
326		LONG_DELAY_MS, MILLISECONDS,
327		new ArrayBlockingQueue<Runnable>(10));
328	<	final CountDownLatch threadStarted = new CountDownLatch(1);
329	<	final CountDownLatch threadProceed = new CountDownLatch(1);
330	<	final CountDownLatch threadDone = new CountDownLatch(1);
331	<	try {
328	>	try (PoolCleaner cleaner = cleaner(p)) {
329	>	final CountDownLatch threadStarted = new CountDownLatch(1);
330	>	final CountDownLatch threadProceed = new CountDownLatch(1);
331	>	final CountDownLatch threadDone = new CountDownLatch(1);
332		assertEquals(0, p.getCompletedTaskCount());
333		p.execute(new CheckedRunnable() {
334		public void realRun() throws InterruptedException {
#	Line 328 | Line 347 | public class ThreadPoolExecutorSubclassT
347		fail("timed out");
348		Thread.yield();
349		}
331	–	} finally {
332	–	joinPool(p);
350		}
351		}
352
#	Line 337 | Line 354 | public class ThreadPoolExecutorSubclassT
354		* getCorePoolSize returns size given in constructor if not otherwise set
355		*/
356		public void testGetCorePoolSize() {
357	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
358	<	assertEquals(1, p.getCorePoolSize());
359	<	joinPool(p);
357	>	final ThreadPoolExecutor p =
358	>	new CustomTPE(1, 1,
359	>	LONG_DELAY_MS, MILLISECONDS,
360	>	new ArrayBlockingQueue<Runnable>(10));
361	>	try (PoolCleaner cleaner = cleaner(p)) {
362	>	assertEquals(1, p.getCorePoolSize());
363	>	}
364		}
365
366		/**
367		* getKeepAliveTime returns value given in constructor if not otherwise set
368		*/
369		public void testGetKeepAliveTime() {
370	<	ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
371	<	assertEquals(1, p.getKeepAliveTime(SECONDS));
372	<	joinPool(p);
370	>	final ThreadPoolExecutor p =
371	>	new CustomTPE(2, 2,
372	>	1000, MILLISECONDS,
373	>	new ArrayBlockingQueue<Runnable>(10));
374	>	try (PoolCleaner cleaner = cleaner(p)) {
375	>	assertEquals(1, p.getKeepAliveTime(SECONDS));
376	>	}
377		}
378
379		/**
380		* getThreadFactory returns factory in constructor if not set
381		*/
382		public void testGetThreadFactory() {
383	<	ThreadFactory tf = new SimpleThreadFactory();
384	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), tf, new NoOpREHandler());
385	<	assertSame(tf, p.getThreadFactory());
386	<	joinPool(p);
383	>	final ThreadFactory threadFactory = new SimpleThreadFactory();
384	>	final ThreadPoolExecutor p =
385	>	new CustomTPE(1, 2,
386	>	LONG_DELAY_MS, MILLISECONDS,
387	>	new ArrayBlockingQueue<Runnable>(10),
388	>	threadFactory,
389	>	new NoOpREHandler());
390	>	try (PoolCleaner cleaner = cleaner(p)) {
391	>	assertSame(threadFactory, p.getThreadFactory());
392	>	}
393		}
394
395		/**
396		* setThreadFactory sets the thread factory returned by getThreadFactory
397		*/
398		public void testSetThreadFactory() {
399	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
400	<	ThreadFactory tf = new SimpleThreadFactory();
401	<	p.setThreadFactory(tf);
402	<	assertSame(tf, p.getThreadFactory());
403	<	joinPool(p);
399	>	final ThreadPoolExecutor p =
400	>	new CustomTPE(1, 2,
401	>	LONG_DELAY_MS, MILLISECONDS,
402	>	new ArrayBlockingQueue<Runnable>(10));
403	>	try (PoolCleaner cleaner = cleaner(p)) {
404	>	ThreadFactory threadFactory = new SimpleThreadFactory();
405	>	p.setThreadFactory(threadFactory);
406	>	assertSame(threadFactory, p.getThreadFactory());
407	>	}
408		}
409
410		/**
411		* setThreadFactory(null) throws NPE
412		*/
413		public void testSetThreadFactoryNull() {
414	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
415	<	try {
416	<	p.setThreadFactory(null);
417	<	shouldThrow();
418	<	} catch (NullPointerException success) {
419	<	} finally {
420	<	joinPool(p);
414	>	final ThreadPoolExecutor p =
415	>	new CustomTPE(1, 2,
416	>	LONG_DELAY_MS, MILLISECONDS,
417	>	new ArrayBlockingQueue<Runnable>(10));
418	>	try (PoolCleaner cleaner = cleaner(p)) {
419	>	try {
420	>	p.setThreadFactory(null);
421	>	shouldThrow();
422	>	} catch (NullPointerException success) {}
423		}
424		}
425
#	Line 390 | Line 427 | public class ThreadPoolExecutorSubclassT
427		* getRejectedExecutionHandler returns handler in constructor if not set
428		*/
429		public void testGetRejectedExecutionHandler() {
430	<	RejectedExecutionHandler h = new NoOpREHandler();
431	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), h);
432	<	assertSame(h, p.getRejectedExecutionHandler());
433	<	joinPool(p);
430	>	final RejectedExecutionHandler handler = new NoOpREHandler();
431	>	final ThreadPoolExecutor p =
432	>	new CustomTPE(1, 2,
433	>	LONG_DELAY_MS, MILLISECONDS,
434	>	new ArrayBlockingQueue<Runnable>(10),
435	>	handler);
436	>	try (PoolCleaner cleaner = cleaner(p)) {
437	>	assertSame(handler, p.getRejectedExecutionHandler());
438	>	}
439		}
440
441		/**
#	Line 401 | Line 443 | public class ThreadPoolExecutorSubclassT
443		* getRejectedExecutionHandler
444		*/
445		public void testSetRejectedExecutionHandler() {
446	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
447	<	RejectedExecutionHandler h = new NoOpREHandler();
448	<	p.setRejectedExecutionHandler(h);
449	<	assertSame(h, p.getRejectedExecutionHandler());
450	<	joinPool(p);
446	>	final ThreadPoolExecutor p =
447	>	new CustomTPE(1, 2,
448	>	LONG_DELAY_MS, MILLISECONDS,
449	>	new ArrayBlockingQueue<Runnable>(10));
450	>	try (PoolCleaner cleaner = cleaner(p)) {
451	>	RejectedExecutionHandler handler = new NoOpREHandler();
452	>	p.setRejectedExecutionHandler(handler);
453	>	assertSame(handler, p.getRejectedExecutionHandler());
454	>	}
455		}
456
457		/**
458		* setRejectedExecutionHandler(null) throws NPE
459		*/
460		public void testSetRejectedExecutionHandlerNull() {
461	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
462	<	try {
463	<	p.setRejectedExecutionHandler(null);
464	<	shouldThrow();
465	<	} catch (NullPointerException success) {
466	<	} finally {
467	<	joinPool(p);
461	>	final ThreadPoolExecutor p =
462	>	new CustomTPE(1, 2,
463	>	LONG_DELAY_MS, MILLISECONDS,
464	>	new ArrayBlockingQueue<Runnable>(10));
465	>	try (PoolCleaner cleaner = cleaner(p)) {
466	>	try {
467	>	p.setRejectedExecutionHandler(null);
468	>	shouldThrow();
469	>	} catch (NullPointerException success) {}
470		}
471		}
472
#	Line 432 | Line 480 | public class ThreadPoolExecutorSubclassT
480		new CustomTPE(THREADS, THREADS,
481		LONG_DELAY_MS, MILLISECONDS,
482		new ArrayBlockingQueue<Runnable>(10));
483	<	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
484	<	final CountDownLatch done = new CountDownLatch(1);
485	<	try {
483	>	try (PoolCleaner cleaner = cleaner(p)) {
484	>	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
485	>	final CountDownLatch done = new CountDownLatch(1);
486		assertEquals(0, p.getLargestPoolSize());
487		for (int i = 0; i < THREADS; i++)
488		p.execute(new CheckedRunnable() {
#	Line 443 | Line 491 | public class ThreadPoolExecutorSubclassT
491		done.await();
492		assertEquals(THREADS, p.getLargestPoolSize());
493		}});
494	<	assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
447	<	assertEquals(THREADS, p.getLargestPoolSize());
448	<	} finally {
449	<	done.countDown();
450	<	joinPool(p);
494	>	assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
495		assertEquals(THREADS, p.getLargestPoolSize());
496	+	done.countDown();   // release pool
497		}
498	+	assertEquals(THREADS, p.getLargestPoolSize());
499		}
500
501		/**
#	Line 457 | Line 503 | public class ThreadPoolExecutorSubclassT
503		* otherwise set
504		*/
505		public void testGetMaximumPoolSize() {
506	<	ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
507	<	assertEquals(2, p.getMaximumPoolSize());
508	<	joinPool(p);
506	>	final ThreadPoolExecutor p =
507	>	new CustomTPE(2, 3,
508	>	LONG_DELAY_MS, MILLISECONDS,
509	>	new ArrayBlockingQueue<Runnable>(10));
510	>	try (PoolCleaner cleaner = cleaner(p)) {
511	>	assertEquals(3, p.getMaximumPoolSize());
512	>	p.setMaximumPoolSize(5);
513	>	assertEquals(5, p.getMaximumPoolSize());
514	>	p.setMaximumPoolSize(4);
515	>	assertEquals(4, p.getMaximumPoolSize());
516	>	}
517		}
518
519		/**
#	Line 471 | Line 525 | public class ThreadPoolExecutorSubclassT
525		new CustomTPE(1, 1,
526		LONG_DELAY_MS, MILLISECONDS,
527		new ArrayBlockingQueue<Runnable>(10));
528	<	final CountDownLatch threadStarted = new CountDownLatch(1);
529	<	final CountDownLatch done = new CountDownLatch(1);
530	<	try {
528	>	try (PoolCleaner cleaner = cleaner(p)) {
529	>	final CountDownLatch threadStarted = new CountDownLatch(1);
530	>	final CountDownLatch done = new CountDownLatch(1);
531		assertEquals(0, p.getPoolSize());
532		p.execute(new CheckedRunnable() {
533		public void realRun() throws InterruptedException {
#	Line 481 | Line 535 | public class ThreadPoolExecutorSubclassT
535		assertEquals(1, p.getPoolSize());
536		done.await();
537		}});
538	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
538	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
539		assertEquals(1, p.getPoolSize());
540	<	} finally {
487	<	done.countDown();
488	<	joinPool(p);
540	>	done.countDown();   // release pool
541		}
542		}
543
#	Line 497 | Line 549 | public class ThreadPoolExecutorSubclassT
549		new CustomTPE(1, 1,
550		LONG_DELAY_MS, MILLISECONDS,
551		new ArrayBlockingQueue<Runnable>(10));
552	<	final CountDownLatch threadStarted = new CountDownLatch(1);
553	<	final CountDownLatch done = new CountDownLatch(1);
554	<	try {
552	>	try (PoolCleaner cleaner = cleaner(p)) {
553	>	final CountDownLatch threadStarted = new CountDownLatch(1);
554	>	final CountDownLatch done = new CountDownLatch(1);
555		assertEquals(0, p.getTaskCount());
556		p.execute(new CheckedRunnable() {
557		public void realRun() throws InterruptedException {
#	Line 507 | Line 559 | public class ThreadPoolExecutorSubclassT
559		assertEquals(1, p.getTaskCount());
560		done.await();
561		}});
562	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
562	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
563		assertEquals(1, p.getTaskCount());
512	–	} finally {
564		done.countDown();
514	–	joinPool(p);
565		}
566		}
567
#	Line 519 | Line 569 | public class ThreadPoolExecutorSubclassT
569		* isShutdown is false before shutdown, true after
570		*/
571		public void testIsShutdown() {
572	<
573	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
574	<	assertFalse(p.isShutdown());
575	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
576	<	assertTrue(p.isShutdown());
577	<	joinPool(p);
572	>	final ThreadPoolExecutor p =
573	>	new CustomTPE(1, 1,
574	>	LONG_DELAY_MS, MILLISECONDS,
575	>	new ArrayBlockingQueue<Runnable>(10));
576	>	try (PoolCleaner cleaner = cleaner(p)) {
577	>	assertFalse(p.isShutdown());
578	>	try { p.shutdown(); } catch (SecurityException ok) { return; }
579	>	assertTrue(p.isShutdown());
580	>	}
581		}
582
583		/**
#	Line 535 | Line 588 | public class ThreadPoolExecutorSubclassT
588		new CustomTPE(1, 1,
589		LONG_DELAY_MS, MILLISECONDS,
590		new ArrayBlockingQueue<Runnable>(10));
591	<	final CountDownLatch threadStarted = new CountDownLatch(1);
592	<	final CountDownLatch done = new CountDownLatch(1);
593	<	try {
591	>	try (PoolCleaner cleaner = cleaner(p)) {
592	>	final CountDownLatch threadStarted = new CountDownLatch(1);
593	>	final CountDownLatch done = new CountDownLatch(1);
594		assertFalse(p.isTerminating());
595		p.execute(new CheckedRunnable() {
596		public void realRun() throws InterruptedException {
#	Line 545 | Line 598 | public class ThreadPoolExecutorSubclassT
598		threadStarted.countDown();
599		done.await();
600		}});
601	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
601	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
602		assertFalse(p.isTerminating());
603		done.countDown();
551	–	} finally {
604		try { p.shutdown(); } catch (SecurityException ok) { return; }
605	+	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
606	+	assertTrue(p.isTerminated());
607	+	assertFalse(p.isTerminating());
608		}
554	–	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
555	–	assertTrue(p.isTerminated());
556	–	assertFalse(p.isTerminating());
609		}
610
611		/**
#	Line 564 | Line 616 | public class ThreadPoolExecutorSubclassT
616		new CustomTPE(1, 1,
617		LONG_DELAY_MS, MILLISECONDS,
618		new ArrayBlockingQueue<Runnable>(10));
619	<	final CountDownLatch threadStarted = new CountDownLatch(1);
620	<	final CountDownLatch done = new CountDownLatch(1);
621	<	try {
619	>	try (PoolCleaner cleaner = cleaner(p)) {
620	>	final CountDownLatch threadStarted = new CountDownLatch(1);
621	>	final CountDownLatch done = new CountDownLatch(1);
622		assertFalse(p.isTerminating());
623		p.execute(new CheckedRunnable() {
624		public void realRun() throws InterruptedException {
#	Line 574 | Line 626 | public class ThreadPoolExecutorSubclassT
626		threadStarted.countDown();
627		done.await();
628		}});
629	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
629	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
630		assertFalse(p.isTerminating());
631		done.countDown();
580	–	} finally {
632		try { p.shutdown(); } catch (SecurityException ok) { return; }
633	+	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
634	+	assertTrue(p.isTerminated());
635	+	assertFalse(p.isTerminating());
636		}
583	–	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
584	–	assertTrue(p.isTerminated());
585	–	assertFalse(p.isTerminating());
637		}
638
639		/**
#	Line 594 | Line 645 | public class ThreadPoolExecutorSubclassT
645		new CustomTPE(1, 1,
646		LONG_DELAY_MS, MILLISECONDS,
647		q);
648	<	final CountDownLatch threadStarted = new CountDownLatch(1);
649	<	final CountDownLatch done = new CountDownLatch(1);
650	<	try {
648	>	try (PoolCleaner cleaner = cleaner(p)) {
649	>	final CountDownLatch threadStarted = new CountDownLatch(1);
650	>	final CountDownLatch done = new CountDownLatch(1);
651		FutureTask[] tasks = new FutureTask[5];
652		for (int i = 0; i < tasks.length; i++) {
653		Callable task = new CheckedCallable<Boolean>() {
#	Line 609 | Line 660 | public class ThreadPoolExecutorSubclassT
660		tasks[i] = new FutureTask(task);
661		p.execute(tasks[i]);
662		}
663	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
663	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
664		assertSame(q, p.getQueue());
665		assertFalse(q.contains(tasks[0]));
666		assertTrue(q.contains(tasks[tasks.length - 1]));
667		assertEquals(tasks.length - 1, q.size());
617	–	} finally {
668		done.countDown();
619	–	joinPool(p);
669		}
670		}
671
#	Line 629 | Line 678 | public class ThreadPoolExecutorSubclassT
678		new CustomTPE(1, 1,
679		LONG_DELAY_MS, MILLISECONDS,
680		q);
681	<	Runnable[] tasks = new Runnable[6];
682	<	final CountDownLatch threadStarted = new CountDownLatch(1);
683	<	final CountDownLatch done = new CountDownLatch(1);
684	<	try {
681	>	try (PoolCleaner cleaner = cleaner(p)) {
682	>	Runnable[] tasks = new Runnable[6];
683	>	final CountDownLatch threadStarted = new CountDownLatch(1);
684	>	final CountDownLatch done = new CountDownLatch(1);
685		for (int i = 0; i < tasks.length; i++) {
686		tasks[i] = new CheckedRunnable() {
687	<	public void realRun() throws InterruptedException {
688	<	threadStarted.countDown();
689	<	done.await();
690	<	}};
687	>	public void realRun() throws InterruptedException {
688	>	threadStarted.countDown();
689	>	done.await();
690	>	}};
691		p.execute(tasks[i]);
692		}
693	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
693	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
694		assertFalse(p.remove(tasks[0]));
695		assertTrue(q.contains(tasks[4]));
696		assertTrue(q.contains(tasks[3]));
#	Line 651 | Line 700 | public class ThreadPoolExecutorSubclassT
700		assertTrue(q.contains(tasks[3]));
701		assertTrue(p.remove(tasks[3]));
702		assertFalse(q.contains(tasks[3]));
654	–	} finally {
703		done.countDown();
656	–	joinPool(p);
704		}
705		}
706
#	Line 668 | Line 715 | public class ThreadPoolExecutorSubclassT
715		new CustomTPE(1, 1,
716		LONG_DELAY_MS, MILLISECONDS,
717		q);
718	<	FutureTask[] tasks = new FutureTask[5];
719	<	try {
718	>	try (PoolCleaner cleaner = cleaner(p)) {
719	>	FutureTask[] tasks = new FutureTask[5];
720		for (int i = 0; i < tasks.length; i++) {
721		Callable task = new CheckedCallable<Boolean>() {
722		public Boolean realCall() throws InterruptedException {
#	Line 680 | Line 727 | public class ThreadPoolExecutorSubclassT
727		tasks[i] = new FutureTask(task);
728		p.execute(tasks[i]);
729		}
730	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
730	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
731		assertEquals(tasks.length, p.getTaskCount());
732		assertEquals(tasks.length - 1, q.size());
733		assertEquals(1L, p.getActiveCount());
#	Line 693 | Line 740 | public class ThreadPoolExecutorSubclassT
740		p.purge();         // Nothing to do
741		assertEquals(tasks.length - 3, q.size());
742		assertEquals(tasks.length - 2, p.getTaskCount());
696	–	} finally {
743		done.countDown();
698	–	joinPool(p);
744		}
745		}
746
#	Line 711 | Line 756 | public class ThreadPoolExecutorSubclassT
756		new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
757		new ArrayBlockingQueue<Runnable>(10));
758		CountDownLatch threadsStarted = new CountDownLatch(poolSize);
759	<	CheckedRunnable waiter = new CheckedRunnable() { public void realRun() {
759	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
760		threadsStarted.countDown();
761		try {
762		MILLISECONDS.sleep(2 * LONG_DELAY_MS);
#	Line 721 | Line 766 | public class ThreadPoolExecutorSubclassT
766		for (int i = 0; i < count; i++)
767		p.execute(waiter);
768		assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
769	+	assertEquals(poolSize, p.getActiveCount());
770	+	assertEquals(0, p.getCompletedTaskCount());
771		final List<Runnable> queuedTasks;
772		try {
773		queuedTasks = p.shutdownNow();
#	Line 733 | Line 780 | public class ThreadPoolExecutorSubclassT
780		assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
781		assertTrue(p.isTerminated());
782		assertEquals(poolSize, ran.get());
783	+	assertEquals(poolSize, p.getCompletedTaskCount());
784		}
785
786		// Exception Tests
#	Line 1076 | Line 1124 | public class ThreadPoolExecutorSubclassT
1124		* execute throws RejectedExecutionException if saturated.
1125		*/
1126		public void testSaturatedExecute() {
1127	<	ThreadPoolExecutor p =
1127	>	final ThreadPoolExecutor p =
1128		new CustomTPE(1, 1,
1129		LONG_DELAY_MS, MILLISECONDS,
1130		new ArrayBlockingQueue<Runnable>(1));
1131	<	final CountDownLatch done = new CountDownLatch(1);
1132	<	try {
1131	>	try (PoolCleaner cleaner = cleaner(p)) {
1132	>	final CountDownLatch done = new CountDownLatch(1);
1133		Runnable task = new CheckedRunnable() {
1134		public void realRun() throws InterruptedException {
1135		done.await();
#	Line 1095 | Line 1143 | public class ThreadPoolExecutorSubclassT
1143		} catch (RejectedExecutionException success) {}
1144		assertTrue(p.getTaskCount() <= 2);
1145		}
1098	–	} finally {
1146		done.countDown();
1100	–	joinPool(p);
1147		}
1148		}
1149
#	Line 1741 | Line 1787 | public class ThreadPoolExecutorSubclassT
1787		l.add(new StringTask());
1788		l.add(new StringTask());
1789		List<Future<String>> futures =
1790	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1790	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1791		assertEquals(2, futures.size());
1792		for (Future<String> future : futures)
1793		assertSame(TEST_STRING, future.get());
#	Line 1871 | Line 1917 | public class ThreadPoolExecutorSubclassT
1917		}
1918		}
1919
1920	+	/**
1921	+	* get(cancelled task) throws CancellationException
1922	+	* (in part, a test of CustomTPE itself)
1923	+	*/
1924	+	public void testGet_cancelled() throws Exception {
1925	+	final ExecutorService e =
1926	+	new CustomTPE(1, 1,
1927	+	LONG_DELAY_MS, MILLISECONDS,
1928	+	new LinkedBlockingQueue<Runnable>());
1929	+	try {
1930	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1931	+	final CountDownLatch done = new CountDownLatch(1);
1932	+	final List<Future<?>> futures = new ArrayList<>();
1933	+	for (int i = 0; i < 2; i++) {
1934	+	Runnable r = new CheckedRunnable() { public void realRun()
1935	+	throws Throwable {
1936	+	blockerStarted.countDown();
1937	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1938	+	}};
1939	+	futures.add(e.submit(r));
1940	+	}
1941	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1942	+	for (Future<?> future : futures) future.cancel(false);
1943	+	for (Future<?> future : futures) {
1944	+	try {
1945	+	future.get();
1946	+	shouldThrow();
1947	+	} catch (CancellationException success) {}
1948	+	try {
1949	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1950	+	shouldThrow();
1951	+	} catch (CancellationException success) {}
1952	+	assertTrue(future.isCancelled());
1953	+	assertTrue(future.isDone());
1954	+	}
1955	+	done.countDown();
1956	+	} finally {
1957	+	joinPool(e);
1958	+	}
1959	+	}
1960	+
1961		}

Diff Legend

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