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.36 by jsr166, Mon Sep 14 03:27:11 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 1240 | Line 1241 | public class ScheduledExecutorSubclassTe
1241      public void testTimedInvokeAll6() throws Exception {
1242          ExecutorService e = new CustomExecutor(2);
1243          try {
1244 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
1245 <            l.add(new StringTask());
1246 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1247 <            l.add(new StringTask());
1248 <            List<Future<String>> futures =
1249 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1250 <            assertEquals(l.size(), futures.size());
1251 <            for (Future future : futures)
1252 <                assertTrue(future.isDone());
1253 <            assertFalse(futures.get(0).isCancelled());
1254 <            assertTrue(futures.get(1).isCancelled());
1244 >            for (long timeout = timeoutMillis();;) {
1245 >                List<Callable<String>> tasks = new ArrayList<>();
1246 >                tasks.add(new StringTask("0"));
1247 >                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1248 >                tasks.add(new StringTask("2"));
1249 >                long startTime = System.nanoTime();
1250 >                List<Future<String>> futures =
1251 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
1252 >                assertEquals(tasks.size(), futures.size());
1253 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1254 >                for (Future future : futures)
1255 >                    assertTrue(future.isDone());
1256 >                assertTrue(futures.get(1).isCancelled());
1257 >                try {
1258 >                    assertEquals("0", futures.get(0).get());
1259 >                    assertEquals("2", futures.get(2).get());
1260 >                    break;
1261 >                } catch (CancellationException retryWithLongerTimeout) {
1262 >                    timeout *= 2;
1263 >                    if (timeout >= LONG_DELAY_MS / 2)
1264 >                        fail("expected exactly one task to be cancelled");
1265 >                }
1266 >            }
1267          } finally {
1268              joinPool(e);
1269          }

Diff Legend

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