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

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.30 by jsr166, Wed Aug 25 00:07:03 2010 UTC vs.
Revision 1.31 by jsr166, Thu Sep 16 00:52:49 2010 UTC

# Line 258 | Line 258 | public class ExecutorsTest extends JSR16
258       */
259      public void testDefaultThreadFactory() throws Exception {
260          final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
261 <        Runnable r = new Runnable() {
262 <                public void run() {
263 <                    try {
264 <                        Thread current = Thread.currentThread();
265 <                        threadAssertTrue(!current.isDaemon());
266 <                        threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
267 <                        ThreadGroup g = current.getThreadGroup();
268 <                        SecurityManager s = System.getSecurityManager();
269 <                        if (s != null)
270 <                            threadAssertTrue(g == s.getThreadGroup());
271 <                        else
272 <                            threadAssertTrue(g == egroup);
273 <                        String name = current.getName();
274 <                        threadAssertTrue(name.endsWith("thread-1"));
275 <                    } catch (SecurityException ok) {
276 <                        // Also pass if not allowed to change setting
277 <                    }
261 >        Runnable r = new CheckedRunnable() {
262 >            public void realRun() {
263 >                try {
264 >                    Thread current = Thread.currentThread();
265 >                    assertTrue(!current.isDaemon());
266 >                    assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
267 >                    ThreadGroup g = current.getThreadGroup();
268 >                    SecurityManager s = System.getSecurityManager();
269 >                    if (s != null)
270 >                        assertTrue(g == s.getThreadGroup());
271 >                    else
272 >                        assertTrue(g == egroup);
273 >                    String name = current.getName();
274 >                    assertTrue(name.endsWith("thread-1"));
275 >                } catch (SecurityException ok) {
276 >                    // Also pass if not allowed to change setting
277                  }
278 <            };
278 >            }};
279          ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
280  
281          e.execute(r);
# Line 316 | Line 315 | public class ExecutorsTest extends JSR16
315                              assertTrue(g == egroup);
316                          String name = current.getName();
317                          assertTrue(name.endsWith("thread-1"));
318 <                        assertTrue(thisccl == current.getContextClassLoader());
319 <                        assertTrue(thisacc.equals(AccessController.getContext()));
318 >                        assertSame(thisccl, current.getContextClassLoader());
319 >                        assertEquals(thisacc, AccessController.getContext());
320                      }};
321                  ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
322                  e.execute(r);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines