ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ForkJoinTask8Test.java
(Generate patch)

Comparing jsr166/src/test/tck/ForkJoinTask8Test.java (file contents):
Revision 1.25 by dl, Sun Oct 11 19:53:59 2015 UTC vs.
Revision 1.34 by dl, Mon Aug 12 15:08:44 2019 UTC

# Line 5 | Line 5
5   */
6  
7   import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 – import static java.util.concurrent.TimeUnit.SECONDS;
8  
9   import java.util.Arrays;
11 – import java.util.Collections;
10   import java.util.concurrent.CountDownLatch;
11   import java.util.concurrent.ExecutionException;
12   import java.util.concurrent.ForkJoinPool;
# Line 101 | Line 99 | public class ForkJoinTask8Test extends J
99          assertNull(a.getException());
100          assertNull(a.getRawResult());
101          if (a instanceof BinaryAsyncAction)
102 <            assertTrue(((BinaryAsyncAction)a).getForkJoinTaskTag() == INITIAL_STATE);
102 >            assertEquals(INITIAL_STATE,
103 >                         ((BinaryAsyncAction)a).getForkJoinTaskTag());
104  
105          try {
106 <            a.get(0L, SECONDS);
106 >            a.get(randomExpiredTimeout(), randomTimeUnit());
107              shouldThrow();
108          } catch (TimeoutException success) {
109          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 114 | Line 113 | public class ForkJoinTask8Test extends J
113          checkCompletedNormally(a, null);
114      }
115  
116 <    <T> void checkCompletedNormally(ForkJoinTask<T> a, T expected) {
116 >    <T> void checkCompletedNormally(ForkJoinTask<T> a, T expectedValue) {
117          assertTrue(a.isDone());
118          assertFalse(a.isCancelled());
119          assertTrue(a.isCompletedNormally());
120          assertFalse(a.isCompletedAbnormally());
121          assertNull(a.getException());
122 <        assertSame(expected, a.getRawResult());
122 >        assertSame(expectedValue, a.getRawResult());
123          if (a instanceof BinaryAsyncAction)
124 <            assertTrue(((BinaryAsyncAction)a).getForkJoinTaskTag() == COMPLETE_STATE);
124 >            assertEquals(COMPLETE_STATE,
125 >                         ((BinaryAsyncAction)a).getForkJoinTaskTag());
126  
127          {
128              Thread.currentThread().interrupt();
129              long startTime = System.nanoTime();
130 <            assertSame(expected, a.join());
131 <            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
130 >            assertSame(expectedValue, a.join());
131 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
132              Thread.interrupted();
133          }
134  
# Line 136 | Line 136 | public class ForkJoinTask8Test extends J
136              Thread.currentThread().interrupt();
137              long startTime = System.nanoTime();
138              a.quietlyJoin();        // should be no-op
139 <            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
139 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
140              Thread.interrupted();
141          }
142  
143          assertFalse(a.cancel(false));
144          assertFalse(a.cancel(true));
145 +
146 +        T v1 = null, v2 = null;
147          try {
148 <            assertSame(expected, a.get());
149 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
148 <        try {
149 <            assertSame(expected, a.get(5L, SECONDS));
148 >            v1 = a.get();
149 >            v2 = a.get(randomTimeout(), randomTimeUnit());
150          } catch (Throwable fail) { threadUnexpectedException(fail); }
151 +        assertSame(expectedValue, v1);
152 +        assertSame(expectedValue, v2);
153      }
154  
155      void checkCompletedAbnormally(ForkJoinTask a, Throwable t) {
# Line 174 | Line 176 | public class ForkJoinTask8Test extends J
176          {
177              long startTime = System.nanoTime();
178              a.quietlyJoin();        // should be no-op
179 <            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
179 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
180          }
181  
182          try {
# Line 185 | Line 187 | public class ForkJoinTask8Test extends J
187          } catch (Throwable fail) { threadUnexpectedException(fail); }
188  
189          try {
190 <            a.get(5L, SECONDS);
190 >            a.get(randomTimeout(), randomTimeUnit());
191              shouldThrow();
192          } catch (ExecutionException success) {
193              assertSame(t.getClass(), success.getCause().getClass());
# Line 487 | Line 489 | public class ForkJoinTask8Test extends J
489                  AsyncFib f = new AsyncFib(8);
490                  assertSame(f, f.fork());
491                  try {
492 <                    f.get(5L, null);
492 >                    f.get(randomTimeout(), null);
493                      shouldThrow();
494                  } catch (NullPointerException success) {}
495              }};
# Line 530 | Line 532 | public class ForkJoinTask8Test extends J
532                  AsyncFib f = new AsyncFib(8);
533                  assertSame(f, f.fork());
534                  helpQuiesce();
535 +                while (!f.isDone()) // wait out race
536 +                    ;
537                  assertEquals(0, getQueuedTaskCount());
538                  f.checkCompletedNormally();
539              }};
# Line 871 | Line 875 | public class ForkJoinTask8Test extends J
875          RecursiveAction a = new CheckedRecursiveAction() {
876              protected void realCompute() {
877                  AsyncFib nul = null;
878 <                Runnable[] throwingActions = {
878 >                assertThrows(
879 >                    NullPointerException.class,
880                      () -> invokeAll(nul),
881                      () -> invokeAll(nul, nul),
882                      () -> invokeAll(new AsyncFib(8), new AsyncFib(9), nul),
883                      () -> invokeAll(new AsyncFib(8), nul, new AsyncFib(9)),
884 <                    () -> invokeAll(nul, new AsyncFib(8), new AsyncFib(9)),
880 <                };
881 <                assertThrows(NullPointerException.class, throwingActions);
884 >                    () -> invokeAll(nul, new AsyncFib(8), new AsyncFib(9)));
885              }};
886          testInvokeOnPool(pool, a);
887      }
# Line 921 | Line 924 | public class ForkJoinTask8Test extends J
924                  AsyncFib f = new AsyncFib(8);
925                  FailingAsyncFib g = new FailingAsyncFib(9);
926                  ForkJoinTask[] tasks = { f, g };
927 <                Collections.shuffle(Arrays.asList(tasks));
927 >                shuffle(tasks);
928                  try {
929                      invokeAll(tasks[0], tasks[1]);
930                      shouldThrow();
# Line 948 | Line 951 | public class ForkJoinTask8Test extends J
951                  FailingAsyncFib g = new FailingAsyncFib(9);
952                  AsyncFib h = new AsyncFib(7);
953                  ForkJoinTask[] tasks = { f, g, h };
954 <                Collections.shuffle(Arrays.asList(tasks));
954 >                shuffle(tasks);
955                  try {
956                      invokeAll(tasks[0], tasks[1], tasks[2]);
957                      shouldThrow();
# Line 975 | Line 978 | public class ForkJoinTask8Test extends J
978                  AsyncFib g = new AsyncFib(9);
979                  AsyncFib h = new AsyncFib(7);
980                  ForkJoinTask[] tasks = { f, g, h };
981 <                Collections.shuffle(Arrays.asList(tasks));
981 >                shuffle(tasks);
982                  try {
983                      invokeAll(Arrays.asList(tasks));
984                      shouldThrow();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines