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

Comparing jsr166/src/test/tck/ForkJoinPoolTest.java (file contents):
Revision 1.71 by jsr166, Thu Sep 15 01:18:01 2016 UTC vs.
Revision 1.72 by jsr166, Wed Jan 4 06:09:58 2017 UTC

# Line 631 | Line 631 | public class ForkJoinPoolTest extends JS
631      public void testInvokeAny3() throws Throwable {
632          ExecutorService e = new ForkJoinPool(1);
633          try (PoolCleaner cleaner = cleaner(e)) {
634 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
634 >            List<Callable<String>> l = new ArrayList<>();
635              l.add(null);
636              try {
637                  e.invokeAny(l);
# Line 647 | Line 647 | public class ForkJoinPoolTest extends JS
647          CountDownLatch latch = new CountDownLatch(1);
648          ExecutorService e = new ForkJoinPool(1);
649          try (PoolCleaner cleaner = cleaner(e)) {
650 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
650 >            List<Callable<String>> l = new ArrayList<>();
651              l.add(latchAwaitingStringTask(latch));
652              l.add(null);
653              try {
# Line 664 | Line 664 | public class ForkJoinPoolTest extends JS
664      public void testInvokeAny5() throws Throwable {
665          ExecutorService e = new ForkJoinPool(1);
666          try (PoolCleaner cleaner = cleaner(e)) {
667 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
667 >            List<Callable<String>> l = new ArrayList<>();
668              l.add(new NPETask());
669              try {
670                  e.invokeAny(l);
# Line 681 | Line 681 | public class ForkJoinPoolTest extends JS
681      public void testInvokeAny6() throws Throwable {
682          ExecutorService e = new ForkJoinPool(1);
683          try (PoolCleaner cleaner = cleaner(e)) {
684 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
684 >            List<Callable<String>> l = new ArrayList<>();
685              l.add(new StringTask());
686              l.add(new StringTask());
687              String result = e.invokeAny(l);
# Line 720 | Line 720 | public class ForkJoinPoolTest extends JS
720      public void testInvokeAll3() throws InterruptedException {
721          ExecutorService e = new ForkJoinPool(1);
722          try (PoolCleaner cleaner = cleaner(e)) {
723 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
723 >            List<Callable<String>> l = new ArrayList<>();
724              l.add(new StringTask());
725              l.add(null);
726              try {
# Line 737 | Line 737 | public class ForkJoinPoolTest extends JS
737      public void testInvokeAll4() throws Throwable {
738          ExecutorService e = new ForkJoinPool(1);
739          try (PoolCleaner cleaner = cleaner(e)) {
740 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
740 >            List<Callable<String>> l = new ArrayList<>();
741              l.add(new NPETask());
742              List<Future<String>> futures = e.invokeAll(l);
743              assertEquals(1, futures.size());
# Line 756 | Line 756 | public class ForkJoinPoolTest extends JS
756      public void testInvokeAll5() throws Throwable {
757          ExecutorService e = new ForkJoinPool(1);
758          try (PoolCleaner cleaner = cleaner(e)) {
759 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
759 >            List<Callable<String>> l = new ArrayList<>();
760              l.add(new StringTask());
761              l.add(new StringTask());
762              List<Future<String>> futures = e.invokeAll(l);
# Line 785 | Line 785 | public class ForkJoinPoolTest extends JS
785      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
786          ExecutorService e = new ForkJoinPool(1);
787          try (PoolCleaner cleaner = cleaner(e)) {
788 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
788 >            List<Callable<String>> l = new ArrayList<>();
789              l.add(new StringTask());
790              try {
791                  e.invokeAny(l, MEDIUM_DELAY_MS, null);
# Line 815 | Line 815 | public class ForkJoinPoolTest extends JS
815          CountDownLatch latch = new CountDownLatch(1);
816          ExecutorService e = new ForkJoinPool(1);
817          try (PoolCleaner cleaner = cleaner(e)) {
818 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
818 >            List<Callable<String>> l = new ArrayList<>();
819              l.add(latchAwaitingStringTask(latch));
820              l.add(null);
821              try {
# Line 833 | Line 833 | public class ForkJoinPoolTest extends JS
833          ExecutorService e = new ForkJoinPool(1);
834          try (PoolCleaner cleaner = cleaner(e)) {
835              long startTime = System.nanoTime();
836 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
836 >            List<Callable<String>> l = new ArrayList<>();
837              l.add(new NPETask());
838              try {
839                  e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
# Line 852 | Line 852 | public class ForkJoinPoolTest extends JS
852          ExecutorService e = new ForkJoinPool(1);
853          try (PoolCleaner cleaner = cleaner(e)) {
854              long startTime = System.nanoTime();
855 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
855 >            List<Callable<String>> l = new ArrayList<>();
856              l.add(new StringTask());
857              l.add(new StringTask());
858              String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
# Line 880 | Line 880 | public class ForkJoinPoolTest extends JS
880      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
881          ExecutorService e = new ForkJoinPool(1);
882          try (PoolCleaner cleaner = cleaner(e)) {
883 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
883 >            List<Callable<String>> l = new ArrayList<>();
884              l.add(new StringTask());
885              try {
886                  e.invokeAll(l, MEDIUM_DELAY_MS, null);
# Line 908 | Line 908 | public class ForkJoinPoolTest extends JS
908      public void testTimedInvokeAll3() throws InterruptedException {
909          ExecutorService e = new ForkJoinPool(1);
910          try (PoolCleaner cleaner = cleaner(e)) {
911 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
911 >            List<Callable<String>> l = new ArrayList<>();
912              l.add(new StringTask());
913              l.add(null);
914              try {
# Line 924 | Line 924 | public class ForkJoinPoolTest extends JS
924      public void testTimedInvokeAll4() throws Throwable {
925          ExecutorService e = new ForkJoinPool(1);
926          try (PoolCleaner cleaner = cleaner(e)) {
927 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
927 >            List<Callable<String>> l = new ArrayList<>();
928              l.add(new NPETask());
929              List<Future<String>> futures
930                  = e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
# Line 944 | Line 944 | public class ForkJoinPoolTest extends JS
944      public void testTimedInvokeAll5() throws Throwable {
945          ForkJoinPool e = new ForkJoinPool(1);
946          try (PoolCleaner cleaner = cleaner(e)) {
947 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
947 >            List<Callable<String>> l = new ArrayList<>();
948              l.add(new StringTask());
949              l.add(new StringTask());
950              List<Future<String>> futures

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines