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.20 by jsr166, Wed Aug 5 00:40:11 2009 UTC vs.
Revision 1.21 by jsr166, Mon Nov 16 04:57:10 2009 UTC

#	Line 91 | Line 91 | public class ExecutorsTest extends JSR16
91		ExecutorService e = Executors.newCachedThreadPool(null);
92		shouldThrow();
93		}
94	<	catch(NullPointerException success) {
94	>	catch (NullPointerException success) {
95		}
96		}
97
#	Line 126 | Line 126 | public class ExecutorsTest extends JSR16
126		ExecutorService e = Executors.newSingleThreadExecutor(null);
127		shouldThrow();
128		}
129	<	catch(NullPointerException success) {
129	>	catch (NullPointerException success) {
130		}
131		}
132
#	Line 174 | Line 174 | public class ExecutorsTest extends JSR16
174		ExecutorService e = Executors.newFixedThreadPool(2, null);
175		shouldThrow();
176		}
177	<	catch(NullPointerException success) {
177	>	catch (NullPointerException success) {
178		}
179		}
180
#	Line 186 | Line 186 | public class ExecutorsTest extends JSR16
186		ExecutorService e = Executors.newFixedThreadPool(0);
187		shouldThrow();
188		}
189	<	catch(IllegalArgumentException success) {
189	>	catch (IllegalArgumentException success) {
190		}
191		}
192
#	Line 238 | Line 238 | public class ExecutorsTest extends JSR16
238		assertTrue(callable.done);
239		assertEquals(Boolean.TRUE, f.get());
240		joinPool(p1);
241	<	} catch(RejectedExecutionException e){}
242	<	catch(Exception e){
241	>	} catch (RejectedExecutionException e){}
242	>	catch (Exception e){
243		e.printStackTrace();
244		unexpectedException();
245		}
#	Line 258 | Line 258 | public class ExecutorsTest extends JSR16
258		assertTrue(callable.done);
259		assertEquals(Boolean.TRUE, f.get());
260		joinPool(p1);
261	<	} catch(RejectedExecutionException e){}
262	<	catch(Exception e){
261	>	} catch (RejectedExecutionException e){}
262	>	catch (Exception e){
263		e.printStackTrace();
264		unexpectedException();
265		}
#	Line 278 | Line 278 | public class ExecutorsTest extends JSR16
278		assertTrue(callable.done);
279		assertEquals(Boolean.TRUE, f.get());
280		joinPool(p1);
281	<	} catch(RejectedExecutionException e){}
282	<	catch(Exception e){
281	>	} catch (RejectedExecutionException e){}
282	>	catch (Exception e){
283		e.printStackTrace();
284		unexpectedException();
285		}
#	Line 356 | Line 356 | public class ExecutorsTest extends JSR16
356		e.execute(r);
357		try {
358		e.shutdown();
359	<	} catch(SecurityException ok) {
359	>	} catch (SecurityException ok) {
360		}
361
362		try {
#	Line 403 | Line 403 | public class ExecutorsTest extends JSR16
403		threadAssertTrue(name.endsWith("thread-1"));
404		threadAssertTrue(thisccl == current.getContextClassLoader());
405		threadAssertTrue(thisacc.equals(AccessController.getContext()));
406	<	} catch(SecurityException ok) {
406	>	} catch (SecurityException ok) {
407		// Also pass if not allowed to change settings
408		}
409		}
#	Line 414 | Line 414 | public class ExecutorsTest extends JSR16
414		e.execute(r);
415		try {
416		e.shutdown();
417	<	} catch(SecurityException ok) {
417	>	} catch (SecurityException ok) {
418		}
419		try {
420		Thread.sleep(SHORT_DELAY_MS);
#	Line 462 | Line 462 | public class ExecutorsTest extends JSR16
462		// too many privileges to test; so return
463		Policy.setPolicy(savedPolicy);
464		return;
465	<	} catch(AccessControlException ok) {
465	>	} catch (AccessControlException ok) {
466		}
467
468		try {
469		Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
470		shouldThrow();
471	<	} catch(AccessControlException success) {
472	<	} catch(Exception ex) {
471	>	} catch (AccessControlException success) {
472	>	} catch (Exception ex) {
473		unexpectedException();
474		}
475		finally {
#	Line 496 | Line 496 | public class ExecutorsTest extends JSR16
496		try {
497		Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
498		task.call();
499	<	} catch(Exception ex) {
499	>	} catch (Exception ex) {
500		unexpectedException();
501		}
502		finally {
#	Line 532 | Line 532 | public class ExecutorsTest extends JSR16
532		}}, noprivAcc);
533		// too many permssions; skip test
534		return;
535	<	} catch(AccessControlException ok) {
535	>	} catch (AccessControlException ok) {
536		}
537
538		try {
539		task.call();
540		shouldThrow();
541	<	} catch(AccessControlException success) {
542	<	} catch(Exception ex) {
541	>	} catch (AccessControlException success) {
542	>	} catch (Exception ex) {
543		unexpectedException();
544		}
545		}
#	Line 562 | Line 562 | public class ExecutorsTest extends JSR16
562		Callable task = Executors.privilegedCallable(new CheckCCL());
563		try {
564		task.call();
565	<	} catch(Exception ex) {
565	>	} catch (Exception ex) {
566		unexpectedException();
567		} finally {
568		Policy.setPolicy(savedPolicy);
#	Line 576 | Line 576 | public class ExecutorsTest extends JSR16
576		try {
577		Callable c = Executors.callable(new NoOpRunnable());
578		assertNull(c.call());
579	<	} catch(Exception ex) {
579	>	} catch (Exception ex) {
580		unexpectedException();
581		}
582
#	Line 589 | Line 589 | public class ExecutorsTest extends JSR16
589		try {
590		Callable c = Executors.callable(new NoOpRunnable(), one);
591		assertEquals(one, c.call());
592	<	} catch(Exception ex) {
592	>	} catch (Exception ex) {
593		unexpectedException();
594		}
595		}
#	Line 602 | Line 602 | public class ExecutorsTest extends JSR16
602		Callable c = Executors.callable(new PrivilegedAction() {
603		public Object run() { return one; }});
604		assertEquals(one, c.call());
605	<	} catch(Exception ex) {
605	>	} catch (Exception ex) {
606		unexpectedException();
607		}
608		}
#	Line 615 | Line 615 | public class ExecutorsTest extends JSR16
615		Callable c = Executors.callable(new PrivilegedExceptionAction() {
616		public Object run() { return one; }});
617		assertEquals(one, c.call());
618	<	} catch(Exception ex) {
618	>	} catch (Exception ex) {
619		unexpectedException();
620		}
621		}

Diff Legend

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