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.67 by jsr166, Sun Oct 4 01:23:41 2015 UTC vs.
Revision 1.72 by jsr166, Sun Oct 4 01:52:43 2015 UTC

#	Line 184 | Line 184 | public class ThreadPoolExecutorTest exte
184		new ThreadPoolExecutor(2, 2,
185		LONG_DELAY_MS, MILLISECONDS,
186		new ArrayBlockingQueue<Runnable>(10));
187	<	final CountDownLatch threadStarted = new CountDownLatch(1);
188	<	final CountDownLatch threadProceed = new CountDownLatch(1);
189	<	final CountDownLatch threadDone = new CountDownLatch(1);
190	<	try {
187	>	try (PoolCleaner cleaner = cleaner(p)) {
188	>	final CountDownLatch threadStarted = new CountDownLatch(1);
189	>	final CountDownLatch threadProceed = new CountDownLatch(1);
190	>	final CountDownLatch threadDone = new CountDownLatch(1);
191		assertEquals(0, p.getCompletedTaskCount());
192		p.execute(new CheckedRunnable() {
193		public void realRun() throws InterruptedException {
#	Line 206 | Line 206 | public class ThreadPoolExecutorTest exte
206		fail("timed out");
207		Thread.yield();
208		}
209	–	} finally {
210	–	joinPool(p);
209		}
210		}
211
#	Line 219 | Line 217 | public class ThreadPoolExecutorTest exte
217		new ThreadPoolExecutor(1, 1,
218		LONG_DELAY_MS, MILLISECONDS,
219		new ArrayBlockingQueue<Runnable>(10));
220	<	assertEquals(1, p.getCorePoolSize());
221	<	joinPool(p);
220	>	try (PoolCleaner cleaner = cleaner(p)) {
221	>	assertEquals(1, p.getCorePoolSize());
222	>	}
223		}
224
225		/**
#	Line 231 | 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 258 | 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 272 | 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 {
280	<	joinPool(p);
277	>	try (PoolCleaner cleaner = cleaner(p)) {
278	>	try {
279	>	p.setThreadFactory(null);
280	>	shouldThrow();
281	>	} catch (NullPointerException success) {}
282		}
283		}
284

Diff Legend

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