--- jsr166/src/test/tck/ExecutorsTest.java 2010/11/09 15:29:11 1.36 +++ jsr166/src/test/tck/ExecutorsTest.java 2011/05/06 11:22:07 1.39 @@ -1,7 +1,7 @@ /* * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/licenses/publicdomain + * http://creativecommons.org/publicdomain/zero/1.0/ * Other contributors include Andrew Wright, Jeffrey Hayes, * Pat Fisher, Mike Judd. */ @@ -254,7 +254,7 @@ public class ExecutorsTest extends JSR16 public void testTimedCallable() throws Exception { final Runnable sleeper = new CheckedInterruptedRunnable() { public void realRun() throws InterruptedException { - Thread.sleep(LONG_DELAY_MS); + delay(LONG_DELAY_MS); }}; for (ExecutorService executor : new ExecutorService[] { @@ -313,7 +313,7 @@ public class ExecutorsTest extends JSR16 } try { - Thread.sleep(SHORT_DELAY_MS); + delay(SHORT_DELAY_MS); } finally { joinPool(e); } @@ -349,7 +349,7 @@ public class ExecutorsTest extends JSR16 ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); e.execute(r); e.shutdown(); - Thread.sleep(SHORT_DELAY_MS); + delay(SHORT_DELAY_MS); joinPool(e); }}; @@ -504,7 +504,7 @@ public class ExecutorsTest extends JSR16 Executors.privilegedCallable(new CheckCCL()).call(); }}; - runWithPermissions(r, + runWithPermissions(r, new RuntimePermission("getClassLoader"), new RuntimePermission("setContextClassLoader")); }