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.160 by jsr166, Sun Oct 4 00:59:09 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 +            // avoid spurious reports with enormous runsPerTest
195 +            final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
196 +            for (TestCase lastTestCase = currentTestCase;;) {
197 +                try { MINUTES.sleep(timeoutMinutes); }
198 +                catch (InterruptedException unexpected) { break; }
199 +                if (lastTestCase == currentTestCase) {
200 +                    System.err.println
201 +                        ("Looks like we're stuck running test: "
202 +                         + lastTestCase);
203 +                    dumpTestThreads();
204 +                }
205 +                lastTestCase = currentTestCase;
206 +            }}};
207 +        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
208 +        thread.setDaemon(true);
209 +        thread.start();
210 +    }
211 +
212      public void runBare() throws Throwable {
213 +        currentTestCase = this;
214          if (methodFilter == null
215              || methodFilter.matcher(toString()).find())
216              super.runBare();
# Line 461 | Line 484 | public class JSR166TestCase extends Test
484          } else {
485              return new TestSuite();
486          }
464 –
487      }
488  
489      // Delays for timing-dependent tests, in milliseconds.
# Line 519 | Line 541 | public class JSR166TestCase extends Test
541       * the same test have no effect.
542       */
543      public void threadRecordFailure(Throwable t) {
544 +        System.err.println(t);
545 +        dumpTestThreads();
546          threadFailure.compareAndSet(null, t);
547      }
548  
# Line 529 | Line 553 | public class JSR166TestCase extends Test
553      void tearDownFail(String format, Object... args) {
554          String msg = toString() + ": " + String.format(format, args);
555          System.err.println(msg);
556 <        printAllStackTraces();
556 >        dumpTestThreads();
557          throw new AssertionFailedError(msg);
558      }
559  
# Line 598 | Line 622 | public class JSR166TestCase extends Test
622              fail(reason);
623          } catch (AssertionFailedError t) {
624              threadRecordFailure(t);
625 <            fail(reason);
625 >            throw t;
626          }
627      }
628  
# Line 746 | Line 770 | public class JSR166TestCase extends Test
770      /**
771       * Allows use of try-with-resources with per-test thread pools.
772       */
773 <    static class PoolCloser<T extends ExecutorService>
774 <            implements AutoCloseable {
775 <        public final T pool;
752 <        public PoolCloser(T pool) { this.pool = pool; }
773 >    class PoolCleaner implements AutoCloseable {
774 >        private final ExecutorService pool;
775 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
776          public void close() { joinPool(pool); }
777      }
778  
779 +    PoolCleaner cleaner(ExecutorService pool) {
780 +        return new PoolCleaner(pool);
781 +    }
782 +
783      /**
784       * Waits out termination of a thread pool or fails doing so.
785       */
786 <    static void joinPool(ExecutorService pool) {
786 >    void joinPool(ExecutorService pool) {
787          try {
788              pool.shutdown();
789 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
790 <                fail("ExecutorService " + pool +
791 <                     " did not terminate in a timely manner");
789 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
790 >                try {
791 >                    threadFail("ExecutorService " + pool +
792 >                               " did not terminate in a timely manner");
793 >                } finally {
794 >                    // last resort, for the benefit of subsequent tests
795 >                    pool.shutdownNow();
796 >                    pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
797 >                }
798 >            }
799          } catch (SecurityException ok) {
800              // Allowed in case test doesn't have privs
801          } catch (InterruptedException fail) {
802 <            fail("Unexpected InterruptedException");
802 >            threadFail("Unexpected InterruptedException");
803          }
804      }
805  
# Line 779 | Line 813 | public class JSR166TestCase extends Test
813       */
814      void testInParallel(Action ... actions) {
815          ExecutorService pool = Executors.newCachedThreadPool();
816 <        try {
816 >        try (PoolCleaner cleaner = cleaner(pool)) {
817              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
818              for (final Action action : actions)
819                  futures.add(pool.submit(new CheckedRunnable() {
# Line 792 | Line 826 | public class JSR166TestCase extends Test
826                  } catch (Exception ex) {
827                      threadUnexpectedException(ex);
828                  }
795 –        } finally {
796 –            joinPool(pool);
829          }
830      }
831  
832      /**
833 <     * A debugging tool to print all stack traces, as jstack does.
833 >     * A debugging tool to print stack traces of most threads, as jstack does.
834       * Uninteresting threads are filtered out.
835       */
836 <    static void printAllStackTraces() {
836 >    static void dumpTestThreads() {
837          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
838          System.err.println("------ stacktrace dump start ------");
839          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
# Line 814 | Line 846 | public class JSR166TestCase extends Test
846              if ("Finalizer".equals(name)
847                  && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
848                  continue;
849 +            if ("checkForWedgedTest".equals(name))
850 +                continue;
851              System.err.print(info);
852          }
853          System.err.println("------ stacktrace dump end ------");
# Line 836 | Line 870 | public class JSR166TestCase extends Test
870              delay(millis);
871              assertTrue(thread.isAlive());
872          } catch (InterruptedException fail) {
873 <            fail("Unexpected InterruptedException");
873 >            threadFail("Unexpected InterruptedException");
874          }
875      }
876  
# Line 858 | Line 892 | public class JSR166TestCase extends Test
892              for (Thread thread : threads)
893                  assertTrue(thread.isAlive());
894          } catch (InterruptedException fail) {
895 <            fail("Unexpected InterruptedException");
895 >            threadFail("Unexpected InterruptedException");
896          }
897      }
898  

Diff Legend

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