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

Comparing jsr166/src/test/tck/CountedCompleterTest.java (file contents):
Revision 1.11 by jsr166, Sun Jul 14 16:37:34 2013 UTC vs.
Revision 1.15 by jsr166, Wed Dec 31 17:00:58 2014 UTC

# Line 3 | Line 3
3   * Expert Group and released to the public domain, as explained at
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6 < import java.util.concurrent.ExecutionException;
6 > import java.util.HashSet;
7   import java.util.concurrent.CancellationException;
8 + import java.util.concurrent.CountedCompleter;
9 + import java.util.concurrent.ExecutionException;
10   import java.util.concurrent.ForkJoinPool;
11   import java.util.concurrent.ForkJoinTask;
10 – import java.util.concurrent.CountedCompleter;
11 – import java.util.concurrent.ForkJoinWorkerThread;
12 – import java.util.concurrent.RecursiveAction;
13 – import java.util.concurrent.TimeUnit;
12   import java.util.concurrent.TimeoutException;
13   import java.util.concurrent.atomic.AtomicInteger;
16 – import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
14   import java.util.concurrent.atomic.AtomicReference;
15   import static java.util.concurrent.TimeUnit.MILLISECONDS;
16   import static java.util.concurrent.TimeUnit.SECONDS;
20 – import java.util.HashSet;
17   import junit.framework.*;
18  
19   public class CountedCompleterTest extends JSR166TestCase {
# Line 212 | Line 208 | public class CountedCompleterTest extend
208          final AtomicInteger onCompletionN = new AtomicInteger(0);
209          final AtomicInteger onExceptionalCompletionN = new AtomicInteger(0);
210          final AtomicInteger setRawResultN = new AtomicInteger(0);
211 <        final AtomicReference<Object> rawResult = new AtomicReference<>(null);
211 >        final AtomicReference<Object> rawResult = new AtomicReference<Object>(null);
212          int computeN() { return computeN.get(); }
213          int onCompletionN() { return onCompletionN.get(); }
214          int onExceptionalCompletionN() { return onExceptionalCompletionN.get(); }
# Line 1137 | Line 1133 | public class CountedCompleterTest extend
1133      }
1134  
1135      /**
1136 <     * invokeAll(collection)  throws exception if any task does
1136 >     * invokeAll(collection) throws exception if any task does
1137       */
1138      public void testAbnormalInvokeAllCollection() {
1139          ForkJoinTask a = new CheckedRecursiveAction() {
# Line 1802 | Line 1798 | public class CountedCompleterTest extend
1798      }
1799  
1800      /**
1801 <     * invokeAll(collection)  throws exception if any task does
1801 >     * invokeAll(collection) throws exception if any task does
1802       */
1803      public void testAbnormalInvokeAllCollectionSingleton() {
1804          ForkJoinTask a = new CheckedRecursiveAction() {

Diff Legend

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