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.4 by jsr166, Mon Sep 7 20:33:41 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 153 | Line 129 | public class SubmissionPublisherTest ext
129       */
130      void checkInitialState(SubmissionPublisher<?> p) {
131          assertFalse(p.hasSubscribers());
132 <        assertEquals(p.getNumberOfSubscribers(), 0);
132 >        assertEquals(0, p.getNumberOfSubscribers());
133          assertTrue(p.getSubscribers().isEmpty());
134          assertFalse(p.isClosed());
135          assertNull(p.getClosedException());
136          int n = p.getMaxBufferCapacity();
137          assertTrue((n & (n - 1)) == 0); // power of two
138          assertNotNull(p.getExecutor());
139 <        assertEquals(p.estimateMinimumDemand(), 0);
140 <        assertEquals(p.estimateMaximumLag(), 0);
139 >        assertEquals(0, p.estimateMinimumDemand());
140 >        assertEquals(0, p.estimateMaximumLag());
141      }
142  
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(p.getMaxBufferCapacity(), 8);
168 >        assertEquals(8, p.getMaxBufferCapacity());
169      }
170  
171      /**
# Line 264 | Line 244 | public class SubmissionPublisherTest ext
244          SubmissionPublisher<Integer> p = basicPublisher();
245          p.subscribe(s);
246          assertTrue(p.hasSubscribers());
247 <        assertEquals(p.getNumberOfSubscribers(), 1);
247 >        assertEquals(1, p.getNumberOfSubscribers());
248          assertTrue(p.getSubscribers().contains(s));
249          assertTrue(p.isSubscribed(s));
250          s.awaitSubscribe();
251          assertNotNull(s.sn);
252 <        assertEquals(s.nexts, 0);
253 <        assertEquals(s.errors, 0);
254 <        assertEquals(s.completes, 0);
252 >        assertEquals(0, s.nexts);
253 >        assertEquals(0, s.errors);
254 >        assertEquals(0, s.completes);
255          TestSubscriber s2 = new TestSubscriber();
256          p.subscribe(s2);
257          assertTrue(p.hasSubscribers());
258 <        assertEquals(p.getNumberOfSubscribers(), 2);
258 >        assertEquals(2, p.getNumberOfSubscribers());
259          assertTrue(p.getSubscribers().contains(s));
260          assertTrue(p.getSubscribers().contains(s2));
261          assertTrue(p.isSubscribed(s));
262          assertTrue(p.isSubscribed(s2));
263          s2.awaitSubscribe();
264          assertNotNull(s2.sn);
265 <        assertEquals(s2.nexts, 0);
266 <        assertEquals(s2.errors, 0);
267 <        assertEquals(s2.completes, 0);
265 >        assertEquals(0, s2.nexts);
266 >        assertEquals(0, s2.errors);
267 >        assertEquals(0, s2.completes);
268 >        p.close();
269      }
270  
271      /**
# Line 297 | Line 278 | public class SubmissionPublisherTest ext
278          p.close();
279          p.subscribe(s);
280          s.awaitComplete();
281 <        assertEquals(s.nexts, 0);
282 <        assertEquals(s.errors, 0);
283 <        assertEquals(s.completes, 1);
281 >        assertEquals(0, s.nexts);
282 >        assertEquals(0, s.errors);
283 >        assertEquals(1, s.completes, 1);
284      }
285  
286      /**
# Line 315 | Line 296 | public class SubmissionPublisherTest ext
296          assertSame(p.getClosedException(), ex);
297          p.subscribe(s);
298          s.awaitError();
299 <        assertEquals(s.nexts, 0);
300 <        assertEquals(s.errors, 1);
299 >        assertEquals(0, s.nexts);
300 >        assertEquals(1, s.errors);
301      }
302  
303      /**
# Line 328 | Line 309 | public class SubmissionPublisherTest ext
309          SubmissionPublisher<Integer> p = basicPublisher();
310          p.subscribe(s);
311          assertTrue(p.hasSubscribers());
312 <        assertEquals(p.getNumberOfSubscribers(), 1);
312 >        assertEquals(1, p.getNumberOfSubscribers());
313          assertTrue(p.getSubscribers().contains(s));
314          assertTrue(p.isSubscribed(s));
315          s.awaitSubscribe();
316          assertNotNull(s.sn);
317 <        assertEquals(s.nexts, 0);
318 <        assertEquals(s.errors, 0);
319 <        assertEquals(s.completes, 0);
317 >        assertEquals(0, s.nexts);
318 >        assertEquals(0, s.errors);
319 >        assertEquals(0, s.completes);
320          p.subscribe(s);
321          s.awaitError();
322 <        assertEquals(s.nexts, 0);
323 <        assertEquals(s.errors, 1);
322 >        assertEquals(0, s.nexts);
323 >        assertEquals(1, s.errors);
324          assertFalse(p.isSubscribed(s));
325      }
326  
# Line 354 | Line 335 | public class SubmissionPublisherTest ext
335              p.subscribe(s);
336          } catch (Exception ok) {}
337          s.awaitError();
338 <        assertEquals(s.nexts, 0);
339 <        assertEquals(s.errors, 1);
340 <        assertEquals(s.completes, 0);
338 >        assertEquals(0, s.nexts);
339 >        assertEquals(1, s.errors);
340 >        assertEquals(0, s.completes);
341      }
342  
343      /**
344 <     * subscribe(null) thows NPE
344 >     * subscribe(null) throws NPE
345       */
346      public void testSubscribe6() {
347          SubmissionPublisher<Integer> p = basicPublisher();
# Line 385 | Line 366 | public class SubmissionPublisherTest ext
366          assertTrue(p.isClosed());
367          assertNull(p.getClosedException());
368          s1.awaitComplete();
369 <        assertEquals(s1.nexts, 1);
370 <        assertEquals(s1.completes, 1);
369 >        assertEquals(1, s1.nexts);
370 >        assertEquals(1, s1.completes);
371          s2.awaitComplete();
372 <        assertEquals(s2.nexts, 1);
373 <        assertEquals(s2.completes, 1);
372 >        assertEquals(1, s2.nexts);
373 >        assertEquals(1, s2.completes);
374      }
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(s1.errors, 1);
392 >        assertEquals(1, s1.errors);
393 >        s2.awaitSubscribe();
394          s2.awaitError();
395          assertTrue(s2.nexts <= 1);
396 <        assertEquals(s2.errors, 1);
396 >        assertEquals(1, s2.errors);
397      }
398  
399      /**
# Line 428 | Line 412 | public class SubmissionPublisherTest ext
412              p.submit(i);
413          p.close();
414          s2.awaitComplete();
415 <        assertEquals(s2.nexts, 20);
416 <        assertEquals(s2.completes, 1);
415 >        assertEquals(20, s2.nexts);
416 >        assertEquals(1, s2.completes);
417          assertTrue(s1.nexts < 20);
418          assertFalse(p.isSubscribed(s1));
419      }
# Line 449 | Line 433 | public class SubmissionPublisherTest ext
433          p.submit(2);
434          p.close();
435          s2.awaitComplete();
436 <        assertEquals(s2.nexts, 2);
436 >        assertEquals(2, s2.nexts);
437          s1.awaitComplete();
438 <        assertEquals(s1.errors, 1);
438 >        assertEquals(1, s1.errors);
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 473 | Line 456 | public class SubmissionPublisherTest ext
456          p.submit(2);
457          p.close();
458          s2.awaitComplete();
459 <        assertEquals(s2.nexts, 2);
460 <        assertEquals(s2.completes, 1);
459 >        assertEquals(2, s2.nexts);
460 >        assertEquals(1, s2.completes);
461          s1.awaitError();
462 <        assertEquals(s1.errors, 1);
463 <        assertEquals(calls.get(), 1);
462 >        assertEquals(1, s1.errors);
463 >        assertEquals(1, calls.get());
464      }
465  
466      /**
# Line 494 | Line 477 | public class SubmissionPublisherTest ext
477          p.close();
478          s2.awaitComplete();
479          s1.awaitComplete();
480 <        assertEquals(s2.nexts, 20);
481 <        assertEquals(s2.completes, 1);
482 <        assertEquals(s1.nexts, 20);
483 <        assertEquals(s1.completes, 1);
480 >        assertEquals(20, s2.nexts);
481 >        assertEquals(1, s2.completes);
482 >        assertEquals(20, s1.nexts);
483 >        assertEquals(1, s1.completes);
484      }
485  
486      /**
# Line 515 | Line 498 | public class SubmissionPublisherTest ext
498          p.submit(1);
499          p.submit(2);
500          s2.awaitNext(1);
501 <        assertEquals(s1.nexts, 0);
501 >        assertEquals(0, s1.nexts);
502          s1.sn.request(3);
503          p.submit(3);
504          p.close();
505          s2.awaitComplete();
506 <        assertEquals(s2.nexts, 3);
507 <        assertEquals(s2.completes, 1);
506 >        assertEquals(3, s2.nexts);
507 >        assertEquals(1, s2.completes);
508          s1.awaitComplete();
509          assertTrue(s1.nexts > 0);
510 <        assertEquals(s1.completes, 1);
510 >        assertEquals(1, s1.completes);
511      }
512  
513      /**
# Line 543 | Line 526 | public class SubmissionPublisherTest ext
526          p.submit(2);
527          p.close();
528          s2.awaitComplete();
529 <        assertEquals(s2.nexts, 2);
530 <        assertEquals(s2.completes, 1);
529 >        assertEquals(2, s2.nexts);
530 >        assertEquals(1, s2.completes);
531          s1.awaitNext(1);
532 <        assertEquals(s1.nexts, 1);
532 >        assertEquals(1, s1.nexts);
533      }
534  
535      /**
# Line 565 | Line 548 | public class SubmissionPublisherTest ext
548          p.submit(2);
549          p.close();
550          s2.awaitComplete();
551 <        assertEquals(s2.nexts, 2);
552 <        assertEquals(s2.completes, 1);
551 >        assertEquals(2, s2.nexts);
552 >        assertEquals(1, s2.completes);
553          s1.awaitError();
554 <        assertEquals(s1.errors, 1);
554 >        assertEquals(1, s1.errors);
555          assertTrue(s1.lastError instanceof IllegalArgumentException);
556      }
557  
# Line 582 | Line 565 | public class SubmissionPublisherTest ext
565          s.request = false;
566          p.subscribe(s);
567          s.awaitSubscribe();
568 <        assertEquals(p.estimateMinimumDemand(), 0);
568 >        assertEquals(0, p.estimateMinimumDemand());
569          s.sn.request(1);
570 <        assertEquals(p.estimateMinimumDemand(), 1);
570 >        assertEquals(1, p.estimateMinimumDemand());
571          p.submit(1);
572          s.awaitNext(1);
573 <        assertEquals(p.estimateMinimumDemand(), 0);
573 >        assertEquals(0, p.estimateMinimumDemand());
574      }
575  
576      /**
# Line 595 | Line 578 | public class SubmissionPublisherTest ext
578       */
579      public void testEmptySubmit() {
580          SubmissionPublisher<Integer> p = basicPublisher();
581 <        assertEquals(p.submit(1), 0);
581 >        assertEquals(0, p.submit(1));
582      }
583  
584      /**
# Line 623 | Line 606 | public class SubmissionPublisherTest ext
606          p.subscribe(s2);
607          s2.awaitSubscribe();
608          s1.awaitSubscribe();
609 <        assertEquals(p.submit(1), 1);
609 >        assertEquals(1, p.submit(1));
610          assertTrue(p.estimateMaximumLag() >= 1);
611          assertTrue(p.submit(2) >= 2);
612          assertTrue(p.estimateMaximumLag() >= 2);
# Line 634 | Line 617 | public class SubmissionPublisherTest ext
617          p.submit(4);
618          p.close();
619          s2.awaitComplete();
620 <        assertEquals(s2.nexts, 4);
620 >        assertEquals(4, s2.nexts);
621          s1.awaitComplete();
622 <        assertEquals(s2.nexts, 4);
622 >        assertEquals(4, s2.nexts);
623      }
624  
625      /**
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 656 | Line 639 | public class SubmissionPublisherTest ext
639          p.close();
640          s2.awaitComplete();
641          s1.awaitComplete();
642 <        assertEquals(s2.nexts, 20);
643 <        assertEquals(s2.completes, 1);
644 <        assertEquals(s1.nexts, 20);
645 <        assertEquals(s1.completes, 1);
642 >        assertEquals(20, s2.nexts);
643 >        assertEquals(1, s2.completes);
644 >        assertEquals(20, s1.nexts);
645 >        assertEquals(1, s1.completes);
646      }
647  
648      static boolean noopHandle(AtomicInteger count) {
# Line 713 | Line 696 | public class SubmissionPublisherTest ext
696          p.offer(4, null);
697          p.close();
698          s2.awaitComplete();
699 <        assertEquals(s2.nexts, 4);
699 >        assertEquals(4, s2.nexts);
700          s1.awaitComplete();
701 <        assertEquals(s2.nexts, 4);
701 >        assertEquals(4, s2.nexts);
702      }
703  
704      /**
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 774 | Line 757 | public class SubmissionPublisherTest ext
757          assertTrue(calls.get() >= 4);
758      }
759  
777 –
760      /**
761       * offer succeeds if drop handler forces request
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 798 | Line 780 | public class SubmissionPublisherTest ext
780          p.close();
781          s2.awaitComplete();
782          s1.awaitComplete();
783 <        assertEquals(s1.nexts + s2.nexts, n);
783 >        assertEquals(n, s1.nexts + s2.nexts);
784          assertTrue(calls.get() >= 2);
785      }
786  
805 –
787      /**
788       * Timed offer to a publisher with no subscribers returns lag 0
789       */
790      public void testEmptyTimedOffer() {
791          SubmissionPublisher<Integer> p = basicPublisher();
792 +        long startTime = System.nanoTime();
793          assertEquals(0, p.offer(1, LONG_DELAY_MS, MILLISECONDS, null));
794 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
795      }
796  
797      /**
# Line 816 | Line 799 | public class SubmissionPublisherTest ext
799       */
800      public void testNullTimedOffer() {
801          SubmissionPublisher<Integer> p = basicPublisher();
802 +        long startTime = System.nanoTime();
803          try {
804 <            p.offer(null, SHORT_DELAY_MS, MILLISECONDS, null);
804 >            p.offer(null, LONG_DELAY_MS, MILLISECONDS, null);
805              shouldThrow();
806          } catch (NullPointerException success) {}
807          try {
808 <            p.offer(1, SHORT_DELAY_MS, null, null);
808 >            p.offer(1, LONG_DELAY_MS, null, null);
809              shouldThrow();
810          } catch (NullPointerException success) {}
811 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
812      }
813  
814      /**
# Line 839 | Line 824 | public class SubmissionPublisherTest ext
824          p.subscribe(s2);
825          s2.awaitSubscribe();
826          s1.awaitSubscribe();
827 <        assertTrue(p.offer(1, SHORT_DELAY_MS, MILLISECONDS, null) >= 1);
828 <        assertTrue(p.offer(2, SHORT_DELAY_MS, MILLISECONDS, null) >= 2);
827 >        long startTime = System.nanoTime();
828 >        assertTrue(p.offer(1, LONG_DELAY_MS, MILLISECONDS, null) >= 1);
829 >        assertTrue(p.offer(2, LONG_DELAY_MS, MILLISECONDS, null) >= 2);
830          s1.sn.request(4);
831 <        assertTrue(p.offer(3, SHORT_DELAY_MS, MILLISECONDS, null) >= 3);
831 >        assertTrue(p.offer(3, LONG_DELAY_MS, MILLISECONDS, null) >= 3);
832          s2.sn.request(4);
833 <        p.offer(4, SHORT_DELAY_MS, MILLISECONDS, null);
833 >        p.offer(4, LONG_DELAY_MS, MILLISECONDS, null);
834          p.close();
835          s2.awaitComplete();
836 <        assertEquals(s2.nexts, 4);
836 >        assertEquals(4, s2.nexts);
837          s1.awaitComplete();
838 <        assertEquals(s2.nexts, 4);
838 >        assertEquals(4, s2.nexts);
839 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
840      }
841  
842      /**
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 866 | 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 885 | 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 895 | 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 913 | 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 924 | 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();
929 <        assertEquals(s1.nexts + s2.nexts, n);
929 >        assertEquals(n, s1.nexts + s2.nexts);
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