--- jsr166/src/test/tck/ForkJoinPoolTest.java 2009/11/21 10:25:05 1.10 +++ jsr166/src/test/tck/ForkJoinPoolTest.java 2010/08/11 19:50:02 1.20 @@ -7,8 +7,22 @@ import junit.framework.*; import java.util.*; -import java.util.concurrent.*; -import static java.util.concurrent.TimeUnit.MILLISECONDS; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.AbstractExecutorService; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.Callable; +import java.util.concurrent.Future; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.CancellationException; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ForkJoinTask; +import java.util.concurrent.ForkJoinWorkerThread; +import java.util.concurrent.RecursiveAction; +import java.util.concurrent.RecursiveTask; +import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.*; import java.security.*; @@ -39,7 +53,7 @@ public class ForkJoinPoolTest extends JS // Some classes to test extension and factory methods static class MyHandler implements Thread.UncaughtExceptionHandler { - int catches = 0; + volatile int catches = 0; public void uncaughtException(Thread t, Throwable e) { ++catches; } @@ -48,12 +62,12 @@ public class ForkJoinPoolTest extends JS // to test handlers static class FailingFJWSubclass extends ForkJoinWorkerThread { public FailingFJWSubclass(ForkJoinPool p) { super(p) ; } - protected void onStart() { throw new Error(); } + protected void onStart() { super.onStart(); throw new Error(); } } static class FailingThreadFactory implements ForkJoinPool.ForkJoinWorkerThreadFactory { - int calls = 0; + volatile int calls = 0; public ForkJoinWorkerThread newThread(ForkJoinPool p) { if (++calls > 1) return null; return new FailingFJWSubclass(p); @@ -148,7 +162,6 @@ public class ForkJoinPoolTest extends JS assertTrue(p.getFactory() == ForkJoinPool.defaultForkJoinWorkerThreadFactory); assertTrue(p.isQuiescent()); - assertTrue(p.getMaintainsParallelism()); assertFalse(p.getAsyncMode()); assertTrue(p.getActiveThreadCount() == 0); assertTrue(p.getStealCount() == 0); @@ -178,7 +191,7 @@ public class ForkJoinPoolTest extends JS */ public void testConstructor2() { try { - new ForkJoinPool(1, null); + new ForkJoinPool(1, null, null, false); shouldThrow(); } catch (NullPointerException success) {} } @@ -198,44 +211,13 @@ public class ForkJoinPoolTest extends JS } /** - * setParallelism changes reported parallelism level. - */ - public void testSetParallelism() { - ForkJoinPool p = null; - try { - p = new ForkJoinPool(1); - assertTrue(p.getParallelism() == 1); - p.setParallelism(2); - assertTrue(p.getParallelism() == 2); - } finally { - joinPool(p); - } - } - - /** - * setParallelism with argument <= 0 throws exception - */ - public void testSetParallelism2() { - ForkJoinPool p = null; - try { - p = new ForkJoinPool(1); - assertTrue(p.getParallelism() == 1); - p.setParallelism(-2); - shouldThrow(); - } catch (IllegalArgumentException success) { - } finally { - joinPool(p); - } - } - - /** * getPoolSize returns number of started workers. */ public void testGetPoolSize() { ForkJoinPool p = null; try { p = new ForkJoinPool(1); - assertTrue(p.getPoolSize() == 0); + assertTrue(p.getActiveThreadCount() == 0); Future future = p.submit(new StringTask()); assertTrue(p.getPoolSize() == 1); @@ -245,65 +227,6 @@ public class ForkJoinPoolTest extends JS } /** - * setMaximumPoolSize changes size reported by getMaximumPoolSize. - */ - public void testSetMaximumPoolSize() { - ForkJoinPool p = null; - try { - p = new ForkJoinPool(1); - p.setMaximumPoolSize(2); - assertTrue(p.getMaximumPoolSize() == 2); - } finally { - joinPool(p); - } - } - - /** - * setMaximumPoolSize with argument <= 0 throws exception - */ - public void testSetMaximumPoolSize2() { - ForkJoinPool p = null; - try { - p = new ForkJoinPool(1); - p.setMaximumPoolSize(-2); - shouldThrow(); - } catch (IllegalArgumentException success) { - } finally { - joinPool(p); - } - } - - /** - * setMaintainsParallelism changes policy reported by - * getMaintainsParallelism. - */ - public void testSetMaintainsParallelism() { - ForkJoinPool p = null; - try { - p = new ForkJoinPool(1); - p.setMaintainsParallelism(false); - assertFalse(p.getMaintainsParallelism()); - } finally { - joinPool(p); - } - } - - /** - * setAsyncMode changes policy reported by - * getAsyncMode. - */ - public void testSetAsyncMode() { - ForkJoinPool p = null; - try { - p = new ForkJoinPool(1); - p.setAsyncMode(true); - assertTrue(p.getAsyncMode()); - } finally { - joinPool(p); - } - } - - /** * setUncaughtExceptionHandler changes handler for uncaught exceptions. * * Additionally tests: Overriding ForkJoinWorkerThread.onStart @@ -312,34 +235,19 @@ public class ForkJoinPoolTest extends JS public void testSetUncaughtExceptionHandler() throws InterruptedException { ForkJoinPool p = null; try { - p = new ForkJoinPool(1, new FailingThreadFactory()); MyHandler eh = new MyHandler(); - p.setUncaughtExceptionHandler(eh); - assertEquals(eh, p.getUncaughtExceptionHandler()); + p = new ForkJoinPool(1, new FailingThreadFactory(), eh, false); + assert(eh == p.getUncaughtExceptionHandler()); p.execute(new FailingTask()); Thread.sleep(MEDIUM_DELAY_MS); assertTrue(eh.catches > 0); } finally { + p.shutdownNow(); joinPool(p); } } /** - * setUncaughtExceptionHandler of null removes handler - */ - public void testSetUncaughtExceptionHandler2() { - ForkJoinPool p = null; - try { - p = new ForkJoinPool(1); - p.setUncaughtExceptionHandler(null); - assertNull(p.getUncaughtExceptionHandler()); - } finally { - joinPool(p); - } - } - - - /** * After invoking a single task, isQuiescent is true, * queues are empty, threads are not active, and * construction parameters continue to hold @@ -353,7 +261,6 @@ public class ForkJoinPoolTest extends JS ForkJoinPool.defaultForkJoinWorkerThreadFactory); Thread.sleep(MEDIUM_DELAY_MS); assertTrue(p.isQuiescent()); - assertTrue(p.getMaintainsParallelism()); assertFalse(p.getAsyncMode()); assertTrue(p.getActiveThreadCount() == 0); assertTrue(p.getQueuedTaskCount() == 0); @@ -410,9 +317,8 @@ public class ForkJoinPoolTest extends JS ManagedLocker locker = new ManagedLocker(lock); ForkJoinTask f = new LockingFibTask(30, locker, lock); p.execute(f); - assertTrue(p.getPoolSize() >= 4); int r = f.get(); - assertTrue(r == 832040); + assertTrue(r == 832040); } finally { p.shutdownNow(); // don't wait out shutdown } @@ -590,6 +496,7 @@ public class ForkJoinPoolTest extends JS Object result = future.get(); shouldThrow(); } catch (ExecutionException success) { + assertTrue(success.getCause() instanceof IndexOutOfBoundsException); } finally { Policy.setPolicy(savedPolicy); } @@ -629,7 +536,7 @@ public class ForkJoinPoolTest extends JS final ForkJoinPool p = new ForkJoinPool(1); Thread t = new Thread(new CheckedInterruptedRunnable() { - void realRun() throws Throwable { + public void realRun() throws Throwable { p.submit(new CheckedCallable() { public Object realCall() throws Throwable { try { @@ -661,8 +568,10 @@ public class ForkJoinPoolTest extends JS return Boolean.TRUE; }}).get(); shouldThrow(); - } catch (ExecutionException success) {} - + } catch (ExecutionException success) { + assertTrue(success.getCause() instanceof ArithmeticException); + } + joinPool(p); } @@ -699,9 +608,9 @@ public class ForkJoinPoolTest extends JS */ public void testInvokeAny3() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(null); try { - ArrayList> l = new ArrayList>(); - l.add(null); e.invokeAny(l); shouldThrow(); } catch (NullPointerException success) { @@ -714,21 +623,17 @@ public class ForkJoinPoolTest extends JS * invokeAny(c) throws NullPointerException if c has null elements */ public void testInvokeAny4() throws Throwable { + CountDownLatch latch = new CountDownLatch(1); ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(latchAwaitingStringTask(latch)); + l.add(null); try { - ArrayList> l = new ArrayList>(); - l.add(new Callable() { - public String call() { - // The delay gives the pool a chance to notice - // the null element. - sleepTillInterrupted(SMALL_DELAY_MS); - return "foo"; - }}); - l.add(null); e.invokeAny(l); shouldThrow(); } catch (NullPointerException success) { } finally { + latch.countDown(); joinPool(e); } } @@ -738,12 +643,13 @@ public class ForkJoinPoolTest extends JS */ public void testInvokeAny5() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new NPETask()); try { - ArrayList> l = new ArrayList>(); - l.add(new NPETask()); e.invokeAny(l); shouldThrow(); } catch (ExecutionException success) { + assertTrue(success.getCause() instanceof NullPointerException); } finally { joinPool(e); } @@ -755,7 +661,7 @@ public class ForkJoinPoolTest extends JS public void testInvokeAny6() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - ArrayList> l = new ArrayList>(); + List> l = new ArrayList>(); l.add(new StringTask()); l.add(new StringTask()); String result = e.invokeAny(l); @@ -798,10 +704,10 @@ public class ForkJoinPoolTest extends JS */ public void testInvokeAll3() throws InterruptedException { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new StringTask()); + l.add(null); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); - l.add(null); e.invokeAll(l); shouldThrow(); } catch (NullPointerException success) { @@ -816,15 +722,15 @@ public class ForkJoinPoolTest extends JS */ public void testInvokeAll4() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new NPETask()); + List> futures = e.invokeAll(l); + assertEquals(1, futures.size()); try { - ArrayList> l = new ArrayList>(); - l.add(new NPETask()); - List> result = e.invokeAll(l); - assertEquals(1, result.size()); - for (Future future : result) - future.get(); + futures.get(0).get(); shouldThrow(); } catch (ExecutionException success) { + assertTrue(success.getCause() instanceof NullPointerException); } finally { joinPool(e); } @@ -836,12 +742,12 @@ public class ForkJoinPoolTest extends JS public void testInvokeAll5() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - ArrayList> l = new ArrayList>(); + List> l = new ArrayList>(); l.add(new StringTask()); l.add(new StringTask()); - List> result = e.invokeAll(l); - assertEquals(2, result.size()); - for (Future future : result) + List> futures = e.invokeAll(l); + assertEquals(2, futures.size()); + for (Future future : futures) assertSame(TEST_STRING, future.get()); } finally { joinPool(e); @@ -855,7 +761,7 @@ public class ForkJoinPoolTest extends JS public void testTimedInvokeAny1() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS); + e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); shouldThrow(); } catch (NullPointerException success) { } finally { @@ -868,9 +774,9 @@ public class ForkJoinPoolTest extends JS */ public void testTimedInvokeAnyNullTimeUnit() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new StringTask()); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); e.invokeAny(l, MEDIUM_DELAY_MS, null); shouldThrow(); } catch (NullPointerException success) { @@ -886,7 +792,7 @@ public class ForkJoinPoolTest extends JS ExecutorService e = new ForkJoinPool(1); try { e.invokeAny(new ArrayList>(), - MEDIUM_DELAY_MS, MILLISECONDS); + MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); shouldThrow(); } catch (IllegalArgumentException success) { } finally { @@ -898,15 +804,17 @@ public class ForkJoinPoolTest extends JS * timed invokeAny(c) throws NullPointerException if c has null elements */ public void testTimedInvokeAny3() throws Throwable { + CountDownLatch latch = new CountDownLatch(1); ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(latchAwaitingStringTask(latch)); + l.add(null); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); - l.add(null); - e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS); + e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); shouldThrow(); } catch (NullPointerException success) { } finally { + latch.countDown(); joinPool(e); } } @@ -916,12 +824,13 @@ public class ForkJoinPoolTest extends JS */ public void testTimedInvokeAny4() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new NPETask()); try { - ArrayList> l = new ArrayList>(); - l.add(new NPETask()); - e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS); + e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); shouldThrow(); } catch (ExecutionException success) { + assertTrue(success.getCause() instanceof NullPointerException); } finally { joinPool(e); } @@ -933,10 +842,10 @@ public class ForkJoinPoolTest extends JS public void testTimedInvokeAny5() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - ArrayList> l = new ArrayList>(); + List> l = new ArrayList>(); l.add(new StringTask()); l.add(new StringTask()); - String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS); + String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); assertSame(TEST_STRING, result); } finally { joinPool(e); @@ -949,7 +858,7 @@ public class ForkJoinPoolTest extends JS public void testTimedInvokeAll1() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS); + e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); shouldThrow(); } catch (NullPointerException success) { } finally { @@ -962,9 +871,9 @@ public class ForkJoinPoolTest extends JS */ public void testTimedInvokeAllNullTimeUnit() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new StringTask()); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); e.invokeAll(l, MEDIUM_DELAY_MS, null); shouldThrow(); } catch (NullPointerException success) { @@ -981,7 +890,7 @@ public class ForkJoinPoolTest extends JS try { List> r = e.invokeAll(new ArrayList>(), - MEDIUM_DELAY_MS, MILLISECONDS); + MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); assertTrue(r.isEmpty()); } finally { joinPool(e); @@ -993,11 +902,11 @@ public class ForkJoinPoolTest extends JS */ public void testTimedInvokeAll3() throws InterruptedException { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new StringTask()); + l.add(null); try { - ArrayList> l = new ArrayList>(); - l.add(new StringTask()); - l.add(null); - e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS); + e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); shouldThrow(); } catch (NullPointerException success) { } finally { @@ -1010,16 +919,16 @@ public class ForkJoinPoolTest extends JS */ public void testTimedInvokeAll4() throws Throwable { ExecutorService e = new ForkJoinPool(1); + List> l = new ArrayList>(); + l.add(new NPETask()); + List> futures + = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + assertEquals(1, futures.size()); try { - ArrayList> l = new ArrayList>(); - l.add(new NPETask()); - List> result - = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS); - assertEquals(1, result.size()); - for (Future future : result) - future.get(); + futures.get(0).get(); shouldThrow(); } catch (ExecutionException success) { + assertTrue(success.getCause() instanceof NullPointerException); } finally { joinPool(e); } @@ -1031,13 +940,13 @@ public class ForkJoinPoolTest extends JS public void testTimedInvokeAll5() throws Throwable { ExecutorService e = new ForkJoinPool(1); try { - ArrayList> l = new ArrayList>(); + List> l = new ArrayList>(); l.add(new StringTask()); l.add(new StringTask()); - List> result - = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS); - assertEquals(2, result.size()); - for (Future future : result) + List> futures + = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS); + assertEquals(2, futures.size()); + for (Future future : futures) assertSame(TEST_STRING, future.get()); } finally { joinPool(e);