--- jsr166/src/test/tck/SubmissionPublisherTest.java	2017/05/29 22:44:27	1.21
+++ jsr166/src/test/tck/SubmissionPublisherTest.java	2017/11/26 21:37:56	1.23
@@ -402,7 +402,8 @@ public class SubmissionPublisherTest ext
      * Cancelling a subscription eventually causes no more onNexts to be issued
      */
     public void testCancel() {
-        SubmissionPublisher<Integer> p = basicPublisher();
+        SubmissionPublisher<Integer> p =
+            new SubmissionPublisher<Integer>(basicExecutor, 4); // must be < 20
         TestSubscriber s1 = new TestSubscriber();
         TestSubscriber s2 = new TestSubscriber();
         p.subscribe(s1);
@@ -566,7 +567,7 @@ public class SubmissionPublisherTest ext
 
     /**
      * estimateMinimumDemand reports 0 until request, nonzero after
-     * request, and zero again after delivery
+     * request
      */
     public void testEstimateMinimumDemand() {
         TestSubscriber s = new TestSubscriber();
@@ -577,9 +578,6 @@ public class SubmissionPublisherTest ext
         assertEquals(0, p.estimateMinimumDemand());
         s.sn.request(1);
         assertEquals(1, p.estimateMinimumDemand());
-        p.submit(1);
-        s.awaitNext(1);
-        assertEquals(0, p.estimateMinimumDemand());
     }
 
     /**
@@ -642,7 +640,6 @@ public class SubmissionPublisherTest ext
         p.subscribe(s1);
         p.subscribe(s2);
         for (int i = 1; i <= 20; ++i) {
-            assertTrue(p.estimateMinimumDemand() <= 1);
             assertTrue(p.submit(i) >= 0);
         }
         p.close();