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

Comparing jsr166/src/test/tck/ForkJoinPoolTest.java (file contents):
Revision 1.62 by jsr166, Sun Oct 4 07:42:07 2015 UTC vs.
Revision 1.69 by jsr166, Tue Oct 13 21:14:39 2015 UTC

# Line 64 | Line 64 | public class ForkJoinPoolTest extends JS
64          }
65      }
66  
67 +    static class MyError extends Error {}
68 +
69      // to test handlers
70      static class FailingFJWSubclass extends ForkJoinWorkerThread {
71          public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
72 <        protected void onStart() { super.onStart(); throw new Error(); }
72 >        protected void onStart() { super.onStart(); throw new MyError(); }
73      }
74  
75      static class FailingThreadFactory
# Line 211 | Line 213 | public class ForkJoinPoolTest extends JS
213       * getPoolSize returns number of started workers.
214       */
215      public void testGetPoolSize() {
216 <        ForkJoinPool p = new ForkJoinPool(1);
216 >        final CountDownLatch taskStarted = new CountDownLatch(1);
217 >        final CountDownLatch done = new CountDownLatch(1);
218 >        final ForkJoinPool p = new ForkJoinPool(1);
219          try (PoolCleaner cleaner = cleaner(p)) {
220              assertEquals(0, p.getActiveThreadCount());
221 <            Future<String> future = p.submit(new StringTask());
221 >            final Runnable task = new CheckedRunnable() {
222 >                public void realRun() throws InterruptedException {
223 >                    taskStarted.countDown();
224 >                    assertEquals(1, p.getPoolSize());
225 >                    assertEquals(1, p.getActiveThreadCount());
226 >                    done.await();
227 >                }};
228 >            Future<?> future = p.submit(task);
229 >            await(taskStarted);
230              assertEquals(1, p.getPoolSize());
231 +            assertEquals(1, p.getActiveThreadCount());
232 +            done.countDown();
233          }
234 +        assertEquals(0, p.getPoolSize());
235 +        assertEquals(0, p.getActiveThreadCount());
236      }
237  
238      /**
# Line 256 | Line 272 | public class ForkJoinPoolTest extends JS
272       */
273      public void testSetUncaughtExceptionHandler() throws InterruptedException {
274          final CountDownLatch uehInvoked = new CountDownLatch(1);
275 <        final Thread.UncaughtExceptionHandler eh =
275 >        final Thread.UncaughtExceptionHandler ueh =
276              new Thread.UncaughtExceptionHandler() {
277                  public void uncaughtException(Thread t, Throwable e) {
278 +                    threadAssertTrue(e instanceof MyError);
279 +                    threadAssertTrue(t instanceof FailingFJWSubclass);
280                      uehInvoked.countDown();
281                  }};
282          ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
283 <                                          eh, false);
284 <        try {
285 <            assertSame(eh, p.getUncaughtExceptionHandler());
283 >                                          ueh, false);
284 >        try (PoolCleaner cleaner = cleaner(p)) {
285 >            assertSame(ueh, p.getUncaughtExceptionHandler());
286              try {
287                  p.execute(new FibTask(8));
288 <                assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
289 <            } catch (RejectedExecutionException ok) {
288 >                await(uehInvoked);
289 >            } finally {
290 >                p.shutdownNow(); // failure might have prevented processing task
291              }
273 –        } finally {
274 –            p.shutdownNow(); // failure might have prevented processing task
275 –            joinPool(p);
292          }
293      }
294  
# Line 548 | Line 564 | public class ForkJoinPoolTest extends JS
564      public void testInterruptedSubmit() throws InterruptedException {
565          final CountDownLatch submitted    = new CountDownLatch(1);
566          final CountDownLatch quittingTime = new CountDownLatch(1);
551 –        final ExecutorService p = new ForkJoinPool(1);
567          final Callable<Void> awaiter = new CheckedCallable<Void>() {
568              public Void realCall() throws InterruptedException {
569 <                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
569 >                assertTrue(quittingTime.await(2*LONG_DELAY_MS, MILLISECONDS));
570                  return null;
571              }};
572 <        try {
572 >        final ExecutorService p = new ForkJoinPool(1);
573 >        try (PoolCleaner cleaner = cleaner(p, quittingTime)) {
574              Thread t = new Thread(new CheckedInterruptedRunnable() {
575                  public void realRun() throws Exception {
576                      Future<Void> future = p.submit(awaiter);
# Line 562 | Line 578 | public class ForkJoinPoolTest extends JS
578                      future.get();
579                  }});
580              t.start();
581 <            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
581 >            await(submitted);
582              t.interrupt();
583 <            t.join();
568 <        } finally {
569 <            quittingTime.countDown();
570 <            joinPool(p);
583 >            awaitTermination(t);
584          }
585      }
586  
# Line 822 | Line 835 | public class ForkJoinPoolTest extends JS
835      public void testTimedInvokeAny4() throws Throwable {
836          ExecutorService e = new ForkJoinPool(1);
837          try (PoolCleaner cleaner = cleaner(e)) {
838 +            long startTime = System.nanoTime();
839              List<Callable<String>> l = new ArrayList<Callable<String>>();
840              l.add(new NPETask());
841              try {
842 <                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
842 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
843                  shouldThrow();
844              } catch (ExecutionException success) {
845                  assertTrue(success.getCause() instanceof NullPointerException);
846              }
847 +            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
848          }
849      }
850  
# Line 839 | Line 854 | public class ForkJoinPoolTest extends JS
854      public void testTimedInvokeAny5() throws Throwable {
855          ExecutorService e = new ForkJoinPool(1);
856          try (PoolCleaner cleaner = cleaner(e)) {
857 +            long startTime = System.nanoTime();
858              List<Callable<String>> l = new ArrayList<Callable<String>>();
859              l.add(new StringTask());
860              l.add(new StringTask());
861 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
861 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
862              assertSame(TEST_STRING, result);
863 +            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
864          }
865      }
866  
# Line 913 | Line 930 | public class ForkJoinPoolTest extends JS
930              List<Callable<String>> l = new ArrayList<Callable<String>>();
931              l.add(new NPETask());
932              List<Future<String>> futures
933 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
933 >                = e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
934              assertEquals(1, futures.size());
935              try {
936                  futures.get(0).get();

Diff Legend

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