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.63 by jsr166, Sun Oct 4 02:07:32 2015 UTC vs.
Revision 1.65 by jsr166, Sun Oct 4 02:15:08 2015 UTC

#	Line 262 | Line 262 | public class ThreadPoolExecutorSubclassT
262		assertEquals(1, p.getActiveCount());
263		done.await();
264		}});
265	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
265	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
266		assertEquals(1, p.getActiveCount());
267		done.countDown();
268		}
#	Line 525 | Line 525 | public class ThreadPoolExecutorSubclassT
525		new CustomTPE(1, 1,
526		LONG_DELAY_MS, MILLISECONDS,
527		new ArrayBlockingQueue<Runnable>(10));
528	<	final CountDownLatch threadStarted = new CountDownLatch(1);
529	<	final CountDownLatch done = new CountDownLatch(1);
530	<	try {
528	>	try (PoolCleaner cleaner = cleaner(p)) {
529	>	final CountDownLatch threadStarted = new CountDownLatch(1);
530	>	final CountDownLatch done = new CountDownLatch(1);
531		assertEquals(0, p.getPoolSize());
532		p.execute(new CheckedRunnable() {
533		public void realRun() throws InterruptedException {
#	Line 535 | Line 535 | public class ThreadPoolExecutorSubclassT
535		assertEquals(1, p.getPoolSize());
536		done.await();
537		}});
538	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
538	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
539		assertEquals(1, p.getPoolSize());
540	<	} finally {
541	<	done.countDown();
542	<	joinPool(p);
540	>	done.countDown();   // release pool
541		}
542		}
543
#	Line 561 | Line 559 | public class ThreadPoolExecutorSubclassT
559		assertEquals(1, p.getTaskCount());
560		done.await();
561		}});
562	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
562	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
563		assertEquals(1, p.getTaskCount());
564		} finally {
565		done.countDown();
#	Line 599 | Line 597 | public class ThreadPoolExecutorSubclassT
597		threadStarted.countDown();
598		done.await();
599		}});
600	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
600	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
601		assertFalse(p.isTerminating());
602		done.countDown();
603		} finally {
#	Line 628 | Line 626 | public class ThreadPoolExecutorSubclassT
626		threadStarted.countDown();
627		done.await();
628		}});
629	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
629	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
630		assertFalse(p.isTerminating());
631		done.countDown();
632		} finally {
#	Line 663 | Line 661 | public class ThreadPoolExecutorSubclassT
661		tasks[i] = new FutureTask(task);
662		p.execute(tasks[i]);
663		}
664	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
664	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
665		assertSame(q, p.getQueue());
666		assertFalse(q.contains(tasks[0]));
667		assertTrue(q.contains(tasks[tasks.length - 1]));
#	Line 695 | Line 693 | public class ThreadPoolExecutorSubclassT
693		}};
694		p.execute(tasks[i]);
695		}
696	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
696	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
697		assertFalse(p.remove(tasks[0]));
698		assertTrue(q.contains(tasks[4]));
699		assertTrue(q.contains(tasks[3]));
#	Line 734 | Line 732 | public class ThreadPoolExecutorSubclassT
732		tasks[i] = new FutureTask(task);
733		p.execute(tasks[i]);
734		}
735	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
735	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
736		assertEquals(tasks.length, p.getTaskCount());
737		assertEquals(tasks.length - 1, q.size());
738		assertEquals(1L, p.getActiveCount());

Diff Legend

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