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.36 by jsr166, Fri May 15 17:07:27 2015 UTC vs.
Revision 1.68 by jsr166, Sun Oct 4 02:26:47 2015 UTC

#	Line 14 | Line 14 | import java.util.List;
14		import java.util.concurrent.ArrayBlockingQueue;
15		import java.util.concurrent.BlockingQueue;
16		import java.util.concurrent.Callable;
17	+	import java.util.concurrent.CancellationException;
18		import java.util.concurrent.CountDownLatch;
19		import java.util.concurrent.ExecutionException;
20		import java.util.concurrent.Executors;
#	Line 29 | Line 30 | import java.util.concurrent.ThreadFactor
30		import java.util.concurrent.ThreadPoolExecutor;
31		import java.util.concurrent.TimeoutException;
32		import java.util.concurrent.TimeUnit;
33	+	import java.util.concurrent.atomic.AtomicInteger;
34		import java.util.concurrent.locks.Condition;
35		import java.util.concurrent.locks.ReentrantLock;
36
#	Line 99 | 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 112 | 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 123 | Line 129 | public class ThreadPoolExecutorSubclassT
129		long nanos = unit.toNanos(timeout);
130		lock.lock();
131		try {
132	<	for (;;) {
133	<	if (done) break;
128	<	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 225 | 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();
234	<	}};
235	<	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));
238	<	} finally {
239	<	joinPool(p);
242	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243		}
244		}
245
#	Line 249 | 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 259 | 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());
264	–	} finally {
267		done.countDown();
266	–	joinPool(p);
268		}
269		}
270
#	Line 271 | 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 304 | 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 326 | Line 347 | public class ThreadPoolExecutorSubclassT
347		fail("timed out");
348		Thread.yield();
349		}
329	–	} finally {
330	–	joinPool(p);
350		}
351		}
352
#	Line 335 | 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(TimeUnit.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 388 | 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 399 | 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 430 | 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 441 | Line 491 | public class ThreadPoolExecutorSubclassT
491		done.await();
492		assertEquals(THREADS, p.getLargestPoolSize());
493		}});
494	<	assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
445	<	assertEquals(THREADS, p.getLargestPoolSize());
446	<	} finally {
447	<	done.countDown();
448	<	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 455 | 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 469 | 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 479 | 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 {
485	<	done.countDown();
486	<	joinPool(p);
540	>	done.countDown();   // release pool
541		}
542		}
543
#	Line 495 | 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 505 | 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());
510	–	} finally {
564		done.countDown();
512	–	joinPool(p);
565		}
566		}
567
#	Line 517 | 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 543 | 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();
604		} finally {
#	Line 572 | Line 627 | public class ThreadPoolExecutorSubclassT
627		threadStarted.countDown();
628		done.await();
629		}});
630	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
630	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
631		assertFalse(p.isTerminating());
632		done.countDown();
633		} finally {
#	Line 607 | Line 662 | public class ThreadPoolExecutorSubclassT
662		tasks[i] = new FutureTask(task);
663		p.execute(tasks[i]);
664		}
665	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
665	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
666		assertSame(q, p.getQueue());
667		assertFalse(q.contains(tasks[0]));
668		assertTrue(q.contains(tasks[tasks.length - 1]));
#	Line 639 | Line 694 | public class ThreadPoolExecutorSubclassT
694		}};
695		p.execute(tasks[i]);
696		}
697	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
697	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
698		assertFalse(p.remove(tasks[0]));
699		assertTrue(q.contains(tasks[4]));
700		assertTrue(q.contains(tasks[3]));
#	Line 678 | Line 733 | public class ThreadPoolExecutorSubclassT
733		tasks[i] = new FutureTask(task);
734		p.execute(tasks[i]);
735		}
736	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
736	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
737		assertEquals(tasks.length, p.getTaskCount());
738		assertEquals(tasks.length - 1, q.size());
739		assertEquals(1L, p.getActiveCount());
#	Line 698 | Line 753 | public class ThreadPoolExecutorSubclassT
753		}
754
755		/**
756	<	* shutdownNow returns a list containing tasks that were not run
756	>	* shutdownNow returns a list containing tasks that were not run,
757	>	* and those tasks are drained from the queue
758		*/
759	<	public void testShutdownNow() {
760	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
761	<	List l;
762	<	try {
763	<	for (int i = 0; i < 5; i++)
764	<	p.execute(new MediumPossiblyInterruptedRunnable());
765	<	}
766	<	finally {
759	>	public void testShutdownNow() throws InterruptedException {
760	>	final int poolSize = 2;
761	>	final int count = 5;
762	>	final AtomicInteger ran = new AtomicInteger(0);
763	>	ThreadPoolExecutor p =
764	>	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
765	>	new ArrayBlockingQueue<Runnable>(10));
766	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
767	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
768	>	threadsStarted.countDown();
769		try {
770	<	l = p.shutdownNow();
771	<	} catch (SecurityException ok) { return; }
770	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
771	>	} catch (InterruptedException success) {}
772	>	ran.getAndIncrement();
773	>	}};
774	>	for (int i = 0; i < count; i++)
775	>	p.execute(waiter);
776	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
777	>	assertEquals(poolSize, p.getActiveCount());
778	>	assertEquals(0, p.getCompletedTaskCount());
779	>	final List<Runnable> queuedTasks;
780	>	try {
781	>	queuedTasks = p.shutdownNow();
782	>	} catch (SecurityException ok) {
783	>	return; // Allowed in case test doesn't have privs
784		}
785		assertTrue(p.isShutdown());
786	<	assertTrue(l.size() <= 4);
786	>	assertTrue(p.getQueue().isEmpty());
787	>	assertEquals(count - poolSize, queuedTasks.size());
788	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
789	>	assertTrue(p.isTerminated());
790	>	assertEquals(poolSize, ran.get());
791	>	assertEquals(poolSize, p.getCompletedTaskCount());
792		}
793
794		// Exception Tests
#	Line 1223 | Line 1298 | public class ThreadPoolExecutorSubclassT
1298		* execute(null) throws NPE
1299		*/
1300		public void testExecuteNull() {
1301	<	ThreadPoolExecutor p = null;
1301	>	ThreadPoolExecutor p =
1302	>	new CustomTPE(1, 2, 1L, SECONDS,
1303	>	new ArrayBlockingQueue<Runnable>(10));
1304		try {
1228	–	p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1305		p.execute(null);
1306		shouldThrow();
1307		} catch (NullPointerException success) {}
#	Line 1721 | Line 1797 | public class ThreadPoolExecutorSubclassT
1797		l.add(new StringTask());
1798		l.add(new StringTask());
1799		List<Future<String>> futures =
1800	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1800	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1801		assertEquals(2, futures.size());
1802		for (Future<String> future : futures)
1803		assertSame(TEST_STRING, future.get());
#	Line 1736 | Line 1812 | public class ThreadPoolExecutorSubclassT
1812		public void testTimedInvokeAll6() throws Exception {
1813		ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1814		try {
1815	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1816	<	l.add(new StringTask());
1817	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1818	<	l.add(new StringTask());
1819	<	List<Future<String>> futures =
1820	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1821	<	assertEquals(l.size(), futures.size());
1822	<	for (Future future : futures)
1823	<	assertTrue(future.isDone());
1824	<	assertFalse(futures.get(0).isCancelled());
1825	<	assertTrue(futures.get(1).isCancelled());
1815	>	for (long timeout = timeoutMillis();;) {
1816	>	List<Callable<String>> tasks = new ArrayList<>();
1817	>	tasks.add(new StringTask("0"));
1818	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1819	>	tasks.add(new StringTask("2"));
1820	>	long startTime = System.nanoTime();
1821	>	List<Future<String>> futures =
1822	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1823	>	assertEquals(tasks.size(), futures.size());
1824	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1825	>	for (Future future : futures)
1826	>	assertTrue(future.isDone());
1827	>	assertTrue(futures.get(1).isCancelled());
1828	>	try {
1829	>	assertEquals("0", futures.get(0).get());
1830	>	assertEquals("2", futures.get(2).get());
1831	>	break;
1832	>	} catch (CancellationException retryWithLongerTimeout) {
1833	>	timeout *= 2;
1834	>	if (timeout >= LONG_DELAY_MS / 2)
1835	>	fail("expected exactly one task to be cancelled");
1836	>	}
1837	>	}
1838		} finally {
1839		joinPool(e);
1840		}
#	Line 1789 | Line 1877 | public class ThreadPoolExecutorSubclassT
1877		* allowCoreThreadTimeOut(true) causes idle threads to time out
1878		*/
1879		public void testAllowCoreThreadTimeOut_true() throws Exception {
1880	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1880	>	long keepAliveTime = timeoutMillis();
1881		final ThreadPoolExecutor p =
1882		new CustomTPE(2, 10,
1883	<	coreThreadTimeOut, MILLISECONDS,
1883	>	keepAliveTime, MILLISECONDS,
1884		new ArrayBlockingQueue<Runnable>(10));
1885		final CountDownLatch threadStarted = new CountDownLatch(1);
1886		try {
1887		p.allowCoreThreadTimeOut(true);
1888		p.execute(new CheckedRunnable() {
1889	<	public void realRun() throws InterruptedException {
1889	>	public void realRun() {
1890		threadStarted.countDown();
1891		assertEquals(1, p.getPoolSize());
1892		}});
1893		await(threadStarted);
1894	<	delay(coreThreadTimeOut);
1894	>	delay(keepAliveTime);
1895		long startTime = System.nanoTime();
1896		while (p.getPoolSize() > 0
1897		&& millisElapsedSince(startTime) < LONG_DELAY_MS)
#	Line 1819 | Line 1907 | public class ThreadPoolExecutorSubclassT
1907		* allowCoreThreadTimeOut(false) causes idle threads not to time out
1908		*/
1909		public void testAllowCoreThreadTimeOut_false() throws Exception {
1910	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1910	>	long keepAliveTime = timeoutMillis();
1911		final ThreadPoolExecutor p =
1912		new CustomTPE(2, 10,
1913	<	coreThreadTimeOut, MILLISECONDS,
1913	>	keepAliveTime, MILLISECONDS,
1914		new ArrayBlockingQueue<Runnable>(10));
1915		final CountDownLatch threadStarted = new CountDownLatch(1);
1916		try {
#	Line 1832 | Line 1920 | public class ThreadPoolExecutorSubclassT
1920		threadStarted.countDown();
1921		assertTrue(p.getPoolSize() >= 1);
1922		}});
1923	<	delay(2 * coreThreadTimeOut);
1923	>	delay(2 * keepAliveTime);
1924		assertTrue(p.getPoolSize() >= 1);
1925		} finally {
1926		joinPool(p);
1927		}
1928		}
1929
1930	+	/**
1931	+	* get(cancelled task) throws CancellationException
1932	+	* (in part, a test of CustomTPE itself)
1933	+	*/
1934	+	public void testGet_cancelled() throws Exception {
1935	+	final ExecutorService e =
1936	+	new CustomTPE(1, 1,
1937	+	LONG_DELAY_MS, MILLISECONDS,
1938	+	new LinkedBlockingQueue<Runnable>());
1939	+	try {
1940	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1941	+	final CountDownLatch done = new CountDownLatch(1);
1942	+	final List<Future<?>> futures = new ArrayList<>();
1943	+	for (int i = 0; i < 2; i++) {
1944	+	Runnable r = new CheckedRunnable() { public void realRun()
1945	+	throws Throwable {
1946	+	blockerStarted.countDown();
1947	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1948	+	}};
1949	+	futures.add(e.submit(r));
1950	+	}
1951	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1952	+	for (Future<?> future : futures) future.cancel(false);
1953	+	for (Future<?> future : futures) {
1954	+	try {
1955	+	future.get();
1956	+	shouldThrow();
1957	+	} catch (CancellationException success) {}
1958	+	try {
1959	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1960	+	shouldThrow();
1961	+	} catch (CancellationException success) {}
1962	+	assertTrue(future.isCancelled());
1963	+	assertTrue(future.isDone());
1964	+	}
1965	+	done.countDown();
1966	+	} finally {
1967	+	joinPool(e);
1968	+	}
1969	+	}
1970	+
1971		}

Diff Legend

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