test/jdk/java/util/concurrent/tck/RecursiveTaskTest.java

8234131: Miscellaneous changes imported from jsr166 CVS 2020-12
Reviewed-by: martin

*** 406,416 ****
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() {
                  FailingFibTask f = new FailingFibTask(8);
                  assertSame(f, f.fork());
                  try {
!                     Integer r = f.join();
                      shouldThrow();
                  } catch (FJException success) {
                      checkCompletedAbnormally(f, success);
                  }
                  return NoResult;
--- 406,416 ----
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() {
                  FailingFibTask f = new FailingFibTask(8);
                  assertSame(f, f.fork());
                  try {
!                     f.join();
                      shouldThrow();
                  } catch (FJException success) {
                      checkCompletedAbnormally(f, success);
                  }
                  return NoResult;
*** 425,435 ****
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() throws Exception {
                  FailingFibTask f = new FailingFibTask(8);
                  assertSame(f, f.fork());
                  try {
!                     Integer r = f.get();
                      shouldThrow();
                  } catch (ExecutionException success) {
                      Throwable cause = success.getCause();
                      assertTrue(cause instanceof FJException);
                      checkCompletedAbnormally(f, cause);
--- 425,435 ----
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() throws Exception {
                  FailingFibTask f = new FailingFibTask(8);
                  assertSame(f, f.fork());
                  try {
!                     f.get();
                      shouldThrow();
                  } catch (ExecutionException success) {
                      Throwable cause = success.getCause();
                      assertTrue(cause instanceof FJException);
                      checkCompletedAbnormally(f, cause);
*** 446,456 ****
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() throws Exception {
                  FailingFibTask f = new FailingFibTask(8);
                  assertSame(f, f.fork());
                  try {
!                     Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
                      shouldThrow();
                  } catch (ExecutionException success) {
                      Throwable cause = success.getCause();
                      assertTrue(cause instanceof FJException);
                      checkCompletedAbnormally(f, cause);
--- 446,456 ----
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() throws Exception {
                  FailingFibTask f = new FailingFibTask(8);
                  assertSame(f, f.fork());
                  try {
!                     f.get(LONG_DELAY_MS, MILLISECONDS);
                      shouldThrow();
                  } catch (ExecutionException success) {
                      Throwable cause = success.getCause();
                      assertTrue(cause instanceof FJException);
                      checkCompletedAbnormally(f, cause);
*** 483,493 ****
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() {
                  FibTask f = new FibTask(8);
                  assertTrue(f.cancel(true));
                  try {
!                     Integer r = f.invoke();
                      shouldThrow();
                  } catch (CancellationException success) {
                      checkCancelled(f);
                  }
                  return NoResult;
--- 483,493 ----
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() {
                  FibTask f = new FibTask(8);
                  assertTrue(f.cancel(true));
                  try {
!                     f.invoke();
                      shouldThrow();
                  } catch (CancellationException success) {
                      checkCancelled(f);
                  }
                  return NoResult;
*** 503,513 ****
              public Integer realCompute() {
                  FibTask f = new FibTask(8);
                  assertTrue(f.cancel(true));
                  assertSame(f, f.fork());
                  try {
!                     Integer r = f.join();
                      shouldThrow();
                  } catch (CancellationException success) {
                      checkCancelled(f);
                  }
                  return NoResult;
--- 503,513 ----
              public Integer realCompute() {
                  FibTask f = new FibTask(8);
                  assertTrue(f.cancel(true));
                  assertSame(f, f.fork());
                  try {
!                     f.join();
                      shouldThrow();
                  } catch (CancellationException success) {
                      checkCancelled(f);
                  }
                  return NoResult;
*** 523,533 ****
              public Integer realCompute() throws Exception {
                  FibTask f = new FibTask(8);
                  assertTrue(f.cancel(true));
                  assertSame(f, f.fork());
                  try {
!                     Integer r = f.get();
                      shouldThrow();
                  } catch (CancellationException success) {
                      checkCancelled(f);
                  }
                  return NoResult;
--- 523,533 ----
              public Integer realCompute() throws Exception {
                  FibTask f = new FibTask(8);
                  assertTrue(f.cancel(true));
                  assertSame(f, f.fork());
                  try {
!                     f.get();
                      shouldThrow();
                  } catch (CancellationException success) {
                      checkCancelled(f);
                  }
                  return NoResult;
*** 543,553 ****
              public Integer realCompute() throws Exception {
                  FibTask f = new FibTask(8);
                  assertTrue(f.cancel(true));
                  assertSame(f, f.fork());
                  try {
!                     Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
                      shouldThrow();
                  } catch (CancellationException success) {
                      checkCancelled(f);
                  }
                  return NoResult;
--- 543,553 ----
              public Integer realCompute() throws Exception {
                  FibTask f = new FibTask(8);
                  assertTrue(f.cancel(true));
                  assertSame(f, f.fork());
                  try {
!                     f.get(LONG_DELAY_MS, MILLISECONDS);
                      shouldThrow();
                  } catch (CancellationException success) {
                      checkCancelled(f);
                  }
                  return NoResult;
*** 687,697 ****
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() {
                  FibTask f = new FibTask(8);
                  f.completeExceptionally(new FJException());
                  try {
!                     Integer r = f.invoke();
                      shouldThrow();
                  } catch (FJException success) {
                      checkCompletedAbnormally(f, success);
                  }
                  return NoResult;
--- 687,697 ----
          RecursiveTask<Integer> a = new CheckedRecursiveTask<Integer>() {
              public Integer realCompute() {
                  FibTask f = new FibTask(8);
                  f.completeExceptionally(new FJException());
                  try {
!                     f.invoke();
                      shouldThrow();
                  } catch (FJException success) {
                      checkCompletedAbnormally(f, success);
                  }
                  return NoResult;