ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ExecutorsTest.java

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.47 by jsr166, Wed Jan 4 06:09:58 2017 UTC vs.
Revision 1.48 by jsr166, Sat Mar 18 20:42:20 2017 UTC

#	Line 306 | Line 306 | public class ExecutorsTest extends JSR16
306		public void realRun() {
307		try {
308		Thread current = Thread.currentThread();
309	<	assertTrue(!current.isDaemon());
309	>	assertFalse(current.isDaemon());
310		assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
311	–	ThreadGroup g = current.getThreadGroup();
311		SecurityManager s = System.getSecurityManager();
312	<	if (s != null)
313	<	assertTrue(g == s.getThreadGroup());
314	<	else
316	<	assertTrue(g == egroup);
317	<	String name = current.getName();
318	<	assertTrue(name.endsWith("thread-1"));
312	>	assertSame(current.getThreadGroup(),
313	>	(s == null) ? egroup : s.getThreadGroup());
314	>	assertTrue(current.getName().endsWith("thread-1"));
315		} catch (SecurityException ok) {
316		// Also pass if not allowed to change setting
317		}
#	Line 343 | Line 339 | public class ExecutorsTest extends JSR16
339		Runnable r = new CheckedRunnable() {
340		public void realRun() {
341		Thread current = Thread.currentThread();
342	<	assertTrue(!current.isDaemon());
342	>	assertFalse(current.isDaemon());
343		assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
348	–	ThreadGroup g = current.getThreadGroup();
344		SecurityManager s = System.getSecurityManager();
345	<	if (s != null)
346	<	assertTrue(g == s.getThreadGroup());
347	<	else
353	<	assertTrue(g == egroup);
354	<	String name = current.getName();
355	<	assertTrue(name.endsWith("thread-1"));
345	>	assertSame(current.getThreadGroup(),
346	>	(s == null) ? egroup : s.getThreadGroup());
347	>	assertTrue(current.getName().endsWith("thread-1"));
348		assertSame(thisccl, current.getContextClassLoader());
349		assertEquals(thisacc, AccessController.getContext());
350		done.countDown();

Diff Legend

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