ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ThreadTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ThreadTest.java (file contents):
Revision 1.15 by jsr166, Wed Dec 31 19:05:43 2014 UTC vs.
Revision 1.16 by jsr166, Sun Feb 22 19:15:14 2015 UTC

# Line 34 | Line 34 | public class ThreadTest extends JSR166Te
34          Thread current = Thread.currentThread();
35          ThreadGroup tg = current.getThreadGroup();
36          MyHandler eh = new MyHandler();
37 <        assertEquals(tg, current.getUncaughtExceptionHandler());
37 >        assertSame(tg, current.getUncaughtExceptionHandler());
38          current.setUncaughtExceptionHandler(eh);
39 <        assertEquals(eh, current.getUncaughtExceptionHandler());
40 <        current.setUncaughtExceptionHandler(null);
41 <        assertEquals(tg, current.getUncaughtExceptionHandler());
39 >        try {
40 >            assertSame(eh, current.getUncaughtExceptionHandler());
41 >        } finally {
42 >            current.setUncaughtExceptionHandler(null);
43 >        }
44 >        assertSame(tg, current.getUncaughtExceptionHandler());
45      }
46  
47      /**
# Line 49 | Line 52 | public class ThreadTest extends JSR166Te
52          assertEquals(null, Thread.getDefaultUncaughtExceptionHandler());
53          // failure due to securityException is OK.
54          // Would be nice to explicitly test both ways, but cannot yet.
55 +        Thread.UncaughtExceptionHandler defaultHandler
56 +            = Thread.getDefaultUncaughtExceptionHandler();
57 +        Thread current = Thread.currentThread();
58 +        MyHandler eh = new MyHandler();
59          try {
53 –            Thread current = Thread.currentThread();
54 –            ThreadGroup tg = current.getThreadGroup();
55 –            MyHandler eh = new MyHandler();
60              Thread.setDefaultUncaughtExceptionHandler(eh);
61 <            assertEquals(eh, Thread.getDefaultUncaughtExceptionHandler());
62 <            Thread.setDefaultUncaughtExceptionHandler(null);
63 <        }
64 <        catch (SecurityException ok) {
61 >            try {
62 >                assertSame(eh, Thread.getDefaultUncaughtExceptionHandler());
63 >            } finally {
64 >                Thread.setDefaultUncaughtExceptionHandler(defaultHandler);
65 >            }
66 >        } catch (SecurityException ok) {
67 >            assertNotNull(System.getSecurityManager());
68          }
69 <        assertEquals(null, Thread.getDefaultUncaughtExceptionHandler());
69 >        assertSame(defaultHandler, Thread.getDefaultUncaughtExceptionHandler());
70      }
71  
72      // How to test actually using UEH within junit?

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines