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.8 by jsr166, Mon Sep 7 21:36:03 2015 UTC vs.
Revision 1.21 by jsr166, Mon May 29 22:44:27 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());
169      }
170  
171      /**
172 <     * A null Executor argument to SubmissionPublisher constructor throws NPE
172 >     * A null Executor argument to SubmissionPublisher constructor
173 >     * throws NullPointerException
174       */
175      public void testConstructor3() {
176          try {
# Line 200 | Line 181 | public class SubmissionPublisherTest ext
181  
182      /**
183       * A negative capacity argument to SubmissionPublisher constructor
184 <     * throws IAE
184 >     * throws IllegalArgumentException
185       */
186      public void testConstructor4() {
187          Executor e = Executors.newFixedThreadPool(1);
# Line 212 | Line 193 | public class SubmissionPublisherTest ext
193  
194      /**
195       * A closed publisher reports isClosed with no closedException and
196 <     * throws ISE upon attempted submission; a subsequent close or
197 <     * closeExceptionally has no additional effect.
196 >     * throws IllegalStateException upon attempted submission; a
197 >     * subsequent close or closeExceptionally has no additional
198 >     * effect.
199       */
200      public void testClose() {
201          SubmissionPublisher<Integer> p = basicPublisher();
# Line 233 | Line 215 | public class SubmissionPublisherTest ext
215  
216      /**
217       * A publisher closedExceptionally reports isClosed with the
218 <     * closedException and throws ISE upon attempted submission; a
219 <     * subsequent close or closeExceptionally has no additional
220 <     * effect.
218 >     * closedException and throws IllegalStateException upon attempted
219 >     * submission; a subsequent close or closeExceptionally has no
220 >     * additional effect.
221       */
222      public void testCloseExceptionally() {
223          SubmissionPublisher<Integer> p = basicPublisher();
# Line 285 | Line 267 | public class SubmissionPublisherTest ext
267          assertEquals(0, s2.nexts);
268          assertEquals(0, s2.errors);
269          assertEquals(0, s2.completes);
270 +        p.close();
271      }
272  
273      /**
# Line 394 | Line 377 | public class SubmissionPublisherTest ext
377  
378      /**
379       * Closing a publisher exceptionally causes onError to subscribers
380 +     * after they are subscribed
381       */
382      public void testCloseExceptionallyError() {
383          SubmissionPublisher<Integer> p = basicPublisher();
# Line 404 | Line 388 | public class SubmissionPublisherTest ext
388          p.submit(1);
389          p.closeExceptionally(new SPException());
390          assertTrue(p.isClosed());
391 +        s1.awaitSubscribe();
392          s1.awaitError();
393          assertTrue(s1.nexts <= 1);
394          assertEquals(1, s1.errors);
395 +        s2.awaitSubscribe();
396          s2.awaitError();
397          assertTrue(s2.nexts <= 1);
398          assertEquals(1, s2.errors);
# Line 460 | Line 446 | public class SubmissionPublisherTest ext
446       */
447      public void testThrowOnNextHandler() {
448          AtomicInteger calls = new AtomicInteger();
449 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>
450 <            (basicExecutor, 8,
465 <             (s, e) -> calls.getAndIncrement());
449 >        SubmissionPublisher<Integer> p = new SubmissionPublisher<>(
450 >            basicExecutor, 8, (s, e) -> calls.getAndIncrement());
451          TestSubscriber s1 = new TestSubscriber();
452          TestSubscriber s2 = new TestSubscriber();
453          p.subscribe(s1);
# Line 509 | Line 494 | public class SubmissionPublisherTest ext
494          s1.request = false;
495          p.subscribe(s1);
496          s1.awaitSubscribe();
497 <        assertTrue(p.estimateMinimumDemand() == 0);
497 >        assertEquals(0, p.estimateMinimumDemand());
498          TestSubscriber s2 = new TestSubscriber();
499          p.subscribe(s2);
500          p.submit(1);
# Line 550 | Line 535 | public class SubmissionPublisherTest ext
535      }
536  
537      /**
538 <     * Negative request causes error
538 >     * Non-positive request causes error
539       */
540      public void testRequest3() {
541          SubmissionPublisher<Integer> p = basicPublisher();
542          TestSubscriber s1 = new TestSubscriber();
543          TestSubscriber s2 = new TestSubscriber();
544 +        TestSubscriber s3 = new TestSubscriber();
545          p.subscribe(s1);
546          p.subscribe(s2);
547 +        p.subscribe(s3);
548 +        s3.awaitSubscribe();
549          s2.awaitSubscribe();
550          s1.awaitSubscribe();
551          s1.sn.request(-1L);
552 +        s3.sn.request(0L);
553          p.submit(1);
554          p.submit(2);
555          p.close();
# Line 570 | Line 559 | public class SubmissionPublisherTest ext
559          s1.awaitError();
560          assertEquals(1, s1.errors);
561          assertTrue(s1.lastError instanceof IllegalArgumentException);
562 +        s3.awaitError();
563 +        assertEquals(1, s3.errors);
564 +        assertTrue(s3.lastError instanceof IllegalArgumentException);
565      }
566  
567      /**
# Line 643 | Line 635 | public class SubmissionPublisherTest ext
635       * submit eventually issues requested items when buffer capacity is 1
636       */
637      public void testCap1Submit() {
638 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
639 <            basicExecutor, 1);
638 >        SubmissionPublisher<Integer> p
639 >            = new SubmissionPublisher<>(basicExecutor, 1);
640          TestSubscriber s1 = new TestSubscriber();
641          TestSubscriber s2 = new TestSubscriber();
642          p.subscribe(s1);
# Line 722 | Line 714 | public class SubmissionPublisherTest ext
714       * offer reports drops if saturated
715       */
716      public void testDroppedOffer() {
717 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
718 <            basicExecutor, 4);
717 >        SubmissionPublisher<Integer> p
718 >            = new SubmissionPublisher<>(basicExecutor, 4);
719          TestSubscriber s1 = new TestSubscriber();
720          s1.request = false;
721          TestSubscriber s2 = new TestSubscriber();
# Line 751 | Line 743 | public class SubmissionPublisherTest ext
743       */
744      public void testHandledDroppedOffer() {
745          AtomicInteger calls = new AtomicInteger();
746 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
747 <            basicExecutor, 4);
746 >        SubmissionPublisher<Integer> p
747 >            = new SubmissionPublisher<>(basicExecutor, 4);
748          TestSubscriber s1 = new TestSubscriber();
749          s1.request = false;
750          TestSubscriber s2 = new TestSubscriber();
# Line 779 | Line 771 | public class SubmissionPublisherTest ext
771       */
772      public void testRecoveredHandledDroppedOffer() {
773          AtomicInteger calls = new AtomicInteger();
774 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
775 <            basicExecutor, 4);
774 >        SubmissionPublisher<Integer> p
775 >            = new SubmissionPublisher<>(basicExecutor, 4);
776          TestSubscriber s1 = new TestSubscriber();
777          s1.request = false;
778          TestSubscriber s2 = new TestSubscriber();
# Line 860 | Line 852 | public class SubmissionPublisherTest ext
852       * Timed offer reports drops if saturated
853       */
854      public void testDroppedTimedOffer() {
855 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
856 <            basicExecutor, 4);
855 >        SubmissionPublisher<Integer> p
856 >            = new SubmissionPublisher<>(basicExecutor, 4);
857          TestSubscriber s1 = new TestSubscriber();
858          s1.request = false;
859          TestSubscriber s2 = new TestSubscriber();
# Line 870 | Line 862 | public class SubmissionPublisherTest ext
862          p.subscribe(s2);
863          s2.awaitSubscribe();
864          s1.awaitSubscribe();
865 +        long delay = timeoutMillis();
866          for (int i = 1; i <= 4; ++i)
867 <            assertTrue(p.offer(i, SHORT_DELAY_MS, MILLISECONDS, null) >= 0);
868 <        p.offer(5, SHORT_DELAY_MS, MILLISECONDS, null);
869 <        assertTrue(p.offer(6, SHORT_DELAY_MS, MILLISECONDS, null) < 0);
867 >            assertTrue(p.offer(i, delay, MILLISECONDS, null) >= 0);
868 >        long startTime = System.nanoTime();
869 >        assertTrue(p.offer(5, delay, MILLISECONDS, null) < 0);
870          s1.sn.request(64);
871 <        assertTrue(p.offer(7, SHORT_DELAY_MS, MILLISECONDS, null) < 0);
871 >        assertTrue(p.offer(6, delay, MILLISECONDS, null) < 0);
872 >        // 2 * delay should elapse but check only 1 * delay to allow timer slop
873 >        assertTrue(millisElapsedSince(startTime) >= delay);
874          s2.sn.request(64);
875          p.close();
876          s2.awaitComplete();
# Line 889 | Line 884 | public class SubmissionPublisherTest ext
884       */
885      public void testHandledDroppedTimedOffer() {
886          AtomicInteger calls = new AtomicInteger();
887 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
888 <            basicExecutor, 4);
887 >        SubmissionPublisher<Integer> p
888 >            = new SubmissionPublisher<>(basicExecutor, 4);
889          TestSubscriber s1 = new TestSubscriber();
890          s1.request = false;
891          TestSubscriber s2 = new TestSubscriber();
# Line 899 | Line 894 | public class SubmissionPublisherTest ext
894          p.subscribe(s2);
895          s2.awaitSubscribe();
896          s1.awaitSubscribe();
897 +        long delay = timeoutMillis();
898          for (int i = 1; i <= 4; ++i)
899 <            assertTrue(p.offer(i, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> noopHandle(calls)) >= 0);
900 <        p.offer(5, (s, x) -> noopHandle(calls));
901 <        assertTrue(p.offer(6, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
899 >            assertTrue(p.offer(i, delay, MILLISECONDS, (s, x) -> noopHandle(calls)) >= 0);
900 >        long startTime = System.nanoTime();
901 >        assertTrue(p.offer(5, delay, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
902          s1.sn.request(64);
903 <        assertTrue(p.offer(7, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
903 >        assertTrue(p.offer(6, delay, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
904 >        assertTrue(millisElapsedSince(startTime) >= delay);
905          s2.sn.request(64);
906          p.close();
907          s2.awaitComplete();
# Line 917 | Line 914 | public class SubmissionPublisherTest ext
914       */
915      public void testRecoveredHandledDroppedTimedOffer() {
916          AtomicInteger calls = new AtomicInteger();
917 <        SubmissionPublisher<Integer> p = new SubmissionPublisher<Integer>(
918 <            basicExecutor, 4);
917 >        SubmissionPublisher<Integer> p
918 >            = new SubmissionPublisher<>(basicExecutor, 4);
919          TestSubscriber s1 = new TestSubscriber();
920          s1.request = false;
921          TestSubscriber s2 = new TestSubscriber();
# Line 928 | Line 925 | public class SubmissionPublisherTest ext
925          s2.awaitSubscribe();
926          s1.awaitSubscribe();
927          int n = 0;
928 <        for (int i = 1; i <= 8; ++i) {
929 <            int d = p.offer(i, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> reqHandle(calls, s));
928 >        long delay = timeoutMillis();
929 >        long startTime = System.nanoTime();
930 >        for (int i = 1; i <= 6; ++i) {
931 >            int d = p.offer(i, delay, MILLISECONDS, (s, x) -> reqHandle(calls, s));
932              n = n + 2 + (d < 0 ? d : 0);
933          }
934 +        assertTrue(millisElapsedSince(startTime) >= delay);
935          p.close();
936          s2.awaitComplete();
937          s1.awaitComplete();
# Line 939 | Line 939 | public class SubmissionPublisherTest ext
939          assertTrue(calls.get() >= 2);
940      }
941  
942 +    /**
943 +     * consume returns a CompletableFuture that is done when
944 +     * publisher completes
945 +     */
946 +    public void testConsume() {
947 +        AtomicInteger sum = new AtomicInteger();
948 +        SubmissionPublisher<Integer> p = basicPublisher();
949 +        CompletableFuture<Void> f =
950 +            p.consume((Integer x) -> sum.getAndAdd(x.intValue()));
951 +        int n = 20;
952 +        for (int i = 1; i <= n; ++i)
953 +            p.submit(i);
954 +        p.close();
955 +        f.join();
956 +        assertEquals((n * (n + 1)) / 2, sum.get());
957 +    }
958 +
959 +    /**
960 +     * consume(null) throws NPE
961 +     */
962 +    public void testConsumeNPE() {
963 +        SubmissionPublisher<Integer> p = basicPublisher();
964 +        try {
965 +            CompletableFuture<Void> f = p.consume(null);
966 +            shouldThrow();
967 +        } catch (NullPointerException success) {}
968 +    }
969 +
970 +    /**
971 +     * consume eventually stops processing published items if cancelled
972 +     */
973 +    public void testCancelledConsume() {
974 +        AtomicInteger count = new AtomicInteger();
975 +        SubmissionPublisher<Integer> p = basicPublisher();
976 +        CompletableFuture<Void> f = p.consume(x -> count.getAndIncrement());
977 +        f.cancel(true);
978 +        int n = 1000000; // arbitrary limit
979 +        for (int i = 1; i <= n; ++i)
980 +            p.submit(i);
981 +        assertTrue(count.get() < n);
982 +    }
983 +
984   }

Diff Legend

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