541 |
|
* the same test have no effect. |
542 |
|
*/ |
543 |
|
public void threadRecordFailure(Throwable t) { |
544 |
+ |
System.err.println(t); |
545 |
|
dumpTestThreads(); |
546 |
|
threadFailure.compareAndSet(null, t); |
547 |
|
} |
770 |
|
/** |
771 |
|
* Allows use of try-with-resources with per-test thread pools. |
772 |
|
*/ |
773 |
< |
static class PoolCloser<T extends ExecutorService> |
774 |
< |
implements AutoCloseable { |
775 |
< |
public final T pool; |
775 |
< |
public PoolCloser(T pool) { this.pool = pool; } |
773 |
> |
class PoolCleaner implements AutoCloseable { |
774 |
> |
private final ExecutorService pool; |
775 |
> |
public PoolCleaner(ExecutorService pool) { this.pool = pool; } |
776 |
|
public void close() { joinPool(pool); } |
777 |
|
} |
778 |
|
|
779 |
+ |
PoolCleaner cleaner(ExecutorService pool) { |
780 |
+ |
return new PoolCleaner(pool); |
781 |
+ |
} |
782 |
+ |
|
783 |
|
/** |
784 |
|
* Waits out termination of a thread pool or fails doing so. |
785 |
|
*/ |
786 |
< |
static void joinPool(ExecutorService pool) { |
786 |
> |
void joinPool(ExecutorService pool) { |
787 |
|
try { |
788 |
|
pool.shutdown(); |
789 |
< |
if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) |
790 |
< |
fail("ExecutorService " + pool + |
791 |
< |
" did not terminate in a timely manner"); |
789 |
> |
if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) { |
790 |
> |
try { |
791 |
> |
threadFail("ExecutorService " + pool + |
792 |
> |
" did not terminate in a timely manner"); |
793 |
> |
} finally { |
794 |
> |
// last resort, for the benefit of subsequent tests |
795 |
> |
pool.shutdownNow(); |
796 |
> |
pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS); |
797 |
> |
} |
798 |
> |
} |
799 |
|
} catch (SecurityException ok) { |
800 |
|
// Allowed in case test doesn't have privs |
801 |
|
} catch (InterruptedException fail) { |
802 |
< |
fail("Unexpected InterruptedException"); |
802 |
> |
threadFail("Unexpected InterruptedException"); |
803 |
|
} |
804 |
|
} |
805 |
|
|
812 |
|
* necessarily individually slow because they must block. |
813 |
|
*/ |
814 |
|
void testInParallel(Action ... actions) { |
815 |
< |
try (PoolCloser<ExecutorService> poolCloser |
816 |
< |
= new PoolCloser<>(Executors.newCachedThreadPool())) { |
806 |
< |
ExecutorService pool = poolCloser.pool; |
815 |
> |
ExecutorService pool = Executors.newCachedThreadPool(); |
816 |
> |
try (PoolCleaner cleaner = cleaner(pool)) { |
817 |
|
ArrayList<Future<?>> futures = new ArrayList<>(actions.length); |
818 |
|
for (final Action action : actions) |
819 |
|
futures.add(pool.submit(new CheckedRunnable() { |
870 |
|
delay(millis); |
871 |
|
assertTrue(thread.isAlive()); |
872 |
|
} catch (InterruptedException fail) { |
873 |
< |
fail("Unexpected InterruptedException"); |
873 |
> |
threadFail("Unexpected InterruptedException"); |
874 |
|
} |
875 |
|
} |
876 |
|
|
892 |
|
for (Thread thread : threads) |
893 |
|
assertTrue(thread.isAlive()); |
894 |
|
} catch (InterruptedException fail) { |
895 |
< |
fail("Unexpected InterruptedException"); |
895 |
> |
threadFail("Unexpected InterruptedException"); |
896 |
|
} |
897 |
|
} |
898 |
|
|
1318 |
|
}}; |
1319 |
|
} |
1320 |
|
|
1321 |
< |
public Runnable awaiter(final CountDownLatch latch) { |
1322 |
< |
return new CheckedRunnable() { |
1323 |
< |
public void realRun() throws InterruptedException { |
1324 |
< |
await(latch); |
1325 |
< |
}}; |
1321 |
> |
class LatchAwaiter extends CheckedRunnable { |
1322 |
> |
static final int NEW = 0; |
1323 |
> |
static final int RUNNING = 1; |
1324 |
> |
static final int DONE = 2; |
1325 |
> |
final CountDownLatch latch; |
1326 |
> |
int state = NEW; |
1327 |
> |
LatchAwaiter(CountDownLatch latch) { this.latch = latch; } |
1328 |
> |
public void realRun() throws InterruptedException { |
1329 |
> |
state = 1; |
1330 |
> |
await(latch); |
1331 |
> |
state = 2; |
1332 |
> |
} |
1333 |
> |
} |
1334 |
> |
|
1335 |
> |
public LatchAwaiter awaiter(CountDownLatch latch) { |
1336 |
> |
return new LatchAwaiter(latch); |
1337 |
|
} |
1338 |
|
|
1339 |
|
public void await(CountDownLatch latch) { |