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

Comparing jsr166/src/test/tck/SubmissionPublisherTest.java (file contents):
Revision 1.9 by dl, Tue Sep 8 19:44:10 2015 UTC vs.
Revision 1.12 by dl, Sat Sep 12 17:18:13 2015 UTC

# Line 5 | Line 5
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   */
7  
8 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 < import static java.util.concurrent.TimeUnit.SECONDS;
10 <
8 > import java.util.concurrent.CompletableFuture;
9   import java.util.concurrent.Executor;
10   import java.util.concurrent.Executors;
11   import java.util.concurrent.Flow;
14 import static java.util.concurrent.Flow.Publisher;
15 import static java.util.concurrent.Flow.Subscriber;
16 import static java.util.concurrent.Flow.Subscription;
17 import java.util.concurrent.LinkedBlockingQueue;
12   import java.util.concurrent.ForkJoinPool;
13 + import java.util.concurrent.LinkedBlockingQueue;
14   import java.util.concurrent.SubmissionPublisher;
15   import java.util.concurrent.ThreadFactory;
16   import java.util.concurrent.ThreadPoolExecutor;
17   import java.util.concurrent.TimeUnit;
18   import java.util.concurrent.atomic.AtomicInteger;
19   import java.util.function.BiConsumer;
25 import java.util.function.BiPredicate;
20   import java.util.function.BiFunction;
21 <
21 > import java.util.function.BiPredicate;
22 > import java.util.stream.Stream;
23   import junit.framework.Test;
24   import junit.framework.TestSuite;
25  
26 + import static java.util.concurrent.Flow.Publisher;
27 + import static java.util.concurrent.Flow.Subscriber;
28 + import static java.util.concurrent.Flow.Subscription;
29 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
30 + import static java.util.concurrent.TimeUnit.SECONDS;
31 +
32   public class SubmissionPublisherTest extends JSR166TestCase {
33  
34      public static void main(String[] args) {
# Line 37 | Line 38 | public class SubmissionPublisherTest ext
38          return new TestSuite(SubmissionPublisherTest.class);
39      }
40  
41 <    // Factory for single thread pool in case commonPool parallelism is zero
42 <    static final class DaemonThreadFactory implements ThreadFactory {
42 <        public Thread newThread(Runnable r) {
43 <            Thread t = new Thread(r);
44 <            t.setDaemon(true);
45 <            return t;
46 <        }
47 <    }
48 <
49 <    static final Executor basicExecutor =
50 <        (ForkJoinPool.getCommonPoolParallelism() > 1) ?
51 <        ForkJoinPool.commonPool() :
52 <        new ThreadPoolExecutor(1, 1, 60, SECONDS,
53 <                               new LinkedBlockingQueue<Runnable>(),
54 <                               new DaemonThreadFactory());
55 <
41 >    final Executor basicExecutor = basicPublisher().getExecutor();
42 >    
43      static SubmissionPublisher<Integer> basicPublisher() {
44 <        return new SubmissionPublisher<Integer>(basicExecutor,
58 <                                                Flow.defaultBufferSize());
44 >        return new SubmissionPublisher<Integer>();
45      }
46  
47      static class SPException extends RuntimeException {}
# Line 167 | Line 153 | public class SubmissionPublisherTest ext
153      /**
154       * A default-constructed SubmissionPublisher has no subscribers,
155       * is not closed, has default buffer size, and uses the
156 <     * ForkJoinPool.commonPool executor
156 >     * defaultExecutor
157       */
158      public void testConstructor1() {
159          SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>();
160          checkInitialState(p);
175        assertSame(p.getExecutor(), ForkJoinPool.commonPool());
161          assertEquals(p.getMaxBufferCapacity(), Flow.defaultBufferSize());
162 +        Executor e = p.getExecutor(), c = ForkJoinPool.commonPool();
163 +        if (ForkJoinPool.getCommonPoolParallelism() > 1)
164 +            assertSame(e, c);
165 +        else
166 +            assertNotSame(e, c);
167      }
168  
169      /**
# Line 948 | Line 938 | public class SubmissionPublisherTest ext
938          assertTrue(calls.get() >= 2);
939      }
940  
941 +    /**
942 +     * consume returns a CompletableFuture that is done when
943 +     * publisher completes
944 +     */
945 +    public void testConsume() {
946 +        AtomicInteger sum = new AtomicInteger();
947 +        SubmissionPublisher<Integer> p = basicPublisher();
948 +        CompletableFuture<Void> f =
949 +            p.consume((Integer x) -> { sum.getAndAdd(x.intValue()); });
950 +        int n = 20;
951 +        for (int i = 1; i <= n; ++i)
952 +            p.submit(i);
953 +        p.close();
954 +        f.join();
955 +        assertEquals((n * (n + 1)) / 2, sum.get());
956 +    }
957 +
958 +    /**
959 +     * consume(null) throws NPE
960 +     */
961 +    public void testConsumeNPE() {
962 +        SubmissionPublisher<Integer> p = basicPublisher();
963 +        try {
964 +            CompletableFuture<Void> f = p.consume(null);
965 +            shouldThrow();
966 +        } catch (NullPointerException success) {}
967 +    }
968 +
969 +    /**
970 +     * consume eventually stops processing published items if cancelled
971 +     */
972 +    public void testCancelledConsume() {
973 +        AtomicInteger count = new AtomicInteger();
974 +        SubmissionPublisher<Integer> p = basicPublisher();
975 +        CompletableFuture<Void> f = p.consume(x -> count.getAndIncrement());
976 +        f.cancel(true);
977 +        int n = 1000000; // arbitrary limit
978 +        for (int i = 1; i <= n; ++i)
979 +            p.submit(i);
980 +        assertTrue(count.get() < n);
981 +    }
982 +
983   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines