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

Comparing jsr166/src/test/tck/ForkJoinPool8Test.java (file contents):
Revision 1.40 by jsr166, Sun Jul 22 20:27:47 2018 UTC vs.
Revision 1.41 by dl, Tue Jan 26 13:33:06 2021 UTC

# Line 59 | Line 59 | public class ForkJoinPool8Test extends J
59       * checkInvoke.
60       */
61  
62 <    private void checkInvoke(ForkJoinTask a) {
62 >    private void checkInvoke(ForkJoinTask<?> a) {
63          checkNotDone(a);
64          assertNull(a.invoke());
65          checkCompletedNormally(a);
66      }
67  
68 <    void checkNotDone(ForkJoinTask a) {
68 >    void checkNotDone(ForkJoinTask<?> a) {
69          assertFalse(a.isDone());
70          assertFalse(a.isCompletedNormally());
71          assertFalse(a.isCompletedAbnormally());
# Line 96 | Line 96 | public class ForkJoinPool8Test extends J
96          } catch (Throwable fail) { threadUnexpectedException(fail); }
97      }
98  
99 <    void checkCompletedNormally(ForkJoinTask a) {
99 >    void checkCompletedNormally(ForkJoinTask<?> a) {
100          assertTrue(a.isDone());
101          assertFalse(a.isCancelled());
102          assertTrue(a.isCompletedNormally());
# Line 116 | Line 116 | public class ForkJoinPool8Test extends J
116          assertNull(v2);
117      }
118  
119 <    void checkCancelled(ForkJoinTask a) {
119 >    void checkCancelled(ForkJoinTask<?> a) {
120          assertTrue(a.isDone());
121          assertTrue(a.isCancelled());
122          assertFalse(a.isCompletedNormally());
# Line 143 | Line 143 | public class ForkJoinPool8Test extends J
143          } catch (Throwable fail) { threadUnexpectedException(fail); }
144      }
145  
146 <    void checkCompletedAbnormally(ForkJoinTask a, Throwable t) {
146 >    void checkCompletedAbnormally(ForkJoinTask<?> a, Throwable t) {
147          assertTrue(a.isDone());
148          assertFalse(a.isCancelled());
149          assertFalse(a.isCompletedNormally());
# Line 739 | Line 739 | public class ForkJoinPool8Test extends J
739                  FibAction f = new FibAction(8);
740                  FibAction g = new FibAction(9);
741                  FibAction h = new FibAction(7);
742 <                HashSet set = new HashSet();
742 >                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
743                  set.add(f);
744                  set.add(g);
745                  set.add(h);
# Line 837 | Line 837 | public class ForkJoinPool8Test extends J
837                  FailingFibAction f = new FailingFibAction(8);
838                  FibAction g = new FibAction(9);
839                  FibAction h = new FibAction(7);
840 <                HashSet set = new HashSet();
840 >                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
841                  set.add(f);
842                  set.add(g);
843                  set.add(h);
# Line 853 | Line 853 | public class ForkJoinPool8Test extends J
853  
854      // CountedCompleter versions
855  
856 <    abstract static class CCF extends CountedCompleter {
856 >    abstract static class CCF extends CountedCompleter<Void> {
857          int number;
858          int rnumber;
859  
860 <        public CCF(CountedCompleter parent, int n) {
860 >        public CCF(CountedCompleter<?> parent, int n) {
861              super(parent, 1);
862              this.number = n;
863          }
864  
865          public final void compute() {
866 <            CountedCompleter p;
866 >            CountedCompleter<?> p;
867              CCF f = this;
868              int n = number;
869              while (n >= 2) {
# Line 880 | Line 880 | public class ForkJoinPool8Test extends J
880      }
881  
882      static final class LCCF extends CCF {
883 <        public LCCF(CountedCompleter parent, int n) {
883 >        public LCCF(CountedCompleter<?> parent, int n) {
884              super(parent, n);
885          }
886 <        public final void onCompletion(CountedCompleter caller) {
886 >        public final void onCompletion(CountedCompleter<?> caller) {
887              CCF p = (CCF)getCompleter();
888              int n = number + rnumber;
889              if (p != null)
# Line 896 | Line 896 | public class ForkJoinPool8Test extends J
896          public RCCF(CountedCompleter parent, int n) {
897              super(parent, n);
898          }
899 <        public final void onCompletion(CountedCompleter caller) {
899 >        public final void onCompletion(CountedCompleter<?> caller) {
900              CCF p = (CCF)getCompleter();
901              int n = number + rnumber;
902              if (p != null)
# Line 907 | Line 907 | public class ForkJoinPool8Test extends J
907      }
908  
909      /** Version of CCF with forced failure in left completions. */
910 <    abstract static class FailingCCF extends CountedCompleter {
910 >    abstract static class FailingCCF extends CountedCompleter<Void> {
911          int number;
912          int rnumber;
913  
914 <        public FailingCCF(CountedCompleter parent, int n) {
914 >        public FailingCCF(CountedCompleter<?> parent, int n) {
915              super(parent, 1);
916              this.number = n;
917          }
918  
919          public final void compute() {
920 <            CountedCompleter p;
920 >            CountedCompleter<?> p;
921              FailingCCF f = this;
922              int n = number;
923              while (n >= 2) {
# Line 934 | Line 934 | public class ForkJoinPool8Test extends J
934      }
935  
936      static final class LFCCF extends FailingCCF {
937 <        public LFCCF(CountedCompleter parent, int n) {
937 >        public LFCCF(CountedCompleter<?> parent, int n) {
938              super(parent, n);
939          }
940 <        public final void onCompletion(CountedCompleter caller) {
940 >        public final void onCompletion(CountedCompleter<?> caller) {
941              FailingCCF p = (FailingCCF)getCompleter();
942              int n = number + rnumber;
943              if (p != null)
# Line 947 | Line 947 | public class ForkJoinPool8Test extends J
947          }
948      }
949      static final class RFCCF extends FailingCCF {
950 <        public RFCCF(CountedCompleter parent, int n) {
950 >        public RFCCF(CountedCompleter<?> parent, int n) {
951              super(parent, n);
952          }
953 <        public final void onCompletion(CountedCompleter caller) {
953 >        public final void onCompletion(CountedCompleter<?> caller) {
954              completeExceptionally(new FJException());
955          }
956      }
# Line 961 | Line 961 | public class ForkJoinPool8Test extends J
961       * completed tasks; getRawResult returns null.
962       */
963      public void testInvokeCC() {
964 <        ForkJoinTask a = new CheckedRecursiveAction() {
964 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
965              protected void realCompute() {
966                  CCF f = new LCCF(null, 8);
967                  assertNull(f.invoke());
# Line 977 | Line 977 | public class ForkJoinPool8Test extends J
977       * completed tasks
978       */
979      public void testQuietlyInvokeCC() {
980 <        ForkJoinTask a = new CheckedRecursiveAction() {
980 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
981              protected void realCompute() {
982                  CCF f = new LCCF(null, 8);
983                  f.quietlyInvoke();
# Line 991 | Line 991 | public class ForkJoinPool8Test extends J
991       * join of a forked task returns when task completes
992       */
993      public void testForkJoinCC() {
994 <        ForkJoinTask a = new CheckedRecursiveAction() {
994 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
995              protected void realCompute() {
996                  CCF f = new LCCF(null, 8);
997                  assertSame(f, f.fork());
# Line 1006 | Line 1006 | public class ForkJoinPool8Test extends J
1006       * get of a forked task returns when task completes
1007       */
1008      public void testForkGetCC() {
1009 <        ForkJoinTask a = new CheckedRecursiveAction() {
1009 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1010              protected void realCompute() throws Exception {
1011                  CCF f = new LCCF(null, 8);
1012                  assertSame(f, f.fork());
# Line 1021 | Line 1021 | public class ForkJoinPool8Test extends J
1021       * timed get of a forked task returns when task completes
1022       */
1023      public void testForkTimedGetCC() {
1024 <        ForkJoinTask a = new CheckedRecursiveAction() {
1024 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1025              protected void realCompute() throws Exception {
1026                  CCF f = new LCCF(null, 8);
1027                  assertSame(f, f.fork());
# Line 1036 | Line 1036 | public class ForkJoinPool8Test extends J
1036       * timed get with null time unit throws NPE
1037       */
1038      public void testForkTimedGetNPECC() {
1039 <        ForkJoinTask a = new CheckedRecursiveAction() {
1039 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1040              protected void realCompute() throws Exception {
1041                  CCF f = new LCCF(null, 8);
1042                  assertSame(f, f.fork());
# Line 1052 | Line 1052 | public class ForkJoinPool8Test extends J
1052       * quietlyJoin of a forked task returns when task completes
1053       */
1054      public void testForkQuietlyJoinCC() {
1055 <        ForkJoinTask a = new CheckedRecursiveAction() {
1055 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1056              protected void realCompute() {
1057                  CCF f = new LCCF(null, 8);
1058                  assertSame(f, f.fork());
# Line 1067 | Line 1067 | public class ForkJoinPool8Test extends J
1067       * invoke task throws exception when task completes abnormally
1068       */
1069      public void testAbnormalInvokeCC() {
1070 <        ForkJoinTask a = new CheckedRecursiveAction() {
1070 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1071              protected void realCompute() {
1072                  FailingCCF f = new LFCCF(null, 8);
1073                  try {
# Line 1084 | Line 1084 | public class ForkJoinPool8Test extends J
1084       * quietlyInvoke task returns when task completes abnormally
1085       */
1086      public void testAbnormalQuietlyInvokeCC() {
1087 <        ForkJoinTask a = new CheckedRecursiveAction() {
1087 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1088              protected void realCompute() {
1089                  FailingCCF f = new LFCCF(null, 8);
1090                  f.quietlyInvoke();
# Line 1098 | Line 1098 | public class ForkJoinPool8Test extends J
1098       * join of a forked task throws exception when task completes abnormally
1099       */
1100      public void testAbnormalForkJoinCC() {
1101 <        ForkJoinTask a = new CheckedRecursiveAction() {
1101 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1102              protected void realCompute() {
1103                  FailingCCF f = new LFCCF(null, 8);
1104                  assertSame(f, f.fork());
# Line 1116 | Line 1116 | public class ForkJoinPool8Test extends J
1116       * get of a forked task throws exception when task completes abnormally
1117       */
1118      public void testAbnormalForkGetCC() {
1119 <        ForkJoinTask a = new CheckedRecursiveAction() {
1119 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1120              protected void realCompute() throws Exception {
1121                  FailingCCF f = new LFCCF(null, 8);
1122                  assertSame(f, f.fork());
# Line 1136 | Line 1136 | public class ForkJoinPool8Test extends J
1136       * timed get of a forked task throws exception when task completes abnormally
1137       */
1138      public void testAbnormalForkTimedGetCC() {
1139 <        ForkJoinTask a = new CheckedRecursiveAction() {
1139 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1140              protected void realCompute() throws Exception {
1141                  FailingCCF f = new LFCCF(null, 8);
1142                  assertSame(f, f.fork());
# Line 1156 | Line 1156 | public class ForkJoinPool8Test extends J
1156       * quietlyJoin of a forked task returns when task completes abnormally
1157       */
1158      public void testAbnormalForkQuietlyJoinCC() {
1159 <        ForkJoinTask a = new CheckedRecursiveAction() {
1159 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1160              protected void realCompute() {
1161                  FailingCCF f = new LFCCF(null, 8);
1162                  assertSame(f, f.fork());
# Line 1171 | Line 1171 | public class ForkJoinPool8Test extends J
1171       * invoke task throws exception when task cancelled
1172       */
1173      public void testCancelledInvokeCC() {
1174 <        ForkJoinTask a = new CheckedRecursiveAction() {
1174 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1175              protected void realCompute() {
1176                  CCF f = new LCCF(null, 8);
1177                  assertTrue(f.cancel(true));
# Line 1189 | Line 1189 | public class ForkJoinPool8Test extends J
1189       * join of a forked task throws exception when task cancelled
1190       */
1191      public void testCancelledForkJoinCC() {
1192 <        ForkJoinTask a = new CheckedRecursiveAction() {
1192 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1193              protected void realCompute() {
1194                  CCF f = new LCCF(null, 8);
1195                  assertTrue(f.cancel(true));
# Line 1208 | Line 1208 | public class ForkJoinPool8Test extends J
1208       * get of a forked task throws exception when task cancelled
1209       */
1210      public void testCancelledForkGetCC() {
1211 <        ForkJoinTask a = new CheckedRecursiveAction() {
1211 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1212              protected void realCompute() throws Exception {
1213                  CCF f = new LCCF(null, 8);
1214                  assertTrue(f.cancel(true));
# Line 1227 | Line 1227 | public class ForkJoinPool8Test extends J
1227       * timed get of a forked task throws exception when task cancelled
1228       */
1229      public void testCancelledForkTimedGetCC() throws Exception {
1230 <        ForkJoinTask a = new CheckedRecursiveAction() {
1230 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1231              protected void realCompute() throws Exception {
1232                  CCF f = new LCCF(null, 8);
1233                  assertTrue(f.cancel(true));
# Line 1246 | Line 1246 | public class ForkJoinPool8Test extends J
1246       * quietlyJoin of a forked task returns when task cancelled
1247       */
1248      public void testCancelledForkQuietlyJoinCC() {
1249 <        ForkJoinTask a = new CheckedRecursiveAction() {
1249 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1250              protected void realCompute() {
1251                  CCF f = new LCCF(null, 8);
1252                  assertTrue(f.cancel(true));
# Line 1261 | Line 1261 | public class ForkJoinPool8Test extends J
1261       * getPool of non-FJ task returns null
1262       */
1263      public void testGetPool2CC() {
1264 <        ForkJoinTask a = new CheckedRecursiveAction() {
1264 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1265              protected void realCompute() {
1266                  assertNull(getPool());
1267              }};
# Line 1272 | Line 1272 | public class ForkJoinPool8Test extends J
1272       * inForkJoinPool of non-FJ task returns false
1273       */
1274      public void testInForkJoinPool2CC() {
1275 <        ForkJoinTask a = new CheckedRecursiveAction() {
1275 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1276              protected void realCompute() {
1277                  assertFalse(inForkJoinPool());
1278              }};
# Line 1283 | Line 1283 | public class ForkJoinPool8Test extends J
1283       * setRawResult(null) succeeds
1284       */
1285      public void testSetRawResultCC() {
1286 <        ForkJoinTask a = new CheckedRecursiveAction() {
1286 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1287              protected void realCompute() {
1288                  setRawResult(null);
1289                  assertNull(getRawResult());
# Line 1295 | Line 1295 | public class ForkJoinPool8Test extends J
1295       * invoke task throws exception after invoking completeExceptionally
1296       */
1297      public void testCompleteExceptionally2CC() {
1298 <        ForkJoinTask a = new CheckedRecursiveAction() {
1298 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1299              protected void realCompute() {
1300                  CCF f = new LCCF(null, 8);
1301                  f.completeExceptionally(new FJException());
# Line 1313 | Line 1313 | public class ForkJoinPool8Test extends J
1313       * invokeAll(t1, t2) invokes all task arguments
1314       */
1315      public void testInvokeAll2CC() {
1316 <        ForkJoinTask a = new CheckedRecursiveAction() {
1316 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1317              protected void realCompute() {
1318                  CCF f = new LCCF(null, 8);
1319                  CCF g = new LCCF(null, 9);
# Line 1330 | Line 1330 | public class ForkJoinPool8Test extends J
1330       * invokeAll(tasks) with 1 argument invokes task
1331       */
1332      public void testInvokeAll1CC() {
1333 <        ForkJoinTask a = new CheckedRecursiveAction() {
1333 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1334              protected void realCompute() {
1335                  CCF f = new LCCF(null, 8);
1336                  invokeAll(f);
# Line 1344 | Line 1344 | public class ForkJoinPool8Test extends J
1344       * invokeAll(tasks) with > 2 argument invokes tasks
1345       */
1346      public void testInvokeAll3CC() {
1347 <        ForkJoinTask a = new CheckedRecursiveAction() {
1347 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1348              protected void realCompute() {
1349                  CCF f = new LCCF(null, 8);
1350                  CCF g = new LCCF(null, 9);
# Line 1364 | Line 1364 | public class ForkJoinPool8Test extends J
1364       * invokeAll(collection) invokes all tasks in the collection
1365       */
1366      public void testInvokeAllCollectionCC() {
1367 <        ForkJoinTask a = new CheckedRecursiveAction() {
1367 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1368              protected void realCompute() {
1369                  CCF f = new LCCF(null, 8);
1370                  CCF g = new LCCF(null, 9);
1371                  CCF h = new LCCF(null, 7);
1372 <                HashSet set = new HashSet();
1372 >                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
1373                  set.add(f);
1374                  set.add(g);
1375                  set.add(h);
# Line 1388 | Line 1388 | public class ForkJoinPool8Test extends J
1388       * invokeAll(tasks) with any null task throws NPE
1389       */
1390      public void testInvokeAllNPECC() {
1391 <        ForkJoinTask a = new CheckedRecursiveAction() {
1391 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1392              protected void realCompute() {
1393                  CCF f = new LCCF(null, 8);
1394                  CCF g = new LCCF(null, 9);
# Line 1405 | Line 1405 | public class ForkJoinPool8Test extends J
1405       * invokeAll(t1, t2) throw exception if any task does
1406       */
1407      public void testAbnormalInvokeAll2CC() {
1408 <        ForkJoinTask a = new CheckedRecursiveAction() {
1408 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1409              protected void realCompute() {
1410                  CCF f = new LCCF(null, 8);
1411                  FailingCCF g = new LFCCF(null, 9);
# Line 1423 | Line 1423 | public class ForkJoinPool8Test extends J
1423       * invokeAll(tasks) with 1 argument throws exception if task does
1424       */
1425      public void testAbnormalInvokeAll1CC() {
1426 <        ForkJoinTask a = new CheckedRecursiveAction() {
1426 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1427              protected void realCompute() {
1428                  FailingCCF g = new LFCCF(null, 9);
1429                  try {
# Line 1440 | Line 1440 | public class ForkJoinPool8Test extends J
1440       * invokeAll(tasks) with > 2 argument throws exception if any task does
1441       */
1442      public void testAbnormalInvokeAll3CC() {
1443 <        ForkJoinTask a = new CheckedRecursiveAction() {
1443 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1444              protected void realCompute() {
1445                  CCF f = new LCCF(null, 8);
1446                  FailingCCF g = new LFCCF(null, 9);
# Line 1459 | Line 1459 | public class ForkJoinPool8Test extends J
1459       * invokeAll(collection) throws exception if any task does
1460       */
1461      public void testAbnormalInvokeAllCollectionCC() {
1462 <        ForkJoinTask a = new CheckedRecursiveAction() {
1462 >        CheckedRecursiveAction a = new CheckedRecursiveAction() {
1463              protected void realCompute() {
1464                  FailingCCF f = new LFCCF(null, 8);
1465                  CCF g = new LCCF(null, 9);
1466                  CCF h = new LCCF(null, 7);
1467 <                HashSet set = new HashSet();
1467 >                HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
1468                  set.add(f);
1469                  set.add(g);
1470                  set.add(h);
# Line 1487 | Line 1487 | public class ForkJoinPool8Test extends J
1487          try (PoolCleaner cleaner = cleaner(p)) {
1488              final long startTime = System.nanoTime();
1489              assertTrue(p.isQuiescent());
1490 <            ForkJoinTask a = new CheckedRecursiveAction() {
1490 >            CheckedRecursiveAction a = new CheckedRecursiveAction() {
1491                  protected void realCompute() {
1492                      FibAction f = new FibAction(8);
1493                      assertSame(f, f.fork());
# Line 1546 | Line 1546 | public class ForkJoinPool8Test extends J
1546          try (PoolCleaner cleaner = cleaner(p)) {
1547              assertTrue(p.isQuiescent());
1548              final long startTime = System.nanoTime();
1549 <            ForkJoinTask a = new CheckedRecursiveAction() {
1549 >            CheckedRecursiveAction a = new CheckedRecursiveAction() {
1550                  protected void realCompute() {
1551                      FibAction f = new FibAction(8);
1552                      assertSame(f, f.fork());

Diff Legend

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