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.150 by jsr166, Sat Oct 3 19:08:13 2015 UTC vs.
Revision 1.156 by jsr166, Sat Oct 3 21:09:42 2015 UTC

# Line 7 | Line 7
7   */
8  
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.MINUTES;
11   import static java.util.concurrent.TimeUnit.NANOSECONDS;
12  
13   import java.io.ByteArrayInputStream;
# Line 187 | Line 188 | public class JSR166TestCase extends Test
188          return (regex == null) ? null : Pattern.compile(regex);
189      }
190  
191 +    static volatile TestCase currentTestCase;
192 +    static {
193 +        Runnable checkForWedgedTest = new Runnable() { public void run() {
194 +            for (TestCase lastTestCase = currentTestCase;;) {
195 +                try { MINUTES.sleep(10); }
196 +                catch (InterruptedException unexpected) { break; }
197 +                if (lastTestCase == currentTestCase) {
198 +                    System.err.println
199 +                        ("Looks like we're stuck running test: "
200 +                         + lastTestCase);
201 +                    dumpTestThreads();
202 +                }
203 +                lastTestCase = currentTestCase;
204 +            }}};
205 +        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
206 +        thread.setDaemon(true);
207 +        thread.start();
208 +    }
209 +
210      public void runBare() throws Throwable {
211 +        currentTestCase = this;
212          if (methodFilter == null
213              || methodFilter.matcher(toString()).find())
214              super.runBare();
# Line 461 | Line 482 | public class JSR166TestCase extends Test
482          } else {
483              return new TestSuite();
484          }
464 –
485      }
486  
487      // Delays for timing-dependent tests, in milliseconds.
# Line 519 | Line 539 | public class JSR166TestCase extends Test
539       * the same test have no effect.
540       */
541      public void threadRecordFailure(Throwable t) {
542 +        dumpTestThreads();
543          threadFailure.compareAndSet(null, t);
544      }
545  
# Line 529 | Line 550 | public class JSR166TestCase extends Test
550      void tearDownFail(String format, Object... args) {
551          String msg = toString() + ": " + String.format(format, args);
552          System.err.println(msg);
553 <        printAllStackTraces();
553 >        dumpTestThreads();
554          throw new AssertionFailedError(msg);
555      }
556  
# Line 598 | Line 619 | public class JSR166TestCase extends Test
619              fail(reason);
620          } catch (AssertionFailedError t) {
621              threadRecordFailure(t);
622 <            fail(reason);
622 >            throw t;
623          }
624      }
625  
# Line 778 | Line 799 | public class JSR166TestCase extends Test
799       * necessarily individually slow because they must block.
800       */
801      void testInParallel(Action ... actions) {
802 <        ExecutorService pool = Executors.newCachedThreadPool();
803 <        try {
802 >        try (PoolCloser<ExecutorService> poolCloser
803 >             = new PoolCloser<>(Executors.newCachedThreadPool())) {
804 >            ExecutorService pool = poolCloser.pool;
805              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
806              for (final Action action : actions)
807                  futures.add(pool.submit(new CheckedRunnable() {
# Line 792 | Line 814 | public class JSR166TestCase extends Test
814                  } catch (Exception ex) {
815                      threadUnexpectedException(ex);
816                  }
795 –        } finally {
796 –            joinPool(pool);
817          }
818      }
819  
820      /**
821 <     * A debugging tool to print all stack traces, as jstack does.
821 >     * A debugging tool to print stack traces of most threads, as jstack does.
822       * Uninteresting threads are filtered out.
823       */
824 <    static void printAllStackTraces() {
824 >    static void dumpTestThreads() {
825          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
826          System.err.println("------ stacktrace dump start ------");
827          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
# Line 814 | Line 834 | public class JSR166TestCase extends Test
834              if ("Finalizer".equals(name)
835                  && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
836                  continue;
837 +            if ("checkForWedgedTest".equals(name))
838 +                continue;
839              System.err.print(info);
840          }
841          System.err.println("------ stacktrace dump end ------");

Diff Legend

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