--- jsr166/src/test/tck/ThreadTest.java	2003/08/31 19:24:56	1.1
+++ jsr166/src/test/tck/ThreadTest.java	2003/12/27 19:26:44	1.8
@@ -1,19 +1,14 @@
 /*
- * 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.*;
-import java.util.concurrent.Semaphore;
 
-/**
- * Test java.lang.Thread 
- *
- */
-
-public class ThreadTest extends TestCase {
+public class ThreadTest extends JSR166TestCase {
     public static void main(String[] args) {
 	junit.textui.TestRunner.run(suite());	
     }
@@ -28,25 +23,44 @@ public class ThreadTest extends TestCase
         }
     }
     
+    /**
+     * getUncaughtExceptionHandler returns ThreadGroup unless set,
+     * otherwise returning vlaue of last setUncaughtExceptionHandler.
+     */
     public void testGetAndSetUncaughtExceptionHandler() {
         // these must be done all at once to avoid state
         // dependencies across tests
         Thread current = Thread.currentThread();
         ThreadGroup tg = current.getThreadGroup();
-	assertNull(Thread.getDefaultUncaughtExceptionHandler());
-	assertEquals(tg, current.getUncaughtExceptionHandler());
         MyHandler eh = new MyHandler();
-        Thread.setDefaultUncaughtExceptionHandler(eh);
-	assertEquals(eh, current.getUncaughtExceptionHandler());
-	assertEquals(eh, Thread.getDefaultUncaughtExceptionHandler());
-        Thread.setDefaultUncaughtExceptionHandler(null);
-	assertNull(Thread.getDefaultUncaughtExceptionHandler());
 	assertEquals(tg, current.getUncaughtExceptionHandler());
         current.setUncaughtExceptionHandler(eh);
 	assertEquals(eh, current.getUncaughtExceptionHandler());
         current.setUncaughtExceptionHandler(null);
 	assertEquals(tg, current.getUncaughtExceptionHandler());
     }
+
+    /**
+     * getDefaultUncaughtExceptionHandler returns value of last
+     * setDefaultUncaughtExceptionHandler. 
+     */
+    public void testGetAndSetDefaultUncaughtExceptionHandler() {
+        assertEquals(null, Thread.getDefaultUncaughtExceptionHandler());
+        // failure due to securityException is OK.
+        // Would be nice to explicitly test both ways, but cannot yet.
+        try {
+            Thread current = Thread.currentThread();
+            ThreadGroup tg = current.getThreadGroup();
+            MyHandler eh = new MyHandler();
+            Thread.setDefaultUncaughtExceptionHandler(eh);
+            assertEquals(eh, Thread.getDefaultUncaughtExceptionHandler());
+            Thread.setDefaultUncaughtExceptionHandler(null);
+        }
+        catch(SecurityException ok) {
+        }
+        assertEquals(null, Thread.getDefaultUncaughtExceptionHandler());
+    }
+
     
     // How to test actually using UEH within junit?