ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/JSR166TestCase.java

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.158 by jsr166, Sat Oct 3 23:17:03 2015 UTC vs.
Revision 1.159 by jsr166, Sun Oct 4 00:30:50 2015 UTC

#	Line 770 | Line 770 | public class JSR166TestCase extends Test
770		/**
771		* Allows use of try-with-resources with per-test thread pools.
772		*/
773	<	class PoolCloser<T extends ExecutorService>
773	>	class PoolCleaner<T extends ExecutorService>
774		implements AutoCloseable {
775		public final T pool;
776	<	public PoolCloser(T pool) { this.pool = pool; }
776	>	public PoolCleaner(T pool) { this.pool = pool; }
777		public void close() { joinPool(pool); }
778		}
779
780	+	<T extends ExecutorService> PoolCleaner<T> cleaner(T pool) {
781	+	return new PoolCleaner<T>(pool);
782	+	}
783	+
784		/**
785		* Waits out termination of a thread pool or fails doing so.
786		*/
#	Line 809 | Line 813 | public class JSR166TestCase extends Test
813		* necessarily individually slow because they must block.
814		*/
815		void testInParallel(Action ... actions) {
816	<	try (PoolCloser<ExecutorService> poolCloser
817	<	= new PoolCloser<>(Executors.newCachedThreadPool())) {
818	<	ExecutorService pool = poolCloser.pool;
816	>	try (PoolCleaner<ExecutorService> cleaner
817	>	= cleaner(Executors.newCachedThreadPool())) {
818	>	ExecutorService pool = cleaner.pool;
819		ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
820		for (final Action action : actions)
821		futures.add(pool.submit(new CheckedRunnable() {

Diff Legend

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