--- jsr166/src/test/tck/ScheduledExecutorTest.java	2017/03/20 00:34:27	1.84
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2017/03/25 21:41:10	1.86
@@ -50,7 +50,7 @@ public class ScheduledExecutorTest exten
             final Runnable task = new CheckedRunnable() {
                 public void realRun() { done.countDown(); }};
             p.execute(task);
-            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
+            await(done);
         }
     }
 
@@ -362,13 +362,13 @@ public class ScheduledExecutorTest exten
                 public void realRun() throws InterruptedException {
                     threadStarted.countDown();
                     assertEquals(0, p.getCompletedTaskCount());
-                    threadProceed.await();
+                    await(threadProceed);
                     threadDone.countDown();
                 }});
             await(threadStarted);
             assertEquals(0, p.getCompletedTaskCount());
             threadProceed.countDown();
-            threadDone.await();
+            await(threadDone);
             long startTime = System.nanoTime();
             while (p.getCompletedTaskCount() != 1) {
                 if (millisElapsedSince(startTime) > LONG_DELAY_MS)
@@ -507,6 +507,17 @@ public class ScheduledExecutorTest exten
     }
 
     /**
+     * The default rejected execution handler is AbortPolicy.
+     */
+    public void testDefaultRejectedExecutionHandler() {
+        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            assertTrue(p.getRejectedExecutionHandler()
+                       instanceof ThreadPoolExecutor.AbortPolicy);
+        }
+    }
+
+    /**
      * isShutdown is false before shutdown, true after
      */
     public void testIsShutdown() {
@@ -762,7 +773,7 @@ public class ScheduledExecutorTest exten
         Runnable task = new CheckedRunnable() { public void realRun()
                                                     throws InterruptedException {
             poolBlocked.countDown();
-            assertTrue(unblock.await(LONG_DELAY_MS, MILLISECONDS));
+            await(unblock);
             ran.getAndIncrement();
         }};
         List<Future<?>> blockers = new ArrayList<>();
@@ -770,7 +781,7 @@ public class ScheduledExecutorTest exten
         List<Future<?>> delayeds = new ArrayList<>();
         for (int i = 0; i < poolSize; i++)
             blockers.add(p.submit(task));
-        assertTrue(poolBlocked.await(LONG_DELAY_MS, MILLISECONDS));
+        await(poolBlocked);
 
         periodics.add(p.scheduleAtFixedRate(countDowner(periodicLatch1),
                                             1, 1, MILLISECONDS));
@@ -806,8 +817,8 @@ public class ScheduledExecutorTest exten
             }
         }
         if (effectivePeriodicPolicy) {
-            assertTrue(periodicLatch1.await(LONG_DELAY_MS, MILLISECONDS));
-            assertTrue(periodicLatch2.await(LONG_DELAY_MS, MILLISECONDS));
+            await(periodicLatch1);
+            await(periodicLatch2);
             for (Future<?> periodic : periodics) {
                 assertTrue(periodic.cancel(false));
                 assertTrue(periodic.isCancelled());