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.50 by jsr166, Mon May 20 16:46:23 2013 UTC vs.
Revision 1.56 by jsr166, Fri Oct 2 21:52:36 2015 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 < import junit.framework.*;
7 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
9 >
10 > import java.security.PrivilegedAction;
11 > import java.security.PrivilegedExceptionAction;
12   import java.util.ArrayList;
13   import java.util.Collection;
14   import java.util.List;
11 – import java.util.concurrent.Executors;
12 – import java.util.concurrent.ExecutorService;
13 – import java.util.concurrent.AbstractExecutorService;
14 – import java.util.concurrent.CountDownLatch;
15   import java.util.concurrent.Callable;
16 < import java.util.concurrent.Future;
16 > import java.util.concurrent.CountDownLatch;
17   import java.util.concurrent.ExecutionException;
18 < import java.util.concurrent.CancellationException;
19 < import java.util.concurrent.RejectedExecutionException;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20   import java.util.concurrent.ForkJoinPool;
21   import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.ForkJoinWorkerThread;
23 + import java.util.concurrent.Future;
24   import java.util.concurrent.RecursiveTask;
25 < import java.util.concurrent.TimeUnit;
25 > import java.util.concurrent.RejectedExecutionException;
26   import java.util.concurrent.atomic.AtomicBoolean;
27   import java.util.concurrent.locks.ReentrantLock;
28 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
29 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
30 < import java.security.AccessControlException;
31 < import java.security.Policy;
31 < import java.security.PrivilegedAction;
32 < import java.security.PrivilegedExceptionAction;
28 >
29 > import junit.framework.AssertionFailedError;
30 > import junit.framework.Test;
31 > import junit.framework.TestSuite;
32  
33   public class ForkJoinPoolTest extends JSR166TestCase {
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run(suite());
35 >        main(suite(), args);
36      }
37  
38      public static Test suite() {
# Line 108 | Line 107 | public class ForkJoinPoolTest extends JS
107      static final class FibTask extends RecursiveTask<Integer> {
108          final int number;
109          FibTask(int n) { number = n; }
110 <        public Integer compute() {
110 >        protected Integer compute() {
111              int n = number;
112              if (n <= 1)
113                  return n;
# Line 136 | Line 135 | public class ForkJoinPoolTest extends JS
135              this.locker = locker;
136              this.lock = lock;
137          }
138 <        public Integer compute() {
138 >        protected Integer compute() {
139              int n;
140              LockingFibTask f1 = null;
141              LockingFibTask f2 = null;
# Line 419 | Line 418 | public class ForkJoinPoolTest extends JS
418          ExecutorService e = new ForkJoinPool(1);
419          try {
420              final AtomicBoolean done = new AtomicBoolean(false);
421 <            CheckedRunnable task = new CheckedRunnable() {
421 >            Future<?> future = e.submit(new CheckedRunnable() {
422                  public void realRun() {
423                      done.set(true);
424 <                }};
426 <            Future<?> future = e.submit(task);
424 >                }});
425              assertNull(future.get());
426              assertNull(future.get(0, MILLISECONDS));
427              assertTrue(done.get());
# Line 989 | Line 987 | public class ForkJoinPoolTest extends JS
987              l.add(new StringTask());
988              l.add(new StringTask());
989              List<Future<String>> futures
990 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
990 >                = e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
991              assertEquals(2, futures.size());
992              for (Future<String> future : futures)
993                  assertSame(TEST_STRING, future.get());

Diff Legend

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