--- jsr166/src/test/tck/ThreadTest.java 2009/11/02 20:28:32 1.10 +++ jsr166/src/test/tck/ThreadTest.java 2014/12/31 19:05:43 1.15 @@ -1,20 +1,21 @@ /* * 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. */ -import junit.framework.*; +import junit.framework.Test; +import junit.framework.TestSuite; public class ThreadTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); + junit.textui.TestRunner.run(suite()); } public static Test suite() { - return new TestSuite(ThreadTest.class); + return new TestSuite(ThreadTest.class); } static class MyHandler implements Thread.UncaughtExceptionHandler { @@ -33,11 +34,11 @@ public class ThreadTest extends JSR166Te Thread current = Thread.currentThread(); ThreadGroup tg = current.getThreadGroup(); MyHandler eh = new MyHandler(); - assertEquals(tg, current.getUncaughtExceptionHandler()); + assertEquals(tg, current.getUncaughtExceptionHandler()); current.setUncaughtExceptionHandler(eh); - assertEquals(eh, current.getUncaughtExceptionHandler()); + assertEquals(eh, current.getUncaughtExceptionHandler()); current.setUncaughtExceptionHandler(null); - assertEquals(tg, current.getUncaughtExceptionHandler()); + assertEquals(tg, current.getUncaughtExceptionHandler()); } /** @@ -56,12 +57,11 @@ public class ThreadTest extends JSR166Te assertEquals(eh, Thread.getDefaultUncaughtExceptionHandler()); Thread.setDefaultUncaughtExceptionHandler(null); } - catch(SecurityException ok) { + catch (SecurityException ok) { } assertEquals(null, Thread.getDefaultUncaughtExceptionHandler()); } - // How to test actually using UEH within junit? }