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.7 by jsr166, Mon Sep 7 21:25:50 2015 UTC vs.
Revision 1.18 by jsr166, Wed Jan 4 06:09:58 2017 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.SubmissionPublisher;
20 – import java.util.concurrent.ThreadFactory;
21 – import java.util.concurrent.ThreadPoolExecutor;
22 – import java.util.concurrent.TimeUnit;
14   import java.util.concurrent.atomic.AtomicInteger;
24 – import java.util.function.BiConsumer;
25 – import java.util.function.BiPredicate;
26 – import java.util.function.BiFunction;
27 –
15   import junit.framework.Test;
16   import junit.framework.TestSuite;
17  
18 + import static java.util.concurrent.Flow.Subscriber;
19 + import static java.util.concurrent.Flow.Subscription;
20 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
21 +
22   public class SubmissionPublisherTest extends JSR166TestCase {
23  
24      public static void main(String[] args) {
# Line 37 | Line 28 | public class SubmissionPublisherTest ext
28          return new TestSuite(SubmissionPublisherTest.class);
29      }
30  
31 <    // Factory for single thread pool in case commonPool parallelism is zero
41 <    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() > 0) ?
51 <        ForkJoinPool.commonPool() :
52 <        new ThreadPoolExecutor(1, 1, 60, SECONDS,
53 <                               new LinkedBlockingQueue<Runnable>(),
54 <                               new DaemonThreadFactory());
31 >    final Executor basicExecutor = basicPublisher().getExecutor();
32  
33      static SubmissionPublisher<Integer> basicPublisher() {
34 <        return new SubmissionPublisher<Integer>(basicExecutor,
58 <                                                Flow.defaultBufferSize());
34 >        return new SubmissionPublisher<Integer>();
35      }
36  
37      static class SPException extends RuntimeException {}
# Line 167 | Line 143 | public class SubmissionPublisherTest ext
143      /**
144       * A default-constructed SubmissionPublisher has no subscribers,
145       * is not closed, has default buffer size, and uses the
146 <     * ForkJoinPool.commonPool executor
146 >     * defaultExecutor
147       */
148      public void testConstructor1() {
149 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>();
149 >        SubmissionPublisher<Integer> p = new SubmissionPublisher<>();
150          checkInitialState(p);
175 –        assertSame(p.getExecutor(), ForkJoinPool.commonPool());
151          assertEquals(p.getMaxBufferCapacity(), Flow.defaultBufferSize());
152 +        Executor e = p.getExecutor(), c = ForkJoinPool.commonPool();
153 +        if (ForkJoinPool.getCommonPoolParallelism() > 1)
154 +            assertSame(e, c);
155 +        else
156 +            assertNotSame(e, c);
157      }
158  
159      /**
# Line 182 | Line 162 | public class SubmissionPublisherTest ext
162       */
163      public void testConstructor2() {
164          Executor e = Executors.newFixedThreadPool(1);
165 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(e, 8);
165 >        SubmissionPublisher<Integer> p = new SubmissionPublisher<>(e, 8);
166          checkInitialState(p);
167          assertSame(p.getExecutor(), e);
168          assertEquals(8, p.getMaxBufferCapacity());
# Line 285 | Line 265 | public class SubmissionPublisherTest ext
265          assertEquals(0, s2.nexts);
266          assertEquals(0, s2.errors);
267          assertEquals(0, s2.completes);
268 +        p.close();
269      }
270  
271      /**
# Line 360 | Line 341 | public class SubmissionPublisherTest ext
341      }
342  
343      /**
344 <     * subscribe(null) thows NPE
344 >     * subscribe(null) throws NPE
345       */
346      public void testSubscribe6() {
347          SubmissionPublisher<Integer> p = basicPublisher();
# Line 394 | Line 375 | public class SubmissionPublisherTest ext
375  
376      /**
377       * Closing a publisher exceptionally causes onError to subscribers
378 +     * after they are subscribed
379       */
380      public void testCloseExceptionallyError() {
381          SubmissionPublisher<Integer> p = basicPublisher();
# Line 404 | Line 386 | public class SubmissionPublisherTest ext
386          p.submit(1);
387          p.closeExceptionally(new SPException());
388          assertTrue(p.isClosed());
389 +        s1.awaitSubscribe();
390          s1.awaitError();
391          assertTrue(s1.nexts <= 1);
392          assertEquals(1, s1.errors);
393 +        s2.awaitSubscribe();
394          s2.awaitError();
395          assertTrue(s2.nexts <= 1);
396          assertEquals(1, s2.errors);
# Line 455 | Line 439 | public class SubmissionPublisherTest ext
439      }
440  
441      /**
442 <     * If a handler is supplied in conctructor, it is invoked when
442 >     * If a handler is supplied in constructor, it is invoked when
443       * subscriber throws an exception in onNext
444       */
445      public void testThrowOnNextHandler() {
446          AtomicInteger calls = new AtomicInteger();
447 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>
448 <            (basicExecutor, 8,
465 <             (s, e) -> calls.getAndIncrement());
447 >        SubmissionPublisher<Integer> p = new SubmissionPublisher<>(
448 >            basicExecutor, 8, (s, e) -> calls.getAndIncrement());
449          TestSubscriber s1 = new TestSubscriber();
450          TestSubscriber s2 = new TestSubscriber();
451          p.subscribe(s1);
# Line 643 | Line 626 | public class SubmissionPublisherTest ext
626       * submit eventually issues requested items when buffer capacity is 1
627       */
628      public void testCap1Submit() {
629 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
630 <            basicExecutor, 1);
629 >        SubmissionPublisher<Integer> p
630 >            = new SubmissionPublisher<>(basicExecutor, 1);
631          TestSubscriber s1 = new TestSubscriber();
632          TestSubscriber s2 = new TestSubscriber();
633          p.subscribe(s1);
# Line 722 | Line 705 | public class SubmissionPublisherTest ext
705       * offer reports drops if saturated
706       */
707      public void testDroppedOffer() {
708 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
709 <            basicExecutor, 4);
708 >        SubmissionPublisher<Integer> p
709 >            = new SubmissionPublisher<>(basicExecutor, 4);
710          TestSubscriber s1 = new TestSubscriber();
711          s1.request = false;
712          TestSubscriber s2 = new TestSubscriber();
# Line 751 | Line 734 | public class SubmissionPublisherTest ext
734       */
735      public void testHandledDroppedOffer() {
736          AtomicInteger calls = new AtomicInteger();
737 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
738 <            basicExecutor, 4);
737 >        SubmissionPublisher<Integer> p
738 >            = new SubmissionPublisher<>(basicExecutor, 4);
739          TestSubscriber s1 = new TestSubscriber();
740          s1.request = false;
741          TestSubscriber s2 = new TestSubscriber();
# Line 779 | Line 762 | public class SubmissionPublisherTest ext
762       */
763      public void testRecoveredHandledDroppedOffer() {
764          AtomicInteger calls = new AtomicInteger();
765 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
766 <            basicExecutor, 4);
765 >        SubmissionPublisher<Integer> p
766 >            = new SubmissionPublisher<>(basicExecutor, 4);
767          TestSubscriber s1 = new TestSubscriber();
768          s1.request = false;
769          TestSubscriber s2 = new TestSubscriber();
# Line 860 | Line 843 | public class SubmissionPublisherTest ext
843       * Timed offer reports drops if saturated
844       */
845      public void testDroppedTimedOffer() {
846 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
847 <            basicExecutor, 4);
846 >        SubmissionPublisher<Integer> p
847 >            = new SubmissionPublisher<>(basicExecutor, 4);
848          TestSubscriber s1 = new TestSubscriber();
849          s1.request = false;
850          TestSubscriber s2 = new TestSubscriber();
# Line 870 | Line 853 | public class SubmissionPublisherTest ext
853          p.subscribe(s2);
854          s2.awaitSubscribe();
855          s1.awaitSubscribe();
856 +        long delay = timeoutMillis();
857          for (int i = 1; i <= 4; ++i)
858 <            assertTrue(p.offer(i, SHORT_DELAY_MS, MILLISECONDS, null) >= 0);
859 <        p.offer(5, SHORT_DELAY_MS, MILLISECONDS, null);
860 <        assertTrue(p.offer(6, SHORT_DELAY_MS, MILLISECONDS, null) < 0);
858 >            assertTrue(p.offer(i, delay, MILLISECONDS, null) >= 0);
859 >        long startTime = System.nanoTime();
860 >        assertTrue(p.offer(5, delay, MILLISECONDS, null) < 0);
861          s1.sn.request(64);
862 <        assertTrue(p.offer(7, SHORT_DELAY_MS, MILLISECONDS, null) < 0);
862 >        assertTrue(p.offer(6, delay, MILLISECONDS, null) < 0);
863 >        // 2 * delay should elapse but check only 1 * delay to allow timer slop
864 >        assertTrue(millisElapsedSince(startTime) >= delay);
865          s2.sn.request(64);
866          p.close();
867          s2.awaitComplete();
# Line 889 | Line 875 | public class SubmissionPublisherTest ext
875       */
876      public void testHandledDroppedTimedOffer() {
877          AtomicInteger calls = new AtomicInteger();
878 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
879 <            basicExecutor, 4);
878 >        SubmissionPublisher<Integer> p
879 >            = new SubmissionPublisher<>(basicExecutor, 4);
880          TestSubscriber s1 = new TestSubscriber();
881          s1.request = false;
882          TestSubscriber s2 = new TestSubscriber();
# Line 899 | Line 885 | public class SubmissionPublisherTest ext
885          p.subscribe(s2);
886          s2.awaitSubscribe();
887          s1.awaitSubscribe();
888 +        long delay = timeoutMillis();
889          for (int i = 1; i <= 4; ++i)
890 <            assertTrue(p.offer(i, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> noopHandle(calls)) >= 0);
891 <        p.offer(5, (s, x) -> noopHandle(calls));
892 <        assertTrue(p.offer(6, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
890 >            assertTrue(p.offer(i, delay, MILLISECONDS, (s, x) -> noopHandle(calls)) >= 0);
891 >        long startTime = System.nanoTime();
892 >        assertTrue(p.offer(5, delay, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
893          s1.sn.request(64);
894 <        assertTrue(p.offer(7, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
894 >        assertTrue(p.offer(6, delay, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
895 >        assertTrue(millisElapsedSince(startTime) >= delay);
896          s2.sn.request(64);
897          p.close();
898          s2.awaitComplete();
# Line 917 | Line 905 | public class SubmissionPublisherTest ext
905       */
906      public void testRecoveredHandledDroppedTimedOffer() {
907          AtomicInteger calls = new AtomicInteger();
908 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
909 <            basicExecutor, 4);
908 >        SubmissionPublisher<Integer> p
909 >            = new SubmissionPublisher<>(basicExecutor, 4);
910          TestSubscriber s1 = new TestSubscriber();
911          s1.request = false;
912          TestSubscriber s2 = new TestSubscriber();
# Line 928 | Line 916 | public class SubmissionPublisherTest ext
916          s2.awaitSubscribe();
917          s1.awaitSubscribe();
918          int n = 0;
919 <        for (int i = 1; i <= 8; ++i) {
920 <            int d = p.offer(i, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> reqHandle(calls, s));
919 >        long delay = timeoutMillis();
920 >        long startTime = System.nanoTime();
921 >        for (int i = 1; i <= 6; ++i) {
922 >            int d = p.offer(i, delay, MILLISECONDS, (s, x) -> reqHandle(calls, s));
923              n = n + 2 + (d < 0 ? d : 0);
924          }
925 +        assertTrue(millisElapsedSince(startTime) >= delay);
926          p.close();
927          s2.awaitComplete();
928          s1.awaitComplete();
# Line 939 | Line 930 | public class SubmissionPublisherTest ext
930          assertTrue(calls.get() >= 2);
931      }
932  
933 +    /**
934 +     * consume returns a CompletableFuture that is done when
935 +     * publisher completes
936 +     */
937 +    public void testConsume() {
938 +        AtomicInteger sum = new AtomicInteger();
939 +        SubmissionPublisher<Integer> p = basicPublisher();
940 +        CompletableFuture<Void> f =
941 +            p.consume((Integer x) -> sum.getAndAdd(x.intValue()));
942 +        int n = 20;
943 +        for (int i = 1; i <= n; ++i)
944 +            p.submit(i);
945 +        p.close();
946 +        f.join();
947 +        assertEquals((n * (n + 1)) / 2, sum.get());
948 +    }
949 +
950 +    /**
951 +     * consume(null) throws NPE
952 +     */
953 +    public void testConsumeNPE() {
954 +        SubmissionPublisher<Integer> p = basicPublisher();
955 +        try {
956 +            CompletableFuture<Void> f = p.consume(null);
957 +            shouldThrow();
958 +        } catch (NullPointerException success) {}
959 +    }
960 +
961 +    /**
962 +     * consume eventually stops processing published items if cancelled
963 +     */
964 +    public void testCancelledConsume() {
965 +        AtomicInteger count = new AtomicInteger();
966 +        SubmissionPublisher<Integer> p = basicPublisher();
967 +        CompletableFuture<Void> f = p.consume(x -> count.getAndIncrement());
968 +        f.cancel(true);
969 +        int n = 1000000; // arbitrary limit
970 +        for (int i = 1; i <= n; ++i)
971 +            p.submit(i);
972 +        assertTrue(count.get() < n);
973 +    }
974 +
975   }

Diff Legend

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