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.74 by jsr166, Sun Oct 4 01:58:38 2015 UTC vs.
Revision 1.76 by jsr166, Sun Oct 4 02:04:56 2015 UTC

#	Line 321 | Line 321 | public class ThreadPoolExecutorTest exte
321		new ThreadPoolExecutor(1, 2,
322		LONG_DELAY_MS, MILLISECONDS,
323		new ArrayBlockingQueue<Runnable>(10));
324	<	try {
325	<	p.setRejectedExecutionHandler(null);
326	<	shouldThrow();
327	<	} catch (NullPointerException success) {
328	<	} finally {
329	<	joinPool(p);
324	>	try (PoolCleaner cleaner = cleaner(p)) {
325	>	try {
326	>	p.setRejectedExecutionHandler(null);
327	>	shouldThrow();
328	>	} catch (NullPointerException success) {}
329		}
330		}
331
#	Line 340 | Line 339 | public class ThreadPoolExecutorTest exte
339		new ThreadPoolExecutor(THREADS, THREADS,
340		LONG_DELAY_MS, MILLISECONDS,
341		new ArrayBlockingQueue<Runnable>(10));
342	<	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
343	<	final CountDownLatch done = new CountDownLatch(1);
344	<	try {
342	>	try (PoolCleaner cleaner = cleaner(p)) {
343	>	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
344	>	final CountDownLatch done = new CountDownLatch(1);
345		assertEquals(0, p.getLargestPoolSize());
346		for (int i = 0; i < THREADS; i++)
347		p.execute(new CheckedRunnable() {
#	Line 351 | Line 350 | public class ThreadPoolExecutorTest exte
350		done.await();
351		assertEquals(THREADS, p.getLargestPoolSize());
352		}});
353	<	assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
355	<	assertEquals(THREADS, p.getLargestPoolSize());
356	<	} finally {
357	<	done.countDown();
358	<	joinPool(p);
353	>	assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
354		assertEquals(THREADS, p.getLargestPoolSize());
355	+	done.countDown();   // release pool
356		}
357	+	assertEquals(THREADS, p.getLargestPoolSize());
358		}
359
360		/**

Diff Legend

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