--- jsr166/src/test/tck/SubmissionPublisherTest.java	2015/09/08 19:44:10	1.9
+++ jsr166/src/test/tck/SubmissionPublisherTest.java	2015/09/12 17:18:13	1.12
@@ -5,29 +5,30 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Flow;
-import static java.util.concurrent.Flow.Publisher;
-import static java.util.concurrent.Flow.Subscriber;
-import static java.util.concurrent.Flow.Subscription;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.SubmissionPublisher;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
-import java.util.function.BiPredicate;
 import java.util.function.BiFunction;
-
+import java.util.function.BiPredicate;
+import java.util.stream.Stream;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import static java.util.concurrent.Flow.Publisher;
+import static java.util.concurrent.Flow.Subscriber;
+import static java.util.concurrent.Flow.Subscription;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 public class SubmissionPublisherTest extends JSR166TestCase {
 
     public static void main(String[] args) {
@@ -37,25 +38,10 @@ public class SubmissionPublisherTest ext
         return new TestSuite(SubmissionPublisherTest.class);
     }
 
-    // Factory for single thread pool in case commonPool parallelism is zero
-    static final class DaemonThreadFactory implements ThreadFactory {
-        public Thread newThread(Runnable r) {
-            Thread t = new Thread(r);
-            t.setDaemon(true);
-            return t;
-        }
-    }
-
-    static final Executor basicExecutor =
-        (ForkJoinPool.getCommonPoolParallelism() > 1) ?
-        ForkJoinPool.commonPool() :
-        new ThreadPoolExecutor(1, 1, 60, SECONDS,
-                               new LinkedBlockingQueue<Runnable>(),
-                               new DaemonThreadFactory());
-
+    final Executor basicExecutor = basicPublisher().getExecutor();
+    
     static SubmissionPublisher<Integer> basicPublisher() {
-        return new SubmissionPublisher<Integer>(basicExecutor,
-                                                Flow.defaultBufferSize());
+        return new SubmissionPublisher<Integer>();
     }
 
     static class SPException extends RuntimeException {}
@@ -167,13 +153,17 @@ public class SubmissionPublisherTest ext
     /**
      * A default-constructed SubmissionPublisher has no subscribers,
      * is not closed, has default buffer size, and uses the
-     * ForkJoinPool.commonPool executor
+     * defaultExecutor
      */
     public void testConstructor1() {
         SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>();
         checkInitialState(p);
-        assertSame(p.getExecutor(), ForkJoinPool.commonPool());
         assertEquals(p.getMaxBufferCapacity(), Flow.defaultBufferSize());
+        Executor e = p.getExecutor(), c = ForkJoinPool.commonPool();
+        if (ForkJoinPool.getCommonPoolParallelism() > 1)
+            assertSame(e, c);
+        else
+            assertNotSame(e, c);
     }
 
     /**
@@ -948,4 +938,46 @@ public class SubmissionPublisherTest ext
         assertTrue(calls.get() >= 2);
     }
 
+    /**
+     * consume returns a CompletableFuture that is done when
+     * publisher completes
+     */
+    public void testConsume() {
+        AtomicInteger sum = new AtomicInteger();
+        SubmissionPublisher<Integer> p = basicPublisher();
+        CompletableFuture<Void> f =
+            p.consume((Integer x) -> { sum.getAndAdd(x.intValue()); });
+        int n = 20;
+        for (int i = 1; i <= n; ++i)
+            p.submit(i);
+        p.close();
+        f.join();
+        assertEquals((n * (n + 1)) / 2, sum.get());
+    }
+
+    /**
+     * consume(null) throws NPE
+     */
+    public void testConsumeNPE() {
+        SubmissionPublisher<Integer> p = basicPublisher();
+        try {
+            CompletableFuture<Void> f = p.consume(null);
+            shouldThrow();
+        } catch (NullPointerException success) {}
+    }
+
+    /**
+     * consume eventually stops processing published items if cancelled
+     */
+    public void testCancelledConsume() {
+        AtomicInteger count = new AtomicInteger();
+        SubmissionPublisher<Integer> p = basicPublisher();
+        CompletableFuture<Void> f = p.consume(x -> count.getAndIncrement());
+        f.cancel(true);
+        int n = 1000000; // arbitrary limit
+        for (int i = 1; i <= n; ++i)
+            p.submit(i);
+        assertTrue(count.get() < n);
+    }
+
 }