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.24 by jsr166, Mon Nov 27 01:19:51 2017 UTC vs.
Revision 1.31 by dl, Tue Jan 26 13:33:06 2021 UTC

# Line 334 | Line 334 | public class SubmissionPublisherTest ext
334          TestSubscriber s = new TestSubscriber();
335          SubmissionPublisher<Integer> p = basicPublisher();
336          s.throwOnCall = true;
337 <        try {
338 <            p.subscribe(s);
339 <        } catch (Exception ok) {}
337 >        p.subscribe(s);
338          s.awaitError();
339          assertEquals(0, s.nexts);
340          assertEquals(1, s.errors);
# Line 404 | Line 402 | public class SubmissionPublisherTest ext
402       */
403      public void testCancel() {
404          SubmissionPublisher<Integer> p =
405 <            new SubmissionPublisher<Integer>(basicExecutor, 4); // must be < 20
405 >            new SubmissionPublisher<>(basicExecutor, 4); // must be < 20
406          TestSubscriber s1 = new TestSubscriber();
407          TestSubscriber s2 = new TestSubscriber();
408          p.subscribe(s1);
# Line 657 | Line 655 | public class SubmissionPublisherTest ext
655          return false;
656      }
657  
658 <    static boolean reqHandle(AtomicInteger count, Subscriber s) {
658 >    static boolean reqHandle(AtomicInteger count, Subscriber<?> s) {
659          count.getAndIncrement();
660          ((TestSubscriber)s).sn.request(Long.MAX_VALUE);
661          return true;
# Line 960 | Line 958 | public class SubmissionPublisherTest ext
958      public void testConsumeNPE() {
959          SubmissionPublisher<Integer> p = basicPublisher();
960          try {
961 <            CompletableFuture<Void> f = p.consume(null);
961 >            CompletableFuture<Void> unused = p.consume(null);
962              shouldThrow();
963          } catch (NullPointerException success) {}
964      }
# Line 985 | Line 983 | public class SubmissionPublisherTest ext
983       * cvs update -D '2017-11-25' src/main/java/util/concurrent/SubmissionPublisher.java && ant -Djsr166.expensiveTests=true -Djsr166.tckTestClass=SubmissionPublisherTest -Djsr166.methodFilter=testMissedSignal tck; cvs update -A src/main/java/util/concurrent/SubmissionPublisher.java
984       */
985      public void testMissedSignal_8187947() throws Exception {
986 <        final int N = expensiveTests ? (1 << 20) : (1 << 10);
986 >        if (!atLeastJava9()) return; // backport to jdk8 too hard
987 >        final int N =
988 >            ((ForkJoinPool.getCommonPoolParallelism() < 2) // JDK-8212899
989 >             ? (1 << 5)
990 >             : (1 << 10))
991 >            * (expensiveTests ? (1 << 10) : 1);
992          final CountDownLatch finished = new CountDownLatch(1);
993          final SubmissionPublisher<Boolean> pub = new SubmissionPublisher<>();
994          class Sub implements Subscriber<Boolean> {
# Line 1003 | Line 1006 | public class SubmissionPublisherTest ext
1006              public void onComplete() {}
1007          }
1008          pub.subscribe(new Sub());
1009 <        CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE));
1009 >        checkTimedGet(
1010 >            CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE)),
1011 >            null);
1012          await(finished);
1013      }
1014   }

Diff Legend

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