--- jsr166/src/test/tck/ScheduledExecutorSubclassTest.java 2015/09/14 03:27:11 1.36 +++ jsr166/src/test/tck/ScheduledExecutorSubclassTest.java 2015/09/27 18:50:50 1.37 @@ -705,7 +705,8 @@ public class ScheduledExecutorSubclassTe } /** - * shutdownNow returns a list containing tasks that were not run + * shutdownNow returns a list containing tasks that were not run, + * and those tasks are drained from the queue */ public void testShutdownNow() { CustomExecutor p = new CustomExecutor(1); @@ -715,6 +716,7 @@ public class ScheduledExecutorSubclassTe try { List l = p.shutdownNow(); assertTrue(p.isShutdown()); + assertTrue(p.getQueue().isEmpty()); assertEquals(5, l.size()); } catch (SecurityException ok) { // Allowed in case test doesn't have privs