--- jsr166/src/test/tck/ThreadTest.java 2003/12/27 19:26:44 1.8 +++ jsr166/src/test/tck/ThreadTest.java 2011/03/15 19:47:07 1.13 @@ -1,20 +1,20 @@ /* * 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 - * Other contributors include Andrew Wright, Jeffrey Hayes, - * Pat Fisher, Mike Judd. + * http://creativecommons.org/publicdomain/zero/1.0/ + * Other contributors include Andrew Wright, Jeffrey Hayes, + * Pat Fisher, Mike Judd. */ import junit.framework.*; 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 { @@ -22,10 +22,10 @@ public class ThreadTest extends JSR166Te e.printStackTrace(); } } - + /** * getUncaughtExceptionHandler returns ThreadGroup unless set, - * otherwise returning vlaue of last setUncaughtExceptionHandler. + * otherwise returning value of last setUncaughtExceptionHandler. */ public void testGetAndSetUncaughtExceptionHandler() { // these must be done all at once to avoid state @@ -33,16 +33,16 @@ 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()); } /** * getDefaultUncaughtExceptionHandler returns value of last - * setDefaultUncaughtExceptionHandler. + * setDefaultUncaughtExceptionHandler. */ public void testGetAndSetDefaultUncaughtExceptionHandler() { assertEquals(null, Thread.getDefaultUncaughtExceptionHandler()); @@ -56,13 +56,12 @@ 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? } -