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.55 by jsr166, Tue Oct 6 05:56:01 2015 UTC vs.
Revision 1.56 by jsr166, Tue Oct 6 16:39:06 2015 UTC

# Line 1218 | Line 1218 | public class ScheduledExecutorSubclassTe
1218       * timed invokeAll(c) cancels tasks not completed by timeout
1219       */
1220      public void testTimedInvokeAll6() throws Exception {
1221 <        final ExecutorService e = new CustomExecutor(2);
1222 <        try (PoolCleaner cleaner = cleaner(e)) {
1223 <            for (long timeout = timeoutMillis();;) {
1221 >        for (long timeout = timeoutMillis();;) {
1222 >            final CountDownLatch done = new CountDownLatch(1);
1223 >            final Callable<String> waiter = new CheckedCallable<String>() {
1224 >                public String realCall() {
1225 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1226 >                    catch (InterruptedException ok) {}
1227 >                    return "1"; }};
1228 >            final ExecutorService p = new CustomExecutor(2);
1229 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1230                  List<Callable<String>> tasks = new ArrayList<>();
1231                  tasks.add(new StringTask("0"));
1232 <                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1232 >                tasks.add(waiter);
1233                  tasks.add(new StringTask("2"));
1234                  long startTime = System.nanoTime();
1235                  List<Future<String>> futures =
1236 <                    e.invokeAll(tasks, timeout, MILLISECONDS);
1236 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1237                  assertEquals(tasks.size(), futures.size());
1238                  assertTrue(millisElapsedSince(startTime) >= timeout);
1239                  for (Future future : futures)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines