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.68 by jsr166, Sun Oct 4 02:26:47 2015 UTC vs.
Revision 1.71 by jsr166, Sun Oct 4 02:34:48 2015 UTC

#	Line 588 | Line 588 | public class ThreadPoolExecutorSubclassT
588		new CustomTPE(1, 1,
589		LONG_DELAY_MS, MILLISECONDS,
590		new ArrayBlockingQueue<Runnable>(10));
591	<	final CountDownLatch threadStarted = new CountDownLatch(1);
592	<	final CountDownLatch done = new CountDownLatch(1);
593	<	try {
591	>	try (PoolCleaner cleaner = cleaner(p)) {
592	>	final CountDownLatch threadStarted = new CountDownLatch(1);
593	>	final CountDownLatch done = new CountDownLatch(1);
594		assertFalse(p.isTerminating());
595		p.execute(new CheckedRunnable() {
596		public void realRun() throws InterruptedException {
#	Line 601 | Line 601 | public class ThreadPoolExecutorSubclassT
601		assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
602		assertFalse(p.isTerminating());
603		done.countDown();
604	–	} finally {
604		try { p.shutdown(); } catch (SecurityException ok) { return; }
605	+	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
606	+	assertTrue(p.isTerminated());
607	+	assertFalse(p.isTerminating());
608		}
607	–	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
608	–	assertTrue(p.isTerminated());
609	–	assertFalse(p.isTerminating());
609		}
610
611		/**
#	Line 617 | Line 616 | public class ThreadPoolExecutorSubclassT
616		new CustomTPE(1, 1,
617		LONG_DELAY_MS, MILLISECONDS,
618		new ArrayBlockingQueue<Runnable>(10));
619	<	final CountDownLatch threadStarted = new CountDownLatch(1);
620	<	final CountDownLatch done = new CountDownLatch(1);
621	<	try {
619	>	try (PoolCleaner cleaner = cleaner(p)) {
620	>	final CountDownLatch threadStarted = new CountDownLatch(1);
621	>	final CountDownLatch done = new CountDownLatch(1);
622		assertFalse(p.isTerminating());
623		p.execute(new CheckedRunnable() {
624		public void realRun() throws InterruptedException {
#	Line 630 | Line 629 | public class ThreadPoolExecutorSubclassT
629		assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
630		assertFalse(p.isTerminating());
631		done.countDown();
633	–	} finally {
632		try { p.shutdown(); } catch (SecurityException ok) { return; }
633	+	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
634	+	assertTrue(p.isTerminated());
635	+	assertFalse(p.isTerminating());
636		}
636	–	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
637	–	assertTrue(p.isTerminated());
638	–	assertFalse(p.isTerminating());
637		}
638
639		/**
#	Line 647 | Line 645 | public class ThreadPoolExecutorSubclassT
645		new CustomTPE(1, 1,
646		LONG_DELAY_MS, MILLISECONDS,
647		q);
648	<	final CountDownLatch threadStarted = new CountDownLatch(1);
649	<	final CountDownLatch done = new CountDownLatch(1);
650	<	try {
648	>	try (PoolCleaner cleaner = cleaner(p)) {
649	>	final CountDownLatch threadStarted = new CountDownLatch(1);
650	>	final CountDownLatch done = new CountDownLatch(1);
651		FutureTask[] tasks = new FutureTask[5];
652		for (int i = 0; i < tasks.length; i++) {
653		Callable task = new CheckedCallable<Boolean>() {
#	Line 667 | Line 665 | public class ThreadPoolExecutorSubclassT
665		assertFalse(q.contains(tasks[0]));
666		assertTrue(q.contains(tasks[tasks.length - 1]));
667		assertEquals(tasks.length - 1, q.size());
670	–	} finally {
668		done.countDown();
672	–	joinPool(p);
669		}
670		}
671

Diff Legend

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