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.65 by jsr166, Sat Oct 3 00:37:32 2015 UTC vs.
Revision 1.80 by jsr166, Sun Oct 4 02:21:43 2015 UTC

#	Line 87 | 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();
94	<	}};
95	<	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));
98	<	} finally {
99	<	joinPool(p);
95	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
96		}
97		}
98
#	Line 109 | 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 119 | 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());
124	–	} finally {
120		done.countDown();
126	–	joinPool(p);
121		}
122		}
123
#	Line 132 | 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 150 | 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 170 | 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 192 | Line 200 | public class ThreadPoolExecutorTest exte
200		fail("timed out");
201		Thread.yield();
202		}
195	–	} finally {
196	–	joinPool(p);
203		}
204		}
205
#	Line 205 | 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 217 | 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 244 | 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 258 | 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 {
266	<	joinPool(p);
271	>	try (PoolCleaner cleaner = cleaner(p)) {
272	>	try {
273	>	p.setThreadFactory(null);
274	>	shouldThrow();
275	>	} catch (NullPointerException success) {}
276		}
277		}
278
#	Line 271 | 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 290 | 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 304 | 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 {
312	<	joinPool(p);
318	>	try (PoolCleaner cleaner = cleaner(p)) {
319	>	try {
320	>	p.setRejectedExecutionHandler(null);
321	>	shouldThrow();
322	>	} catch (NullPointerException success) {}
323		}
324		}
325
#	Line 323 | 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 334 | Line 344 | public class ThreadPoolExecutorTest exte
344		done.await();
345		assertEquals(THREADS, p.getLargestPoolSize());
346		}});
347	<	assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
338	<	assertEquals(THREADS, p.getLargestPoolSize());
339	<	} finally {
340	<	done.countDown();
341	<	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 352 | 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 365 | 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 375 | 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 {
381	<	done.countDown();
382	<	joinPool(p);
393	>	done.countDown();   // release pool
394		}
395		}
396
#	Line 401 | 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());
417		} finally {
418		done.countDown();
#	Line 471 | Line 482 | public class ThreadPoolExecutorTest exte
482		threadStarted.countDown();
483		done.await();
484		}});
485	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
485	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
486		assertFalse(p.isTerminating());
487		done.countDown();
488		} finally {
#	Line 499 | Line 510 | public class ThreadPoolExecutorTest exte
510		threadStarted.countDown();
511		done.await();
512		}});
513	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
513	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
514		assertFalse(p.isTerminating());
515		done.countDown();
516		} finally {
#	Line 534 | 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]));
#	Line 566 | Line 577 | public class ThreadPoolExecutorTest exte
577		}};
578		p.execute(tasks[i]);
579		}
580	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
580	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
581		assertFalse(p.remove(tasks[0]));
582		assertTrue(q.contains(tasks[4]));
583		assertTrue(q.contains(tasks[3]));
#	Line 605 | Line 616 | public class ThreadPoolExecutorTest exte
616		tasks[i] = new FutureTask(task);
617		p.execute(tasks[i]);
618		}
619	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
619	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
620		assertEquals(tasks.length, p.getTaskCount());
621		assertEquals(tasks.length - 1, q.size());
622		assertEquals(1L, p.getActiveCount());
#	Line 1027 | Line 1038 | public class ThreadPoolExecutorTest exte
1038		p.submit(task).get();
1039		}});
1040
1041	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1041	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
1042		t.interrupt();
1043		awaitTermination(t, MEDIUM_DELAY_MS);
1044		} finally {

Diff Legend

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