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.69 by jsr166, Sun Oct 4 01:29:09 2015 UTC vs.
Revision 1.74 by jsr166, Sun Oct 4 01:58:38 2015 UTC

#	Line 230 | Line 230 | public class ThreadPoolExecutorTest exte
230		new ThreadPoolExecutor(2, 2,
231		1000, MILLISECONDS,
232		new ArrayBlockingQueue<Runnable>(10));
233	<	assertEquals(1, p.getKeepAliveTime(SECONDS));
234	<	joinPool(p);
233	>	try (PoolCleaner cleaner = cleaner(p)) {
234	>	assertEquals(1, p.getKeepAliveTime(SECONDS));
235	>	}
236		}
237
238		/**
239		* getThreadFactory returns factory in constructor if not set
240		*/
241		public void testGetThreadFactory() {
242	<	ThreadFactory tf = new SimpleThreadFactory();
242	>	ThreadFactory threadFactory = new SimpleThreadFactory();
243		final ThreadPoolExecutor p =
244		new ThreadPoolExecutor(1, 2,
245		LONG_DELAY_MS, MILLISECONDS,
246		new ArrayBlockingQueue<Runnable>(10),
247	<	tf,
247	>	threadFactory,
248		new NoOpREHandler());
249	<	assertSame(tf, p.getThreadFactory());
250	<	joinPool(p);
249	>	try (PoolCleaner cleaner = cleaner(p)) {
250	>	assertSame(threadFactory, p.getThreadFactory());
251	>	}
252		}
253
254		/**
#	Line 257 | Line 259 | public class ThreadPoolExecutorTest exte
259		new ThreadPoolExecutor(1, 2,
260		LONG_DELAY_MS, MILLISECONDS,
261		new ArrayBlockingQueue<Runnable>(10));
262	<	ThreadFactory tf = new SimpleThreadFactory();
263	<	p.setThreadFactory(tf);
264	<	assertSame(tf, p.getThreadFactory());
265	<	joinPool(p);
262	>	try (PoolCleaner cleaner = cleaner(p)) {
263	>	ThreadFactory threadFactory = new SimpleThreadFactory();
264	>	p.setThreadFactory(threadFactory);
265	>	assertSame(threadFactory, p.getThreadFactory());
266	>	}
267		}
268
269		/**
#	Line 271 | Line 274 | public class ThreadPoolExecutorTest exte
274		new ThreadPoolExecutor(1, 2,
275		LONG_DELAY_MS, MILLISECONDS,
276		new ArrayBlockingQueue<Runnable>(10));
277	<	try {
278	<	p.setThreadFactory(null);
279	<	shouldThrow();
280	<	} catch (NullPointerException success) {
281	<	} finally {
279	<	joinPool(p);
277	>	try (PoolCleaner cleaner = cleaner(p)) {
278	>	try {
279	>	p.setThreadFactory(null);
280	>	shouldThrow();
281	>	} catch (NullPointerException success) {}
282		}
283		}
284
#	Line 284 | Line 286 | public class ThreadPoolExecutorTest exte
286		* getRejectedExecutionHandler returns handler in constructor if not set
287		*/
288		public void testGetRejectedExecutionHandler() {
289	<	final RejectedExecutionHandler h = new NoOpREHandler();
289	>	final RejectedExecutionHandler handler = new NoOpREHandler();
290		final ThreadPoolExecutor p =
291		new ThreadPoolExecutor(1, 2,
292		LONG_DELAY_MS, MILLISECONDS,
293		new ArrayBlockingQueue<Runnable>(10),
294	<	h);
295	<	assertSame(h, p.getRejectedExecutionHandler());
296	<	joinPool(p);
294	>	handler);
295	>	try (PoolCleaner cleaner = cleaner(p)) {
296	>	assertSame(handler, p.getRejectedExecutionHandler());
297	>	}
298		}
299
300		/**
#	Line 303 | Line 306 | public class ThreadPoolExecutorTest exte
306		new ThreadPoolExecutor(1, 2,
307		LONG_DELAY_MS, MILLISECONDS,
308		new ArrayBlockingQueue<Runnable>(10));
309	<	RejectedExecutionHandler h = new NoOpREHandler();
310	<	p.setRejectedExecutionHandler(h);
311	<	assertSame(h, p.getRejectedExecutionHandler());
312	<	joinPool(p);
309	>	try (PoolCleaner cleaner = cleaner(p)) {
310	>	RejectedExecutionHandler handler = new NoOpREHandler();
311	>	p.setRejectedExecutionHandler(handler);
312	>	assertSame(handler, p.getRejectedExecutionHandler());
313	>	}
314		}
315
316		/**

Diff Legend

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