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.200 by jsr166, Wed Aug 10 01:28:14 2016 UTC vs.
Revision 1.204 by jsr166, Sat Oct 15 18:51:12 2016 UTC

# Line 469 | Line 469 | public class JSR166TestCase extends Test
469              CopyOnWriteArrayListTest.suite(),
470              CopyOnWriteArraySetTest.suite(),
471              CountDownLatchTest.suite(),
472 +            CountedCompleterTest.suite(),
473              CyclicBarrierTest.suite(),
474              DelayQueueTest.suite(),
475              EntryTest.suite(),
# Line 505 | Line 506 | public class JSR166TestCase extends Test
506                  "Atomic8Test",
507                  "CompletableFutureTest",
508                  "ConcurrentHashMap8Test",
509 <                "CountedCompleterTest",
509 >                "CountedCompleter8Test",
510                  "DoubleAccumulatorTest",
511                  "DoubleAdderTest",
512                  "ForkJoinPool8Test",
# Line 1005 | Line 1006 | public class JSR166TestCase extends Test
1006          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1007          System.err.println("------ stacktrace dump start ------");
1008          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1009 <            String name = info.getThreadName();
1009 >            final String name = info.getThreadName();
1010 >            String lockName;
1011              if ("Signal Dispatcher".equals(name))
1012                  continue;
1013              if ("Reference Handler".equals(name)
1014 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1014 >                && (lockName = info.getLockName()) != null
1015 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1016                  continue;
1017              if ("Finalizer".equals(name)
1018 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1018 >                && (lockName = info.getLockName()) != null
1019 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1020                  continue;
1021              if ("checkForWedgedTest".equals(name))
1022                  continue;
# Line 1237 | Line 1241 | public class JSR166TestCase extends Test
1241       * Sleeps until the given time has elapsed.
1242       * Throws AssertionFailedError if interrupted.
1243       */
1244 <    void sleep(long millis) {
1244 >    static void sleep(long millis) {
1245          try {
1246              delay(millis);
1247          } catch (InterruptedException fail) {
# Line 1756 | Line 1760 | public class JSR166TestCase extends Test
1760       * A CyclicBarrier that uses timed await and fails with
1761       * AssertionFailedErrors instead of throwing checked exceptions.
1762       */
1763 <    public class CheckedBarrier extends CyclicBarrier {
1763 >    public static class CheckedBarrier extends CyclicBarrier {
1764          public CheckedBarrier(int parties) { super(parties); }
1765  
1766          public int await() {

Diff Legend

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