--- jsr166/src/test/tck/SubmissionPublisherTest.java	2015/09/07 20:53:10	1.6
+++ jsr166/src/test/tck/SubmissionPublisherTest.java	2015/09/08 19:44:10	1.9
@@ -47,7 +47,7 @@ public class SubmissionPublisherTest ext
     }
 
     static final Executor basicExecutor =
-        (ForkJoinPool.getCommonPoolParallelism() > 0) ?
+        (ForkJoinPool.getCommonPoolParallelism() > 1) ?
         ForkJoinPool.commonPool() :
         new ThreadPoolExecutor(1, 1, 60, SECONDS,
                                new LinkedBlockingQueue<Runnable>(),
@@ -285,6 +285,7 @@ public class SubmissionPublisherTest ext
         assertEquals(0, s2.nexts);
         assertEquals(0, s2.errors);
         assertEquals(0, s2.completes);
+        p.close();
     }
 
     /**
@@ -360,7 +361,7 @@ public class SubmissionPublisherTest ext
     }
 
     /**
-     * subscribe(null) thows NPE
+     * subscribe(null) throws NPE
      */
     public void testSubscribe6() {
         SubmissionPublisher<Integer> p = basicPublisher();
@@ -455,7 +456,7 @@ public class SubmissionPublisherTest ext
     }
 
     /**
-     * If a handler is supplied in conctructor, it is invoked when
+     * If a handler is supplied in constructor, it is invoked when
      * subscriber throws an exception in onNext
      */
     public void testThrowOnNextHandler() {
@@ -806,7 +807,9 @@ public class SubmissionPublisherTest ext
      */
     public void testEmptyTimedOffer() {
         SubmissionPublisher<Integer> p = basicPublisher();
+        long startTime = System.nanoTime();
         assertEquals(0, p.offer(1, LONG_DELAY_MS, MILLISECONDS, null));
+        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
     }
 
     /**
@@ -814,14 +817,16 @@ public class SubmissionPublisherTest ext
      */
     public void testNullTimedOffer() {
         SubmissionPublisher<Integer> p = basicPublisher();
+        long startTime = System.nanoTime();
         try {
-            p.offer(null, SHORT_DELAY_MS, MILLISECONDS, null);
+            p.offer(null, LONG_DELAY_MS, MILLISECONDS, null);
             shouldThrow();
         } catch (NullPointerException success) {}
         try {
-            p.offer(1, SHORT_DELAY_MS, null, null);
+            p.offer(1, LONG_DELAY_MS, null, null);
             shouldThrow();
         } catch (NullPointerException success) {}
+        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
     }
 
     /**
@@ -837,17 +842,19 @@ public class SubmissionPublisherTest ext
         p.subscribe(s2);
         s2.awaitSubscribe();
         s1.awaitSubscribe();
-        assertTrue(p.offer(1, SHORT_DELAY_MS, MILLISECONDS, null) >= 1);
-        assertTrue(p.offer(2, SHORT_DELAY_MS, MILLISECONDS, null) >= 2);
+        long startTime = System.nanoTime();
+        assertTrue(p.offer(1, LONG_DELAY_MS, MILLISECONDS, null) >= 1);
+        assertTrue(p.offer(2, LONG_DELAY_MS, MILLISECONDS, null) >= 2);
         s1.sn.request(4);
-        assertTrue(p.offer(3, SHORT_DELAY_MS, MILLISECONDS, null) >= 3);
+        assertTrue(p.offer(3, LONG_DELAY_MS, MILLISECONDS, null) >= 3);
         s2.sn.request(4);
-        p.offer(4, SHORT_DELAY_MS, MILLISECONDS, null);
+        p.offer(4, LONG_DELAY_MS, MILLISECONDS, null);
         p.close();
         s2.awaitComplete();
         assertEquals(4, s2.nexts);
         s1.awaitComplete();
         assertEquals(4, s2.nexts);
+        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
     }
 
     /**
@@ -864,12 +871,15 @@ public class SubmissionPublisherTest ext
         p.subscribe(s2);
         s2.awaitSubscribe();
         s1.awaitSubscribe();
+        long delay = timeoutMillis();
         for (int i = 1; i <= 4; ++i)
-            assertTrue(p.offer(i, SHORT_DELAY_MS, MILLISECONDS, null) >= 0);
-        p.offer(5, SHORT_DELAY_MS, MILLISECONDS, null);
-        assertTrue(p.offer(6, SHORT_DELAY_MS, MILLISECONDS, null) < 0);
+            assertTrue(p.offer(i, delay, MILLISECONDS, null) >= 0);
+        long startTime = System.nanoTime();
+        assertTrue(p.offer(5, delay, MILLISECONDS, null) < 0);
         s1.sn.request(64);
-        assertTrue(p.offer(7, SHORT_DELAY_MS, MILLISECONDS, null) < 0);
+        assertTrue(p.offer(6, delay, MILLISECONDS, null) < 0);
+        // 2 * delay should elapse but check only 1 * delay to allow timer slop
+        assertTrue(millisElapsedSince(startTime) >= delay);
         s2.sn.request(64);
         p.close();
         s2.awaitComplete();
@@ -893,12 +903,14 @@ public class SubmissionPublisherTest ext
         p.subscribe(s2);
         s2.awaitSubscribe();
         s1.awaitSubscribe();
+        long delay = timeoutMillis();
         for (int i = 1; i <= 4; ++i)
-            assertTrue(p.offer(i, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> noopHandle(calls)) >= 0);
-        p.offer(5, (s, x) -> noopHandle(calls));
-        assertTrue(p.offer(6, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
+            assertTrue(p.offer(i, delay, MILLISECONDS, (s, x) -> noopHandle(calls)) >= 0);
+        long startTime = System.nanoTime();
+        assertTrue(p.offer(5, delay, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
         s1.sn.request(64);
-        assertTrue(p.offer(7, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
+        assertTrue(p.offer(6, delay, MILLISECONDS, (s, x) -> noopHandle(calls)) < 0);
+        assertTrue(millisElapsedSince(startTime) >= delay);
         s2.sn.request(64);
         p.close();
         s2.awaitComplete();
@@ -922,10 +934,13 @@ public class SubmissionPublisherTest ext
         s2.awaitSubscribe();
         s1.awaitSubscribe();
         int n = 0;
-        for (int i = 1; i <= 8; ++i) {
-            int d = p.offer(i, SHORT_DELAY_MS, MILLISECONDS, (s, x) -> reqHandle(calls, s));
+        long delay = timeoutMillis();
+        long startTime = System.nanoTime();
+        for (int i = 1; i <= 6; ++i) {
+            int d = p.offer(i, delay, MILLISECONDS, (s, x) -> reqHandle(calls, s));
             n = n + 2 + (d < 0 ? d : 0);
         }
+        assertTrue(millisElapsedSince(startTime) >= delay);
         p.close();
         s2.awaitComplete();
         s1.awaitComplete();