--- jsr166/src/test/tck/ForkJoinTaskTest.java 2009/08/04 09:35:31 1.4 +++ jsr166/src/test/tck/ForkJoinTaskTest.java 2009/12/01 23:01:44 1.7 @@ -11,10 +11,10 @@ import java.util.*; public class ForkJoinTaskTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); + junit.textui.TestRunner.run (suite()); } public static Test suite() { - return new TestSuite(ForkJoinTaskTest.class); + return new TestSuite(ForkJoinTaskTest.class); } /** @@ -148,7 +148,7 @@ public class ForkJoinTaskTest extends JS } - static final class AsyncFib extends BinaryAsyncAction { + static final class AsyncFib extends BinaryAsyncAction { int number; public AsyncFib(int n) { this.number = n; @@ -177,7 +177,7 @@ public class ForkJoinTaskTest extends JS } - static final class FailingAsyncFib extends BinaryAsyncAction { + static final class FailingAsyncFib extends BinaryAsyncAction { int number; public FailingAsyncFib(int n) { this.number = n; @@ -292,7 +292,7 @@ public class ForkJoinTaskTest extends JS try { AsyncFib f = new AsyncFib(8); f.fork(); - f.get(5L, TimeUnit.SECONDS); + f.get(LONG_DELAY_MS, TimeUnit.MILLISECONDS); threadAssertTrue(f.number == 21); threadAssertTrue(f.isDone()); } catch (Exception ex) { @@ -470,7 +470,7 @@ public class ForkJoinTaskTest extends JS try { FailingAsyncFib f = new FailingAsyncFib(8); f.fork(); - f.get(5L, TimeUnit.SECONDS); + f.get(LONG_DELAY_MS, TimeUnit.MILLISECONDS); shouldThrow(); } catch (ExecutionException success) { } catch (Exception ex) { @@ -605,7 +605,7 @@ public class ForkJoinTaskTest extends JS AsyncFib f = new AsyncFib(8); f.cancel(true); f.fork(); - f.get(5L, TimeUnit.SECONDS); + f.get(LONG_DELAY_MS, TimeUnit.MILLISECONDS); shouldThrow(); } catch (CancellationException success) { } catch (Exception ex) {