ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ScheduledExecutorSubclassTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ScheduledExecutorSubclassTest.java (file contents):
Revision 1.35 by jsr166, Sat Apr 25 04:55:31 2015 UTC vs.
Revision 1.37 by jsr166, Sun Sep 27 18:50:50 2015 UTC

# Line 10 | Line 10 | import java.util.ArrayList;
10   import java.util.List;
11   import java.util.concurrent.BlockingQueue;
12   import java.util.concurrent.Callable;
13 + import java.util.concurrent.CancellationException;
14   import java.util.concurrent.CountDownLatch;
15   import java.util.concurrent.Delayed;
16   import java.util.concurrent.ExecutionException;
# Line 704 | Line 705 | public class ScheduledExecutorSubclassTe
705      }
706  
707      /**
708 <     * shutdownNow returns a list containing tasks that were not run
708 >     * shutdownNow returns a list containing tasks that were not run,
709 >     * and those tasks are drained from the queue
710       */
711      public void testShutdownNow() {
712          CustomExecutor p = new CustomExecutor(1);
# Line 714 | Line 716 | public class ScheduledExecutorSubclassTe
716          try {
717              List<Runnable> l = p.shutdownNow();
718              assertTrue(p.isShutdown());
719 +            assertTrue(p.getQueue().isEmpty());
720              assertEquals(5, l.size());
721          } catch (SecurityException ok) {
722              // Allowed in case test doesn't have privs
# Line 1240 | Line 1243 | public class ScheduledExecutorSubclassTe
1243      public void testTimedInvokeAll6() throws Exception {
1244          ExecutorService e = new CustomExecutor(2);
1245          try {
1246 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1247 <            l.add(new StringTask());
1248 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1249 <            l.add(new StringTask());
1250 <            List<Future<String>> futures =
1251 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1252 <            assertEquals(l.size(), futures.size());
1253 <            for (Future future : futures)
1254 <                assertTrue(future.isDone());
1255 <            assertFalse(futures.get(0).isCancelled());
1256 <            assertTrue(futures.get(1).isCancelled());
1246 >            for (long timeout = timeoutMillis();;) {
1247 >                List<Callable<String>> tasks = new ArrayList<>();
1248 >                tasks.add(new StringTask("0"));
1249 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1250 >                tasks.add(new StringTask("2"));
1251 >                long startTime = System.nanoTime();
1252 >                List<Future<String>> futures =
1253 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1254 >                assertEquals(tasks.size(), futures.size());
1255 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1256 >                for (Future future : futures)
1257 >                    assertTrue(future.isDone());
1258 >                assertTrue(futures.get(1).isCancelled());
1259 >                try {
1260 >                    assertEquals("0", futures.get(0).get());
1261 >                    assertEquals("2", futures.get(2).get());
1262 >                    break;
1263 >                } catch (CancellationException retryWithLongerTimeout) {
1264 >                    timeout *= 2;
1265 >                    if (timeout >= LONG_DELAY_MS / 2)
1266 >                        fail("expected exactly one task to be cancelled");
1267 >                }
1268 >            }
1269          } finally {
1270              joinPool(e);
1271          }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines