ViewVC Help

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

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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.53 by jsr166, Thu Sep 16 00:52:49 2010 UTC vs.
Revision 1.55 by jsr166, Mon Sep 20 20:42:37 2010 UTC

#	Line 383 | Line 383 | public class JSR166TestCase extends Test
383		AssertionError ae = new AssertionError("unexpected exception: " + t);
384		t.initCause(t);
385		throw ae;
386	<	}
386	>	}
387		}
388
389		/**
#	Line 392 | Line 392 | public class JSR166TestCase extends Test
392		public void joinPool(ExecutorService exec) {
393		try {
394		exec.shutdown();
395	<	assertTrue(exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
395	>	assertTrue("ExecutorService did not terminate in a timely manner",
396	>	exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
397		} catch (SecurityException ok) {
398		// Allowed in case test doesn't have privs
399		} catch (InterruptedException ie) {

Diff Legend

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