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

8207003: Miscellaneous changes imported from jsr166 CVS 2018-09
Reviewed-by: martin, chegar

*** 112,133 ****
  
      <T> void checkCompletedNormally(ForkJoinTask<T> a) {
          checkCompletedNormally(a, null);
      }
  
!     <T> void checkCompletedNormally(ForkJoinTask<T> a, T expected) {
          assertTrue(a.isDone());
          assertFalse(a.isCancelled());
          assertTrue(a.isCompletedNormally());
          assertFalse(a.isCompletedAbnormally());
          assertNull(a.getException());
!         assertSame(expected, a.getRawResult());
  
          {
              Thread.currentThread().interrupt();
              long startTime = System.nanoTime();
!             assertSame(expected, a.join());
              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
              Thread.interrupted();
          }
  
          {
--- 112,133 ----
  
      <T> void checkCompletedNormally(ForkJoinTask<T> a) {
          checkCompletedNormally(a, null);
      }
  
!     <T> void checkCompletedNormally(ForkJoinTask<T> a, T expectedValue) {
          assertTrue(a.isDone());
          assertFalse(a.isCancelled());
          assertTrue(a.isCompletedNormally());
          assertFalse(a.isCompletedAbnormally());
          assertNull(a.getException());
!         assertSame(expectedValue, a.getRawResult());
  
          {
              Thread.currentThread().interrupt();
              long startTime = System.nanoTime();
!             assertSame(expectedValue, a.join());
              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
              Thread.interrupted();
          }
  
          {
*** 138,151 ****
              Thread.interrupted();
          }
  
          assertFalse(a.cancel(false));
          assertFalse(a.cancel(true));
          try {
!             assertSame(expected, a.get());
!             assertSame(expected, a.get(randomTimeout(), randomTimeUnit()));
          } catch (Throwable fail) { threadUnexpectedException(fail); }
      }
  
      void checkCancelled(ForkJoinTask a) {
          assertTrue(a.isDone());
          assertTrue(a.isCancelled());
--- 138,155 ----
              Thread.interrupted();
          }
  
          assertFalse(a.cancel(false));
          assertFalse(a.cancel(true));
+ 
+         T v1 = null, v2 = null;
          try {
!             v1 = a.get();
!             v2 = a.get(randomTimeout(), randomTimeUnit());
          } catch (Throwable fail) { threadUnexpectedException(fail); }
+         assertSame(expectedValue, v1);
+         assertSame(expectedValue, v2);
      }
  
      void checkCancelled(ForkJoinTask a) {
          assertTrue(a.isDone());
          assertTrue(a.isCancelled());