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.25 by jsr166, Mon Sep 13 20:48:58 2010 UTC vs.
Revision 1.35 by dl, Fri Nov 19 00:20:47 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 161 | Line 162 | public class ForkJoinPoolTest extends JS
162      public void testDefaultInitialState() {
163          ForkJoinPool p = new ForkJoinPool(1);
164          try {
165 <            assertTrue(p.getFactory() ==
166 <                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
165 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
166 >                       p.getFactory());
167              assertTrue(p.isQuiescent());
168              assertFalse(p.getAsyncMode());
169 <            assertTrue(p.getActiveThreadCount() == 0);
170 <            assertTrue(p.getStealCount() == 0);
171 <            assertTrue(p.getQueuedTaskCount() == 0);
172 <            assertTrue(p.getQueuedSubmissionCount() == 0);
169 >            assertEquals(0, p.getActiveThreadCount());
170 >            assertEquals(0, p.getStealCount());
171 >            assertEquals(0, p.getQueuedTaskCount());
172 >            assertEquals(0, p.getQueuedSubmissionCount());
173              assertFalse(p.hasQueuedSubmissions());
174              assertFalse(p.isShutdown());
175              assertFalse(p.isTerminating());
# Line 205 | Line 206 | public class ForkJoinPoolTest extends JS
206      public void testGetParallelism() {
207          ForkJoinPool p = new ForkJoinPool(1);
208          try {
209 <            assertTrue(p.getParallelism() == 1);
209 >            assertEquals(1, p.getParallelism());
210          } finally {
211              joinPool(p);
212          }
# Line 217 | Line 218 | public class ForkJoinPoolTest extends JS
218      public void testGetPoolSize() {
219          ForkJoinPool p = new ForkJoinPool(1);
220          try {
221 <            assertTrue(p.getActiveThreadCount() == 0);
221 >            assertEquals(0, p.getActiveThreadCount());
222              Future<String> future = p.submit(new StringTask());
223 <            assertTrue(p.getPoolSize() == 1);
223 >            assertEquals(1, p.getPoolSize());
224          } finally {
225              joinPool(p);
226          }
# 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();
237 <        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(), eh, false);
238 <        try {
239 <            assert(eh == p.getUncaughtExceptionHandler());
240 <            p.execute(new FailingTask());
241 <            Thread.sleep(MEDIUM_DELAY_MS);
242 <            assertTrue(eh.catches > 0);
236 >        final CountDownLatch uehInvoked = new CountDownLatch(1);
237 >        final Thread.UncaughtExceptionHandler eh =
238 >            new Thread.UncaughtExceptionHandler() {
239 >                public void uncaughtException(Thread t, Throwable e) {
240 >                    uehInvoked.countDown();
241 >                }};
242 >        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
243 >                                          eh, false);
244 >        try {
245 >            assertSame(eh, p.getUncaughtExceptionHandler());
246 >            p.execute(new FibTask(8));
247 >            assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
248          } finally {
249 <            p.shutdownNow();
249 >            p.shutdownNow(); // failure might have prevented processing task
250              joinPool(p);
251          }
252      }
# Line 253 | Line 259 | public class ForkJoinPoolTest extends JS
259      public void testisQuiescent() throws InterruptedException {
260          ForkJoinPool p = new ForkJoinPool(2);
261          try {
262 +            assertTrue(p.isQuiescent());
263              p.invoke(new FibTask(20));
264 <            assertTrue(p.getFactory() ==
265 <                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
266 <            Thread.sleep(MEDIUM_DELAY_MS);
264 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
265 >                       p.getFactory());
266 >            Thread.sleep(SMALL_DELAY_MS);
267              assertTrue(p.isQuiescent());
268              assertFalse(p.getAsyncMode());
269 <            assertTrue(p.getActiveThreadCount() == 0);
270 <            assertTrue(p.getQueuedTaskCount() == 0);
271 <            assertTrue(p.getQueuedSubmissionCount() == 0);
269 >            assertEquals(0, p.getActiveThreadCount());
270 >            assertEquals(0, p.getQueuedTaskCount());
271 >            assertEquals(0, p.getQueuedSubmissionCount());
272              assertFalse(p.hasQueuedSubmissions());
273              assertFalse(p.isShutdown());
274              assertFalse(p.isTerminating());
# Line 278 | Line 285 | public class ForkJoinPoolTest extends JS
285          ForkJoinPool p = new ForkJoinPool(1);
286          try {
287              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
288 <            int r = f.get();
282 <            assertTrue(r == 21);
288 >            assertEquals(21, (int) f.get());
289          } finally {
290              joinPool(p);
291          }
# Line 293 | Line 299 | public class ForkJoinPoolTest extends JS
299          try {
300              p.shutdown();
301              assertTrue(p.isShutdown());
302 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
303 <            shouldThrow();
304 <        } catch (RejectedExecutionException success) {
302 >            try {
303 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
304 >                shouldThrow();
305 >            } catch (RejectedExecutionException success) {}
306          } finally {
307              joinPool(p);
308          }
# Line 309 | Line 316 | public class ForkJoinPoolTest extends JS
316          try {
317              ReentrantLock lock = new ReentrantLock();
318              ManagedLocker locker = new ManagedLocker(lock);
319 <            ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
319 >            ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
320              p.execute(f);
321 <            int r = f.get();
315 <            assertTrue(r == 832040);
321 >            assertEquals(6765, (int) f.get());
322          } finally {
323              p.shutdownNow(); // don't wait out shutdown
324          }
# Line 324 | Line 330 | public class ForkJoinPoolTest extends JS
330      public void testPollSubmission() {
331          SubFJP p = new SubFJP();
332          try {
333 <            ForkJoinTask a = p.submit(new MediumRunnable());
334 <            ForkJoinTask b = p.submit(new MediumRunnable());
335 <            ForkJoinTask c = p.submit(new MediumRunnable());
333 >            ForkJoinTask a = p.submit(new ShortRunnable());
334 >            ForkJoinTask b = p.submit(new ShortRunnable());
335 >            ForkJoinTask c = p.submit(new ShortRunnable());
336              ForkJoinTask r = p.pollSubmission();
337              assertTrue(r == a || r == b || r == c);
338              assertFalse(r.isDone());
# Line 341 | Line 347 | public class ForkJoinPoolTest extends JS
347      public void testDrainTasksTo() {
348          SubFJP p = new SubFJP();
349          try {
350 <            ForkJoinTask a = p.submit(new MediumRunnable());
351 <            ForkJoinTask b = p.submit(new MediumRunnable());
352 <            ForkJoinTask c = p.submit(new MediumRunnable());
350 >            ForkJoinTask a = p.submit(new ShortRunnable());
351 >            ForkJoinTask b = p.submit(new ShortRunnable());
352 >            ForkJoinTask c = p.submit(new ShortRunnable());
353              ArrayList<ForkJoinTask> al = new ArrayList();
354              p.drainTasksTo(al);
355              assertTrue(al.size() > 0);
# Line 365 | Line 371 | public class ForkJoinPoolTest extends JS
371      public void testExecuteRunnable() throws Throwable {
372          ExecutorService e = new ForkJoinPool(1);
373          try {
374 <            TrackedShortRunnable task = new TrackedShortRunnable();
375 <            assertFalse(task.done);
374 >            TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
375 >            assertFalse(task.isDone());
376              Future<?> future = e.submit(task);
377 <            future.get();
378 <            assertTrue(task.done);
377 >            assertNull(future.get());
378 >            assertTrue(task.isDone());
379 >            assertFalse(future.isCancelled());
380          } finally {
381              joinPool(e);
382          }
# Line 383 | Line 390 | public class ForkJoinPoolTest extends JS
390          ExecutorService e = new ForkJoinPool(1);
391          try {
392              Future<String> future = e.submit(new StringTask());
393 <            String result = future.get();
394 <            assertSame(TEST_STRING, result);
393 >            assertSame(TEST_STRING, future.get());
394 >            assertTrue(future.isDone());
395 >            assertFalse(future.isCancelled());
396          } finally {
397              joinPool(e);
398          }
# Line 397 | Line 405 | public class ForkJoinPoolTest extends JS
405          ExecutorService e = new ForkJoinPool(1);
406          try {
407              Future<?> future = e.submit(new NoOpRunnable());
408 <            future.get();
408 >            assertNull(future.get());
409              assertTrue(future.isDone());
410 +            assertFalse(future.isCancelled());
411          } finally {
412              joinPool(e);
413          }
# Line 411 | Line 420 | public class ForkJoinPoolTest extends JS
420          ExecutorService e = new ForkJoinPool(1);
421          try {
422              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
423 <            String result = future.get();
424 <            assertSame(TEST_STRING, result);
423 >            assertSame(TEST_STRING, future.get());
424 >            assertTrue(future.isDone());
425 >            assertFalse(future.isCancelled());
426          } finally {
427              joinPool(e);
428          }
429      }
430  
421
431      /**
432 <     * A submitted privileged action to completion
432 >     * A submitted privileged action runs to completion
433       */
434 <    public void testSubmitPrivilegedAction() throws Throwable {
435 <        Policy savedPolicy = null;
436 <        try {
437 <            savedPolicy = Policy.getPolicy();
429 <            AdjustablePolicy policy = new AdjustablePolicy();
430 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
431 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
432 <            Policy.setPolicy(policy);
433 <        } catch (AccessControlException ok) {
434 <            return;
435 <        }
436 <
437 <        try {
438 <            ExecutorService e = new ForkJoinPool(1);
439 <            try {
434 >    public void testSubmitPrivilegedAction() throws Exception {
435 >        Runnable r = new CheckedRunnable() {
436 >            public void realRun() throws Exception {
437 >                ExecutorService e = new ForkJoinPool(1);
438                  Future future = e.submit(Executors.callable(new PrivilegedAction() {
439                      public Object run() {
440                          return TEST_STRING;
441                      }}));
442  
443 <                Object result = future.get();
444 <                assertSame(TEST_STRING, result);
445 <            } finally {
446 <                joinPool(e);
447 <            }
450 <        } finally {
451 <            Policy.setPolicy(savedPolicy);
452 <        }
443 >                assertSame(TEST_STRING, future.get());
444 >            }};
445 >
446 >        runWithPermissions(r,
447 >                           new RuntimePermission("modifyThread"));
448      }
449  
450      /**
451 <     * A submitted a privileged exception action runs to completion
451 >     * A submitted privileged exception action runs to completion
452       */
453 <    public void testSubmitPrivilegedExceptionAction() throws Throwable {
454 <        Policy savedPolicy = null;
455 <        try {
456 <            savedPolicy = Policy.getPolicy();
462 <            AdjustablePolicy policy = new AdjustablePolicy();
463 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
464 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
465 <            Policy.setPolicy(policy);
466 <        } catch (AccessControlException ok) {
467 <            return;
468 <        }
469 <
470 <        try {
471 <            ExecutorService e = new ForkJoinPool(1);
472 <            try {
453 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
454 >        Runnable r = new CheckedRunnable() {
455 >            public void realRun() throws Exception {
456 >                ExecutorService e = new ForkJoinPool(1);
457                  Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
458                      public Object run() {
459                          return TEST_STRING;
460                      }}));
461  
462 <                Object result = future.get();
463 <                assertSame(TEST_STRING, result);
464 <            } finally {
465 <                joinPool(e);
482 <            }
483 <        } finally {
484 <            Policy.setPolicy(savedPolicy);
485 <        }
462 >                assertSame(TEST_STRING, future.get());
463 >            }};
464 >
465 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
466      }
467  
468      /**
469       * A submitted failed privileged exception action reports exception
470       */
471 <    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
472 <        Policy savedPolicy = null;
473 <        try {
474 <            savedPolicy = Policy.getPolicy();
495 <            AdjustablePolicy policy = new AdjustablePolicy();
496 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
497 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
498 <            Policy.setPolicy(policy);
499 <        } catch (AccessControlException ok) {
500 <            return;
501 <        }
502 <
503 <        try {
504 <            ExecutorService e = new ForkJoinPool(1);
505 <            try {
471 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
472 >        Runnable r = new CheckedRunnable() {
473 >            public void realRun() throws Exception {
474 >                ExecutorService e = new ForkJoinPool(1);
475                  Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
476                      public Object run() throws Exception {
477                          throw new IndexOutOfBoundsException();
478                      }}));
479  
480 <                Object result = future.get();
481 <                shouldThrow();
482 <            } catch (ExecutionException success) {
483 <                assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
484 <            } finally {
485 <                joinPool(e);
486 <            }
487 <        } finally {
519 <            Policy.setPolicy(savedPolicy);
520 <        }
480 >                try {
481 >                    future.get();
482 >                    shouldThrow();
483 >                } catch (ExecutionException success) {
484 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
485 >                }}};
486 >
487 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
488      }
489  
490      /**
# Line 526 | Line 493 | public class ForkJoinPoolTest extends JS
493      public void testExecuteNullRunnable() {
494          ExecutorService e = new ForkJoinPool(1);
495          try {
496 <            TrackedShortRunnable task = null;
530 <            Future<?> future = e.submit(task);
496 >            Future<?> future = e.submit((Runnable) null);
497              shouldThrow();
498          } catch (NullPointerException success) {
499          } finally {
# Line 542 | Line 508 | public class ForkJoinPoolTest extends JS
508      public void testSubmitNullCallable() {
509          ExecutorService e = new ForkJoinPool(1);
510          try {
511 <            StringTask t = null;
546 <            Future<String> future = e.submit(t);
511 >            Future<String> future = e.submit((Callable) null);
512              shouldThrow();
513          } catch (NullPointerException success) {
514          } finally {
# Line 553 | Line 518 | public class ForkJoinPoolTest extends JS
518  
519  
520      /**
521 <     * Blocking on submit(callable) throws InterruptedException if
557 <     * caller interrupted.
521 >     * submit(callable).get() throws InterruptedException if interrupted
522       */
523      public void testInterruptedSubmit() throws InterruptedException {
524 <        final ForkJoinPool p = new ForkJoinPool(1);
525 <
526 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
527 <            public void realRun() throws Throwable {
528 <                p.submit(new CheckedCallable<Object>() {
529 <                    public Object realCall() throws Throwable {
530 <                        try {
531 <                            Thread.sleep(MEDIUM_DELAY_MS);
532 <                        } catch (InterruptedException ok) {
533 <                        }
534 <                        return null;
535 <                    }}).get();
536 <            }});
537 <
538 <        t.start();
539 <        Thread.sleep(SHORT_DELAY_MS);
540 <        t.interrupt();
541 <        t.join();
542 <        p.shutdownNow();
543 <        joinPool(p);
524 >        final CountDownLatch submitted    = new CountDownLatch(1);
525 >        final CountDownLatch quittingTime = new CountDownLatch(1);
526 >        final ExecutorService p = new ForkJoinPool(1);
527 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
528 >            public Void realCall() throws InterruptedException {
529 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
530 >                return null;
531 >            }};
532 >        try {
533 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
534 >                public void realRun() throws Exception {
535 >                    Future<Void> future = p.submit(awaiter);
536 >                    submitted.countDown();
537 >                    future.get();
538 >                }});
539 >            t.start();
540 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
541 >            t.interrupt();
542 >            t.join();
543 >        } finally {
544 >            quittingTime.countDown();
545 >            joinPool(p);
546 >        }
547      }
548  
549      /**
# Line 785 | Line 752 | public class ForkJoinPoolTest extends JS
752      public void testTimedInvokeAny1() throws Throwable {
753          ExecutorService e = new ForkJoinPool(1);
754          try {
755 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
755 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
756              shouldThrow();
757          } catch (NullPointerException success) {
758          } finally {
# Line 816 | Line 783 | public class ForkJoinPoolTest extends JS
783          ExecutorService e = new ForkJoinPool(1);
784          try {
785              e.invokeAny(new ArrayList<Callable<String>>(),
786 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
786 >                        MEDIUM_DELAY_MS, MILLISECONDS);
787              shouldThrow();
788          } catch (IllegalArgumentException success) {
789          } finally {
# Line 834 | Line 801 | public class ForkJoinPoolTest extends JS
801          l.add(latchAwaitingStringTask(latch));
802          l.add(null);
803          try {
804 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
804 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
805              shouldThrow();
806          } catch (NullPointerException success) {
807          } finally {
# Line 851 | Line 818 | public class ForkJoinPoolTest extends JS
818          List<Callable<String>> l = new ArrayList<Callable<String>>();
819          l.add(new NPETask());
820          try {
821 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
821 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
822              shouldThrow();
823          } catch (ExecutionException success) {
824              assertTrue(success.getCause() instanceof NullPointerException);
# Line 869 | Line 836 | public class ForkJoinPoolTest extends JS
836              List<Callable<String>> l = new ArrayList<Callable<String>>();
837              l.add(new StringTask());
838              l.add(new StringTask());
839 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
839 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
840              assertSame(TEST_STRING, result);
841          } finally {
842              joinPool(e);
# Line 882 | Line 849 | public class ForkJoinPoolTest extends JS
849      public void testTimedInvokeAll1() throws Throwable {
850          ExecutorService e = new ForkJoinPool(1);
851          try {
852 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
852 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
853              shouldThrow();
854          } catch (NullPointerException success) {
855          } finally {
# Line 914 | Line 881 | public class ForkJoinPoolTest extends JS
881          try {
882              List<Future<String>> r
883                  = e.invokeAll(new ArrayList<Callable<String>>(),
884 <                              MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
884 >                              MEDIUM_DELAY_MS, MILLISECONDS);
885              assertTrue(r.isEmpty());
886          } finally {
887              joinPool(e);
# Line 930 | Line 897 | public class ForkJoinPoolTest extends JS
897          l.add(new StringTask());
898          l.add(null);
899          try {
900 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
900 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
901              shouldThrow();
902          } catch (NullPointerException success) {
903          } finally {
# Line 946 | Line 913 | public class ForkJoinPoolTest extends JS
913          List<Callable<String>> l = new ArrayList<Callable<String>>();
914          l.add(new NPETask());
915          List<Future<String>> futures
916 <            = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
916 >            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
917          assertEquals(1, futures.size());
918          try {
919              futures.get(0).get();
# Line 968 | Line 935 | public class ForkJoinPoolTest extends JS
935              l.add(new StringTask());
936              l.add(new StringTask());
937              List<Future<String>> futures
938 <                = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
938 >                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
939              assertEquals(2, futures.size());
940              for (Future<String> future : futures)
941                  assertSame(TEST_STRING, future.get());

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines