--- jsr166/src/test/tck/RecursiveTaskTest.java 2017/03/18 18:20:00 1.35 +++ jsr166/src/test/tck/RecursiveTaskTest.java 2021/01/27 01:57:24 1.43 @@ -4,7 +4,7 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -import static java.util.concurrent.TimeUnit.SECONDS; +import static java.util.concurrent.TimeUnit.MILLISECONDS; import java.util.HashSet; import java.util.concurrent.CancellationException; @@ -51,7 +51,7 @@ public class RecursiveTaskTest extends J } } - void checkNotDone(RecursiveTask a) { + void checkNotDone(RecursiveTask a) { assertFalse(a.isDone()); assertFalse(a.isCompletedNormally()); assertFalse(a.isCompletedAbnormally()); @@ -69,44 +69,46 @@ public class RecursiveTaskTest extends J Thread.currentThread().interrupt(); try { - a.get(5L, SECONDS); + a.get(randomTimeout(), randomTimeUnit()); shouldThrow(); } catch (InterruptedException success) { } catch (Throwable fail) { threadUnexpectedException(fail); } } try { - a.get(0L, SECONDS); + a.get(randomExpiredTimeout(), randomTimeUnit()); shouldThrow(); } catch (TimeoutException success) { } catch (Throwable fail) { threadUnexpectedException(fail); } } - void checkCompletedNormally(RecursiveTask a, T expected) { + void checkCompletedNormally(RecursiveTask a, T expectedValue) { assertTrue(a.isDone()); assertFalse(a.isCancelled()); assertTrue(a.isCompletedNormally()); assertFalse(a.isCompletedAbnormally()); assertNull(a.getException()); - assertSame(expected, a.getRawResult()); - assertSame(expected, a.join()); + assertSame(expectedValue, a.getRawResult()); + assertSame(expectedValue, a.join()); assertFalse(a.cancel(false)); assertFalse(a.cancel(true)); + + T v1 = null, v2 = null; try { - assertSame(expected, a.get()); - } catch (Throwable fail) { threadUnexpectedException(fail); } - try { - assertSame(expected, a.get(5L, SECONDS)); + v1 = a.get(); + v2 = a.get(randomTimeout(), randomTimeUnit()); } catch (Throwable fail) { threadUnexpectedException(fail); } + assertSame(expectedValue, v1); + assertSame(expectedValue, v2); } /** * Waits for the task to complete, and checks that when it does, * it will have an Integer result equals to the given int. */ - void checkCompletesNormally(RecursiveTask a, int expected) { + void checkCompletesNormally(RecursiveTask a, int expectedValue) { Integer r = a.join(); - assertEquals(expected, (int) r); + assertEquals(expectedValue, (int) r); checkCompletedNormally(a, r); } @@ -114,13 +116,13 @@ public class RecursiveTaskTest extends J * Like checkCompletesNormally, but verifies that the task has * already completed. */ - void checkCompletedNormally(RecursiveTask a, int expected) { + void checkCompletedNormally(RecursiveTask a, int expectedValue) { Integer r = a.getRawResult(); - assertEquals(expected, (int) r); + assertEquals(expectedValue, (int) r); checkCompletedNormally(a, r); } - void checkCancelled(RecursiveTask a) { + void checkCancelled(RecursiveTask a) { assertTrue(a.isDone()); assertTrue(a.isCancelled()); assertFalse(a.isCompletedNormally()); @@ -141,13 +143,13 @@ public class RecursiveTaskTest extends J } catch (Throwable fail) { threadUnexpectedException(fail); } try { - a.get(5L, SECONDS); + a.get(randomTimeout(), randomTimeUnit()); shouldThrow(); } catch (CancellationException success) { } catch (Throwable fail) { threadUnexpectedException(fail); } } - void checkCompletedAbnormally(RecursiveTask a, Throwable t) { + void checkCompletedAbnormally(RecursiveTask a, Throwable t) { assertTrue(a.isDone()); assertFalse(a.isCancelled()); assertFalse(a.isCompletedNormally()); @@ -172,7 +174,7 @@ public class RecursiveTaskTest extends J } catch (Throwable fail) { threadUnexpectedException(fail); } try { - a.get(5L, SECONDS); + a.get(randomTimeout(), randomTimeUnit()); shouldThrow(); } catch (ExecutionException success) { assertSame(t.getClass(), success.getCause().getClass()); @@ -196,7 +198,7 @@ public class RecursiveTaskTest extends J return n; FibTask f1 = new FibTask(n - 1); f1.fork(); - return (new FibTask(n - 2)).compute() + f1.join(); + return new FibTask(n - 2).compute() + f1.join(); } public void publicSetRawResult(Integer result) { @@ -215,7 +217,7 @@ public class RecursiveTaskTest extends J throw new FJException(); FailingFibTask f1 = new FailingFibTask(n - 1); f1.fork(); - return (new FibTask(n - 2)).compute() + f1.join(); + return new FibTask(n - 2).compute() + f1.join(); } } @@ -226,7 +228,7 @@ public class RecursiveTaskTest extends J * returns value; */ public void testInvoke() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); Integer r = f.invoke(); @@ -243,7 +245,7 @@ public class RecursiveTaskTest extends J * completed tasks */ public void testQuietlyInvoke() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); f.quietlyInvoke(); @@ -257,7 +259,7 @@ public class RecursiveTaskTest extends J * join of a forked task returns when task completes */ public void testForkJoin() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); assertSame(f, f.fork()); @@ -273,7 +275,7 @@ public class RecursiveTaskTest extends J * get of a forked task returns when task completes */ public void testForkGet() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() throws Exception { FibTask f = new FibTask(8); assertSame(f, f.fork()); @@ -289,11 +291,11 @@ public class RecursiveTaskTest extends J * timed get of a forked task returns when task completes */ public void testForkTimedGet() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() throws Exception { FibTask f = new FibTask(8); assertSame(f, f.fork()); - Integer r = f.get(5L, SECONDS); + Integer r = f.get(LONG_DELAY_MS, MILLISECONDS); assertEquals(21, (int) r); checkCompletedNormally(f, r); return r; @@ -305,7 +307,7 @@ public class RecursiveTaskTest extends J * quietlyJoin of a forked task returns when task completes */ public void testForkQuietlyJoin() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); assertSame(f, f.fork()); @@ -323,7 +325,7 @@ public class RecursiveTaskTest extends J * getQueuedTaskCount returns 0 when quiescent */ public void testForkHelpQuiesce() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); assertSame(f, f.fork()); @@ -341,7 +343,7 @@ public class RecursiveTaskTest extends J * invoke task throws exception when task completes abnormally */ public void testAbnormalInvoke() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FailingFibTask f = new FailingFibTask(8); try { @@ -359,7 +361,7 @@ public class RecursiveTaskTest extends J * quietlyInvoke task returns when task completes abnormally */ public void testAbnormalQuietlyInvoke() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FailingFibTask f = new FailingFibTask(8); f.quietlyInvoke(); @@ -374,12 +376,12 @@ public class RecursiveTaskTest extends J * join of a forked task throws exception when task completes abnormally */ public void testAbnormalForkJoin() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FailingFibTask f = new FailingFibTask(8); assertSame(f, f.fork()); try { - Integer r = f.join(); + f.join(); shouldThrow(); } catch (FJException success) { checkCompletedAbnormally(f, success); @@ -393,12 +395,12 @@ public class RecursiveTaskTest extends J * get of a forked task throws exception when task completes abnormally */ public void testAbnormalForkGet() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() throws Exception { FailingFibTask f = new FailingFibTask(8); assertSame(f, f.fork()); try { - Integer r = f.get(); + f.get(); shouldThrow(); } catch (ExecutionException success) { Throwable cause = success.getCause(); @@ -414,12 +416,12 @@ public class RecursiveTaskTest extends J * timed get of a forked task throws exception when task completes abnormally */ public void testAbnormalForkTimedGet() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() throws Exception { FailingFibTask f = new FailingFibTask(8); assertSame(f, f.fork()); try { - Integer r = f.get(5L, SECONDS); + f.get(LONG_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (ExecutionException success) { Throwable cause = success.getCause(); @@ -435,7 +437,7 @@ public class RecursiveTaskTest extends J * quietlyJoin of a forked task returns when task completes abnormally */ public void testAbnormalForkQuietlyJoin() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FailingFibTask f = new FailingFibTask(8); assertSame(f, f.fork()); @@ -451,12 +453,12 @@ public class RecursiveTaskTest extends J * invoke task throws exception when task cancelled */ public void testCancelledInvoke() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); assertTrue(f.cancel(true)); try { - Integer r = f.invoke(); + f.invoke(); shouldThrow(); } catch (CancellationException success) { checkCancelled(f); @@ -470,13 +472,13 @@ public class RecursiveTaskTest extends J * join of a forked task throws exception when task cancelled */ public void testCancelledForkJoin() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); assertTrue(f.cancel(true)); assertSame(f, f.fork()); try { - Integer r = f.join(); + f.join(); shouldThrow(); } catch (CancellationException success) { checkCancelled(f); @@ -490,13 +492,13 @@ public class RecursiveTaskTest extends J * get of a forked task throws exception when task cancelled */ public void testCancelledForkGet() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() throws Exception { FibTask f = new FibTask(8); assertTrue(f.cancel(true)); assertSame(f, f.fork()); try { - Integer r = f.get(); + f.get(); shouldThrow(); } catch (CancellationException success) { checkCancelled(f); @@ -510,13 +512,13 @@ public class RecursiveTaskTest extends J * timed get of a forked task throws exception when task cancelled */ public void testCancelledForkTimedGet() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() throws Exception { FibTask f = new FibTask(8); assertTrue(f.cancel(true)); assertSame(f, f.fork()); try { - Integer r = f.get(5L, SECONDS); + f.get(LONG_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (CancellationException success) { checkCancelled(f); @@ -530,7 +532,7 @@ public class RecursiveTaskTest extends J * quietlyJoin of a forked task returns when task cancelled */ public void testCancelledForkQuietlyJoin() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); assertTrue(f.cancel(true)); @@ -547,7 +549,7 @@ public class RecursiveTaskTest extends J */ public void testGetPool() { final ForkJoinPool mainPool = mainPool(); - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { assertSame(mainPool, getPool()); return NoResult; @@ -559,7 +561,7 @@ public class RecursiveTaskTest extends J * getPool of non-FJ task returns null */ public void testGetPool2() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { assertNull(getPool()); return NoResult; @@ -571,7 +573,7 @@ public class RecursiveTaskTest extends J * inForkJoinPool of executing task returns true */ public void testInForkJoinPool() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { assertTrue(inForkJoinPool()); return NoResult; @@ -583,7 +585,7 @@ public class RecursiveTaskTest extends J * inForkJoinPool of non-FJ task returns false */ public void testInForkJoinPool2() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { assertFalse(inForkJoinPool()); return NoResult; @@ -595,7 +597,7 @@ public class RecursiveTaskTest extends J * The value set by setRawResult is returned by getRawResult */ public void testSetRawResult() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { setRawResult(NoResult); assertSame(NoResult, getRawResult()); @@ -609,7 +611,7 @@ public class RecursiveTaskTest extends J * A reinitialized normally completed task may be re-invoked */ public void testReinitialize() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); checkNotDone(f); @@ -631,7 +633,7 @@ public class RecursiveTaskTest extends J * A reinitialized abnormally completed task may be re-invoked */ public void testReinitializeAbnormal() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FailingFibTask f = new FailingFibTask(8); checkNotDone(f); @@ -655,12 +657,12 @@ public class RecursiveTaskTest extends J * invoke task throws exception after invoking completeExceptionally */ public void testCompleteExceptionally() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); f.completeExceptionally(new FJException()); try { - Integer r = f.invoke(); + f.invoke(); shouldThrow(); } catch (FJException success) { checkCompletedAbnormally(f, success); @@ -674,7 +676,7 @@ public class RecursiveTaskTest extends J * invoke task suppresses execution invoking complete */ public void testComplete() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); f.complete(NoResult); @@ -690,7 +692,7 @@ public class RecursiveTaskTest extends J * invokeAll(t1, t2) invokes all task arguments */ public void testInvokeAll2() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); FibTask g = new FibTask(9); @@ -706,7 +708,7 @@ public class RecursiveTaskTest extends J * invokeAll(tasks) with 1 argument invokes task */ public void testInvokeAll1() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); invokeAll(f); @@ -720,7 +722,7 @@ public class RecursiveTaskTest extends J * invokeAll(tasks) with > 2 argument invokes tasks */ public void testInvokeAll3() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); FibTask g = new FibTask(9); @@ -741,12 +743,12 @@ public class RecursiveTaskTest extends J * invokeAll(collection) invokes all tasks in the collection */ public void testInvokeAllCollection() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); FibTask g = new FibTask(9); FibTask h = new FibTask(7); - HashSet set = new HashSet(); + HashSet> set = new HashSet<>(); set.add(f); set.add(g); set.add(h); @@ -766,7 +768,7 @@ public class RecursiveTaskTest extends J * invokeAll(tasks) with any null task throws NPE */ public void testInvokeAllNPE() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); FibTask g = new FibTask(9); @@ -784,7 +786,7 @@ public class RecursiveTaskTest extends J * invokeAll(t1, t2) throw exception if any task does */ public void testAbnormalInvokeAll2() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); FailingFibTask g = new FailingFibTask(9); @@ -803,7 +805,7 @@ public class RecursiveTaskTest extends J * invokeAll(tasks) with 1 argument throws exception if task does */ public void testAbnormalInvokeAll1() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FailingFibTask g = new FailingFibTask(9); try { @@ -821,7 +823,7 @@ public class RecursiveTaskTest extends J * invokeAll(tasks) with > 2 argument throws exception if any task does */ public void testAbnormalInvokeAll3() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask f = new FibTask(8); FailingFibTask g = new FailingFibTask(9); @@ -841,12 +843,12 @@ public class RecursiveTaskTest extends J * invokeAll(collection) throws exception if any task does */ public void testAbnormalInvokeAllCollection() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FailingFibTask f = new FailingFibTask(8); FibTask g = new FibTask(9); FibTask h = new FibTask(7); - HashSet set = new HashSet(); + HashSet> set = new HashSet<>(); set.add(f); set.add(g); set.add(h); @@ -866,7 +868,7 @@ public class RecursiveTaskTest extends J * and suppresses execution */ public void testTryUnfork() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask g = new FibTask(9); assertSame(g, g.fork()); @@ -886,7 +888,7 @@ public class RecursiveTaskTest extends J * there are more tasks than threads */ public void testGetSurplusQueuedTaskCount() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask h = new FibTask(7); assertSame(h, h.fork()); @@ -909,7 +911,7 @@ public class RecursiveTaskTest extends J * peekNextLocalTask returns most recent unexecuted task. */ public void testPeekNextLocalTask() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask g = new FibTask(9); assertSame(g, g.fork()); @@ -929,7 +931,7 @@ public class RecursiveTaskTest extends J * without executing it */ public void testPollNextLocalTask() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask g = new FibTask(9); assertSame(g, g.fork()); @@ -948,7 +950,7 @@ public class RecursiveTaskTest extends J * pollTask returns an unexecuted task without executing it */ public void testPollTask() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask g = new FibTask(9); assertSame(g, g.fork()); @@ -967,7 +969,7 @@ public class RecursiveTaskTest extends J * peekNextLocalTask returns least recent unexecuted task in async mode */ public void testPeekNextLocalTaskAsync() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask g = new FibTask(9); assertSame(g, g.fork()); @@ -988,7 +990,7 @@ public class RecursiveTaskTest extends J * executing it, in async mode */ public void testPollNextLocalTaskAsync() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask g = new FibTask(9); assertSame(g, g.fork()); @@ -1008,7 +1010,7 @@ public class RecursiveTaskTest extends J * async mode */ public void testPollTaskAsync() { - RecursiveTask a = new CheckedRecursiveTask() { + RecursiveTask a = new CheckedRecursiveTask<>() { public Integer realCompute() { FibTask g = new FibTask(9); assertSame(g, g.fork());