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

Comparing jsr166/src/test/tck/ForkJoinTaskTest.java (file contents):
Revision 1.51 by jsr166, Wed Aug 24 22:22:39 2016 UTC vs.
Revision 1.61 by jsr166, Wed Jan 27 01:57:24 2021 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;
10   import java.util.HashSet;
11 + import java.util.concurrent.Callable;
12   import java.util.concurrent.CancellationException;
13   import java.util.concurrent.ExecutionException;
14   import java.util.concurrent.ForkJoinPool;
# Line 68 | Line 68 | public class ForkJoinTaskTest extends JS
68          }
69      }
70  
71 <    void checkNotDone(ForkJoinTask a) {
71 >    void checkNotDone(ForkJoinTask<?> a) {
72          assertFalse(a.isDone());
73          assertFalse(a.isCompletedNormally());
74          assertFalse(a.isCompletedAbnormally());
# Line 77 | Line 77 | public class ForkJoinTaskTest extends JS
77          assertNull(a.getRawResult());
78  
79          try {
80 <            a.get(0L, SECONDS);
80 >            a.get(randomExpiredTimeout(), randomTimeUnit());
81              shouldThrow();
82          } catch (TimeoutException success) {
83          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 87 | Line 87 | public class ForkJoinTaskTest extends JS
87          checkCompletedNormally(a, null);
88      }
89  
90 <    <T> void checkCompletedNormally(ForkJoinTask<T> a, T expected) {
90 >    <T> void checkCompletedNormally(ForkJoinTask<T> a, T expectedValue) {
91          assertTrue(a.isDone());
92          assertFalse(a.isCancelled());
93          assertTrue(a.isCompletedNormally());
94          assertFalse(a.isCompletedAbnormally());
95          assertNull(a.getException());
96 <        assertSame(expected, a.getRawResult());
96 >        assertSame(expectedValue, a.getRawResult());
97  
98          {
99              Thread.currentThread().interrupt();
100              long startTime = System.nanoTime();
101 <            assertSame(expected, a.join());
102 <            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
101 >            assertSame(expectedValue, a.join());
102 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
103              Thread.interrupted();
104          }
105  
# Line 107 | Line 107 | public class ForkJoinTaskTest extends JS
107              Thread.currentThread().interrupt();
108              long startTime = System.nanoTime();
109              a.quietlyJoin();        // should be no-op
110 <            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
110 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
111              Thread.interrupted();
112          }
113  
114          assertFalse(a.cancel(false));
115          assertFalse(a.cancel(true));
116 +
117 +        T v1 = null, v2 = null;
118          try {
119 <            assertSame(expected, a.get());
120 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
119 <        try {
120 <            assertSame(expected, a.get(5L, SECONDS));
119 >            v1 = a.get();
120 >            v2 = a.get(randomTimeout(), randomTimeUnit());
121          } catch (Throwable fail) { threadUnexpectedException(fail); }
122 +        assertSame(expectedValue, v1);
123 +        assertSame(expectedValue, v2);
124      }
125  
126 <    void checkCancelled(ForkJoinTask a) {
126 >    void checkCancelled(ForkJoinTask<?> a) {
127          assertTrue(a.isDone());
128          assertTrue(a.isCancelled());
129          assertFalse(a.isCompletedNormally());
# Line 142 | Line 144 | public class ForkJoinTaskTest extends JS
144          {
145              long startTime = System.nanoTime();
146              a.quietlyJoin();        // should be no-op
147 <            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
147 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
148          }
149  
150          try {
# Line 152 | Line 154 | public class ForkJoinTaskTest extends JS
154          } catch (Throwable fail) { threadUnexpectedException(fail); }
155  
156          try {
157 <            a.get(5L, SECONDS);
157 >            a.get(randomTimeout(), randomTimeUnit());
158              shouldThrow();
159          } catch (CancellationException success) {
160          } catch (Throwable fail) { threadUnexpectedException(fail); }
161      }
162  
163 <    void checkCompletedAbnormally(ForkJoinTask a, Throwable t) {
163 >    void checkCompletedAbnormally(ForkJoinTask<?> a, Throwable t) {
164          assertTrue(a.isDone());
165          assertFalse(a.isCancelled());
166          assertFalse(a.isCompletedNormally());
# Line 180 | Line 182 | public class ForkJoinTaskTest extends JS
182          {
183              long startTime = System.nanoTime();
184              a.quietlyJoin();        // should be no-op
185 <            assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
185 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
186          }
187  
188          try {
# Line 191 | Line 193 | public class ForkJoinTaskTest extends JS
193          } catch (Throwable fail) { threadUnexpectedException(fail); }
194  
195          try {
196 <            a.get(5L, SECONDS);
196 >            a.get(randomTimeout(), randomTimeUnit());
197              shouldThrow();
198          } catch (ExecutionException success) {
199              assertSame(t.getClass(), success.getCause().getClass());
# Line 465 | Line 467 | public class ForkJoinTaskTest extends JS
467                  AsyncFib f = new AsyncFib(8);
468                  assertSame(f, f.fork());
469                  try {
470 <                    f.get(5L, null);
470 >                    f.get(randomTimeout(), null);
471                      shouldThrow();
472                  } catch (NullPointerException success) {}
473              }};
# Line 497 | Line 499 | public class ForkJoinTaskTest extends JS
499                  AsyncFib f = new AsyncFib(8);
500                  assertSame(f, f.fork());
501                  helpQuiesce();
502 +                while (!f.isDone()) // wait out race
503 +                    ;
504                  assertEquals(21, f.number);
505                  assertEquals(0, getQueuedTaskCount());
506                  checkCompletedNormally(f);
# Line 854 | Line 858 | public class ForkJoinTaskTest extends JS
858                  AsyncFib f = new AsyncFib(8);
859                  AsyncFib g = new AsyncFib(9);
860                  AsyncFib h = new AsyncFib(7);
861 <                HashSet set = new HashSet();
861 >                HashSet<ForkJoinTask<?>> set = new HashSet<>();
862                  set.add(f);
863                  set.add(g);
864                  set.add(h);
# Line 894 | Line 898 | public class ForkJoinTaskTest extends JS
898              protected void realCompute() {
899                  AsyncFib f = new AsyncFib(8);
900                  FailingAsyncFib g = new FailingAsyncFib(9);
901 <                ForkJoinTask[] tasks = { f, g };
901 >                ForkJoinTask<?>[] tasks = { f, g };
902                  shuffle(tasks);
903                  try {
904                      invokeAll(tasks);
# Line 932 | Line 936 | public class ForkJoinTaskTest extends JS
936                  AsyncFib f = new AsyncFib(8);
937                  FailingAsyncFib g = new FailingAsyncFib(9);
938                  AsyncFib h = new AsyncFib(7);
939 <                ForkJoinTask[] tasks = { f, g, h };
939 >                ForkJoinTask<?>[] tasks = { f, g, h };
940                  shuffle(tasks);
941                  try {
942                      invokeAll(tasks);
# Line 953 | Line 957 | public class ForkJoinTaskTest extends JS
957                  FailingAsyncFib f = new FailingAsyncFib(8);
958                  AsyncFib g = new AsyncFib(9);
959                  AsyncFib h = new AsyncFib(7);
960 <                ForkJoinTask[] tasks = { f, g, h };
960 >                ForkJoinTask<?>[] tasks = { f, g, h };
961                  shuffle(tasks);
962                  try {
963                      invokeAll(Arrays.asList(tasks));
# Line 1212 | Line 1216 | public class ForkJoinTaskTest extends JS
1216                  AsyncFib f = new AsyncFib(8);
1217                  assertSame(f, f.fork());
1218                  try {
1219 <                    f.get(5L, null);
1219 >                    f.get(randomTimeout(), null);
1220                      shouldThrow();
1221                  } catch (NullPointerException success) {}
1222              }};
# Line 1523 | Line 1527 | public class ForkJoinTaskTest extends JS
1527                  AsyncFib f = new AsyncFib(8);
1528                  AsyncFib g = new AsyncFib(9);
1529                  AsyncFib h = new AsyncFib(7);
1530 <                HashSet set = new HashSet();
1530 >                HashSet<ForkJoinTask<?>> set = new HashSet<>();
1531                  set.add(f);
1532                  set.add(g);
1533                  set.add(h);
# Line 1563 | Line 1567 | public class ForkJoinTaskTest extends JS
1567              protected void realCompute() {
1568                  AsyncFib f = new AsyncFib(8);
1569                  FailingAsyncFib g = new FailingAsyncFib(9);
1570 <                ForkJoinTask[] tasks = { f, g };
1570 >                ForkJoinTask<?>[] tasks = { f, g };
1571                  shuffle(tasks);
1572                  try {
1573                      invokeAll(tasks);
# Line 1601 | Line 1605 | public class ForkJoinTaskTest extends JS
1605                  AsyncFib f = new AsyncFib(8);
1606                  FailingAsyncFib g = new FailingAsyncFib(9);
1607                  AsyncFib h = new AsyncFib(7);
1608 <                ForkJoinTask[] tasks = { f, g, h };
1608 >                ForkJoinTask<?>[] tasks = { f, g, h };
1609                  shuffle(tasks);
1610                  try {
1611                      invokeAll(tasks);
# Line 1622 | Line 1626 | public class ForkJoinTaskTest extends JS
1626                  FailingAsyncFib f = new FailingAsyncFib(8);
1627                  AsyncFib g = new AsyncFib(9);
1628                  AsyncFib h = new AsyncFib(7);
1629 <                ForkJoinTask[] tasks = { f, g, h };
1629 >                ForkJoinTask<?>[] tasks = { f, g, h };
1630                  shuffle(tasks);
1631                  try {
1632                      invokeAll(Arrays.asList(tasks));
# Line 1651 | Line 1655 | public class ForkJoinTaskTest extends JS
1655          testInvokeOnPool(mainPool(), a);
1656      }
1657  
1658 +    /**
1659 +     * adapt(runnable).toString() contains toString of wrapped task
1660 +     */
1661 +    public void testAdapt_Runnable_toString() {
1662 +        if (testImplementationDetails) {
1663 +            Runnable r = () -> {};
1664 +            ForkJoinTask<?> task = ForkJoinTask.adapt(r);
1665 +            assertEquals(
1666 +                identityString(task) + "[Wrapped task = " + r.toString() + "]",
1667 +                task.toString());
1668 +        }
1669 +    }
1670 +
1671 +    /**
1672 +     * adapt(runnable, x).toString() contains toString of wrapped task
1673 +     */
1674 +    public void testAdapt_Runnable_withResult_toString() {
1675 +        if (testImplementationDetails) {
1676 +            Runnable r = () -> {};
1677 +            ForkJoinTask<String> task = ForkJoinTask.adapt(r, "");
1678 +            assertEquals(
1679 +                identityString(task) + "[Wrapped task = " + r.toString() + "]",
1680 +                task.toString());
1681 +        }
1682 +    }
1683 +
1684 +    /**
1685 +     * adapt(callable).toString() contains toString of wrapped task
1686 +     */
1687 +    public void testAdapt_Callable_toString() {
1688 +        if (testImplementationDetails) {
1689 +            Callable<String> c = () -> "";
1690 +            ForkJoinTask<String> task = ForkJoinTask.adapt(c);
1691 +            assertEquals(
1692 +                identityString(task) + "[Wrapped task = " + c.toString() + "]",
1693 +                task.toString());
1694 +        }
1695 +    }
1696 +
1697 +    // adaptInterruptible deferred to its own independent change
1698 +    // https://bugs.openjdk.java.net/browse/JDK-8246587
1699 +
1700 + //     /**
1701 + //      * adaptInterruptible(callable).toString() contains toString of wrapped task
1702 + //      */
1703 + //     public void testAdaptInterruptible_Callable_toString() {
1704 + //         if (testImplementationDetails) {
1705 + //             Callable<String> c = () -> "";
1706 + //             ForkJoinTask<String> task = ForkJoinTask.adaptInterruptible(c);
1707 + //             assertEquals(
1708 + //                 identityString(task) + "[Wrapped task = " + c.toString() + "]",
1709 + //                 task.toString());
1710 + //         }
1711 + //     }
1712   }

Diff Legend

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