--- jsr166/src/test/tck/SubmissionPublisherTest.java 2017/12/11 00:16:40 1.25 +++ jsr166/src/test/tck/SubmissionPublisherTest.java 2018/07/22 21:49:33 1.28 @@ -334,9 +334,7 @@ public class SubmissionPublisherTest ext TestSubscriber s = new TestSubscriber(); SubmissionPublisher p = basicPublisher(); s.throwOnCall = true; - try { - p.subscribe(s); - } catch (Exception ok) {} + p.subscribe(s); s.awaitError(); assertEquals(0, s.nexts); assertEquals(1, s.errors); @@ -404,7 +402,7 @@ public class SubmissionPublisherTest ext */ public void testCancel() { SubmissionPublisher p = - new SubmissionPublisher(basicExecutor, 4); // must be < 20 + new SubmissionPublisher<>(basicExecutor, 4); // must be < 20 TestSubscriber s1 = new TestSubscriber(); TestSubscriber s2 = new TestSubscriber(); p.subscribe(s1); @@ -1004,7 +1002,9 @@ public class SubmissionPublisherTest ext public void onComplete() {} } pub.subscribe(new Sub()); - CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE)); + checkTimedGet( + CompletableFuture.runAsync(() -> pub.submit(Boolean.TRUE)), + null); await(finished); } }