--- jsr166/src/test/tck/ThreadTest.java	2003/09/20 18:20:08	1.5
+++ jsr166/src/test/tck/ThreadTest.java	2003/12/27 19:26:44	1.8
@@ -1,8 +1,9 @@
 /*
- * Written by members of JCP JSR-166 Expert Group and released to the
- * public domain. Use, modify, and redistribute this code in any way
- * without acknowledgement. Other contributors include Andrew Wright,
- * Jeffrey Hayes, Pat Fischer, Mike Judd.
+ * 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. 
  */
 
 import junit.framework.*;
@@ -23,7 +24,8 @@ public class ThreadTest extends JSR166Te
     }
     
     /**
-     *
+     * getUncaughtExceptionHandler returns ThreadGroup unless set,
+     * otherwise returning vlaue of last setUncaughtExceptionHandler.
      */
     public void testGetAndSetUncaughtExceptionHandler() {
         // these must be done all at once to avoid state
@@ -39,7 +41,8 @@ public class ThreadTest extends JSR166Te
     }
 
     /**
-     *
+     * getDefaultUncaughtExceptionHandler returns value of last
+     * setDefaultUncaughtExceptionHandler. 
      */
     public void testGetAndSetDefaultUncaughtExceptionHandler() {
         assertEquals(null, Thread.getDefaultUncaughtExceptionHandler());
@@ -49,15 +52,15 @@ public class ThreadTest extends JSR166Te
             Thread current = Thread.currentThread();
             ThreadGroup tg = current.getThreadGroup();
             MyHandler eh = new MyHandler();
-            assertEquals(tg, current.getUncaughtExceptionHandler());
             Thread.setDefaultUncaughtExceptionHandler(eh);
+            assertEquals(eh, Thread.getDefaultUncaughtExceptionHandler());
             Thread.setDefaultUncaughtExceptionHandler(null);
-            assertEquals(tg, current.getUncaughtExceptionHandler());
         }
         catch(SecurityException ok) {
         }
         assertEquals(null, Thread.getDefaultUncaughtExceptionHandler());
     }
+
     
     // How to test actually using UEH within junit?