--- jsr166/src/test/tck/ThreadTest.java	2003/09/20 18:20:08	1.5
+++ jsr166/src/test/tck/ThreadTest.java	2015/02/22 19:15:14	1.16
@@ -1,19 +1,21 @@
 /*
- * 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/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 {
@@ -21,9 +23,10 @@ public class ThreadTest extends JSR166Te
             e.printStackTrace();
         }
     }
-    
+
     /**
-     *
+     * getUncaughtExceptionHandler returns ThreadGroup unless set,
+     * otherwise returning value of last setUncaughtExceptionHandler.
      */
     public void testGetAndSetUncaughtExceptionHandler() {
         // these must be done all at once to avoid state
@@ -31,35 +34,41 @@ public class ThreadTest extends JSR166Te
         Thread current = Thread.currentThread();
         ThreadGroup tg = current.getThreadGroup();
         MyHandler eh = new MyHandler();
-	assertEquals(tg, current.getUncaughtExceptionHandler());
+        assertSame(tg, current.getUncaughtExceptionHandler());
         current.setUncaughtExceptionHandler(eh);
-	assertEquals(eh, current.getUncaughtExceptionHandler());
-        current.setUncaughtExceptionHandler(null);
-	assertEquals(tg, current.getUncaughtExceptionHandler());
+        try {
+            assertSame(eh, current.getUncaughtExceptionHandler());
+        } finally {
+            current.setUncaughtExceptionHandler(null);
+        }
+        assertSame(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.
+        Thread.UncaughtExceptionHandler defaultHandler
+            = Thread.getDefaultUncaughtExceptionHandler();
+        Thread current = Thread.currentThread();
+        MyHandler eh = new MyHandler();
         try {
-            Thread current = Thread.currentThread();
-            ThreadGroup tg = current.getThreadGroup();
-            MyHandler eh = new MyHandler();
-            assertEquals(tg, current.getUncaughtExceptionHandler());
             Thread.setDefaultUncaughtExceptionHandler(eh);
-            Thread.setDefaultUncaughtExceptionHandler(null);
-            assertEquals(tg, current.getUncaughtExceptionHandler());
-        }
-        catch(SecurityException ok) {
+            try {
+                assertSame(eh, Thread.getDefaultUncaughtExceptionHandler());
+            } finally {
+                Thread.setDefaultUncaughtExceptionHandler(defaultHandler);
+            }
+        } catch (SecurityException ok) {
+            assertNotNull(System.getSecurityManager());
         }
-        assertEquals(null, Thread.getDefaultUncaughtExceptionHandler());
+        assertSame(defaultHandler, Thread.getDefaultUncaughtExceptionHandler());
     }
-    
+
     // How to test actually using UEH within junit?
 
 }
-