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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.120 by jsr166, Wed Jun 25 15:32:10 2014 UTC vs.
Revision 1.122 by jsr166, Wed Dec 31 16:44:02 2014 UTC

# Line 22 | Line 22 | import java.util.List;
22   import java.util.NoSuchElementException;
23   import java.util.PropertyPermission;
24   import java.util.concurrent.*;
25 import java.util.concurrent.atomic.AtomicBoolean;
25   import java.util.concurrent.atomic.AtomicReference;
26   import static java.util.concurrent.TimeUnit.MILLISECONDS;
27   import static java.util.concurrent.TimeUnit.NANOSECONDS;
# Line 630 | Line 629 | public class JSR166TestCase extends Test
629      void joinPool(ExecutorService exec) {
630          try {
631              exec.shutdown();
632 <            assertTrue("ExecutorService did not terminate in a timely manner",
633 <                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
632 >            if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
633 >                fail("ExecutorService " + exec +
634 >                     " did not terminate in a timely manner");
635          } catch (SecurityException ok) {
636              // Allowed in case test doesn't have privs
637          } catch (InterruptedException ie) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines