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.26 by jsr166, Thu Sep 16 00:52:49 2010 UTC vs.
Revision 1.27 by jsr166, Fri Sep 17 01:04:10 2010 UTC

# Line 23 | Line 23 | import java.util.concurrent.ForkJoinWork
23   import java.util.concurrent.RecursiveTask;
24   import java.util.concurrent.TimeUnit;
25   import java.util.concurrent.locks.ReentrantLock;
26 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
27   import java.security.AccessControlException;
28   import java.security.Policy;
29   import java.security.PrivilegedAction;
# Line 232 | Line 233 | public class ForkJoinPoolTest extends JS
233       * performs its defined action
234       */
235      public void testSetUncaughtExceptionHandler() throws InterruptedException {
236 <        MyHandler eh = new MyHandler();
236 >        final CountDownLatch uncaughtExceptionHappened = new CountDownLatch(1);
237 >        final Thread.UncaughtExceptionHandler eh =
238 >            new Thread.UncaughtExceptionHandler() {
239 >                public void uncaughtException(Thread t, Throwable e) {
240 >                    uncaughtExceptionHappened.countDown();
241 >                }};
242          ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
243                                            eh, false);
244          try {
245              assertSame(eh, p.getUncaughtExceptionHandler());
246              p.execute(new FailingTask());
247 <            Thread.sleep(MEDIUM_DELAY_MS);
242 <            assertTrue(eh.catches > 0);
247 >            uncaughtExceptionHappened.await();
248          } finally {
249 <            p.shutdownNow();
249 >            //p.shutdownNow();
250              joinPool(p);
251          }
252      }
# Line 553 | Line 558 | public class ForkJoinPoolTest extends JS
558  
559  
560      /**
561 <     * Blocking on submit(callable) throws InterruptedException if
557 <     * caller interrupted.
561 >     * submit(callable).get() throws InterruptedException if interrupted
562       */
563      public void testInterruptedSubmit() throws InterruptedException {
564 <        final ForkJoinPool p = new ForkJoinPool(1);
565 <
566 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
567 <            public void realRun() throws Throwable {
568 <                p.submit(new CheckedCallable<Object>() {
569 <                    public Object realCall() throws Throwable {
570 <                        try {
571 <                            Thread.sleep(MEDIUM_DELAY_MS);
572 <                        } catch (InterruptedException ok) {
573 <                        }
574 <                        return null;
575 <                    }}).get();
576 <            }});
577 <
578 <        t.start();
579 <        Thread.sleep(SHORT_DELAY_MS);
580 <        t.interrupt();
581 <        t.join();
582 <        p.shutdownNow();
583 <        joinPool(p);
564 >        final CountDownLatch submitted    = new CountDownLatch(1);
565 >        final CountDownLatch quittingTime = new CountDownLatch(1);
566 >        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));
570 >                return null;
571 >            }};
572 >        try {
573 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
574 >                public void realRun() throws Exception {
575 >                    Future<Void> future = p.submit(awaiter);
576 >                    submitted.countDown();
577 >                    future.get();
578 >                }});
579 >            t.start();
580 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
581 >            t.interrupt();
582 >            t.join();
583 >        } finally {
584 >            quittingTime.countDown();
585 >            joinPool(p);
586 >        }
587      }
588  
589      /**
# Line 785 | Line 792 | public class ForkJoinPoolTest extends JS
792      public void testTimedInvokeAny1() throws Throwable {
793          ExecutorService e = new ForkJoinPool(1);
794          try {
795 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
795 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
796              shouldThrow();
797          } catch (NullPointerException success) {
798          } finally {
# Line 816 | Line 823 | public class ForkJoinPoolTest extends JS
823          ExecutorService e = new ForkJoinPool(1);
824          try {
825              e.invokeAny(new ArrayList<Callable<String>>(),
826 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
826 >                        MEDIUM_DELAY_MS, MILLISECONDS);
827              shouldThrow();
828          } catch (IllegalArgumentException success) {
829          } finally {
# Line 834 | Line 841 | public class ForkJoinPoolTest extends JS
841          l.add(latchAwaitingStringTask(latch));
842          l.add(null);
843          try {
844 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
844 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
845              shouldThrow();
846          } catch (NullPointerException success) {
847          } finally {
# Line 851 | Line 858 | public class ForkJoinPoolTest extends JS
858          List<Callable<String>> l = new ArrayList<Callable<String>>();
859          l.add(new NPETask());
860          try {
861 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
861 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
862              shouldThrow();
863          } catch (ExecutionException success) {
864              assertTrue(success.getCause() instanceof NullPointerException);
# Line 869 | Line 876 | public class ForkJoinPoolTest extends JS
876              List<Callable<String>> l = new ArrayList<Callable<String>>();
877              l.add(new StringTask());
878              l.add(new StringTask());
879 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
879 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
880              assertSame(TEST_STRING, result);
881          } finally {
882              joinPool(e);
# Line 882 | Line 889 | public class ForkJoinPoolTest extends JS
889      public void testTimedInvokeAll1() throws Throwable {
890          ExecutorService e = new ForkJoinPool(1);
891          try {
892 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
892 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
893              shouldThrow();
894          } catch (NullPointerException success) {
895          } finally {
# Line 914 | Line 921 | public class ForkJoinPoolTest extends JS
921          try {
922              List<Future<String>> r
923                  = e.invokeAll(new ArrayList<Callable<String>>(),
924 <                              MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
924 >                              MEDIUM_DELAY_MS, MILLISECONDS);
925              assertTrue(r.isEmpty());
926          } finally {
927              joinPool(e);
# Line 930 | Line 937 | public class ForkJoinPoolTest extends JS
937          l.add(new StringTask());
938          l.add(null);
939          try {
940 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
940 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
941              shouldThrow();
942          } catch (NullPointerException success) {
943          } finally {
# Line 946 | Line 953 | public class ForkJoinPoolTest extends JS
953          List<Callable<String>> l = new ArrayList<Callable<String>>();
954          l.add(new NPETask());
955          List<Future<String>> futures
956 <            = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
956 >            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
957          assertEquals(1, futures.size());
958          try {
959              futures.get(0).get();
# Line 968 | Line 975 | public class ForkJoinPoolTest extends JS
975              l.add(new StringTask());
976              l.add(new StringTask());
977              List<Future<String>> futures
978 <                = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
978 >                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
979              assertEquals(2, futures.size());
980              for (Future<String> future : futures)
981                  assertSame(TEST_STRING, future.get());

Diff Legend

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