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.196 by jsr166, Fri Jun 17 19:00:48 2016 UTC vs.
Revision 1.206 by jsr166, Tue Oct 25 01:32:55 2016 UTC

# Line 13 | Line 13
13   * @build *
14   * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
15   * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 -Djsr166.testImplementationDetails=true JSR166TestCase
16 + * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -Djava.util.secureRandomSeed=true JSR166TestCase
17   */
18  
19   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 40 | Line 41 | import java.security.ProtectionDomain;
41   import java.security.SecurityPermission;
42   import java.util.ArrayList;
43   import java.util.Arrays;
44 + import java.util.Collections;
45   import java.util.Date;
46   import java.util.Enumeration;
47   import java.util.Iterator;
# Line 61 | Line 63 | import java.util.concurrent.RejectedExec
63   import java.util.concurrent.Semaphore;
64   import java.util.concurrent.SynchronousQueue;
65   import java.util.concurrent.ThreadFactory;
66 + import java.util.concurrent.ThreadLocalRandom;
67   import java.util.concurrent.ThreadPoolExecutor;
68   import java.util.concurrent.TimeoutException;
69   import java.util.concurrent.atomic.AtomicBoolean;
# Line 444 | Line 447 | public class JSR166TestCase extends Test
447              AbstractQueuedLongSynchronizerTest.suite(),
448              ArrayBlockingQueueTest.suite(),
449              ArrayDequeTest.suite(),
450 +            ArrayListTest.suite(),
451              AtomicBooleanTest.suite(),
452              AtomicIntegerArrayTest.suite(),
453              AtomicIntegerFieldUpdaterTest.suite(),
# Line 466 | Line 470 | public class JSR166TestCase extends Test
470              CopyOnWriteArrayListTest.suite(),
471              CopyOnWriteArraySetTest.suite(),
472              CountDownLatchTest.suite(),
473 +            CountedCompleterTest.suite(),
474              CyclicBarrierTest.suite(),
475              DelayQueueTest.suite(),
476              EntryTest.suite(),
# Line 499 | Line 504 | public class JSR166TestCase extends Test
504          // Java8+ test classes
505          if (atLeastJava8()) {
506              String[] java8TestClassNames = {
507 +                "ArrayDeque8Test",
508                  "Atomic8Test",
509                  "CompletableFutureTest",
510                  "ConcurrentHashMap8Test",
511 <                "CountedCompleterTest",
511 >                "CountedCompleter8Test",
512                  "DoubleAccumulatorTest",
513                  "DoubleAdderTest",
514                  "ForkJoinPool8Test",
# Line 955 | Line 961 | public class JSR166TestCase extends Test
961          }
962      }
963  
964 <    /** Like Runnable, but with the freedom to throw anything */
964 >    /**
965 >     * Like Runnable, but with the freedom to throw anything.
966 >     * junit folks had the same idea:
967 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
968 >     */
969      interface Action { public void run() throws Throwable; }
970  
971      /**
# Line 998 | Line 1008 | public class JSR166TestCase extends Test
1008          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1009          System.err.println("------ stacktrace dump start ------");
1010          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1011 <            String name = info.getThreadName();
1011 >            final String name = info.getThreadName();
1012 >            String lockName;
1013              if ("Signal Dispatcher".equals(name))
1014                  continue;
1015              if ("Reference Handler".equals(name)
1016 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1016 >                && (lockName = info.getLockName()) != null
1017 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1018                  continue;
1019              if ("Finalizer".equals(name)
1020 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1020 >                && (lockName = info.getLockName()) != null
1021 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1022                  continue;
1023              if ("checkForWedgedTest".equals(name))
1024                  continue;
# Line 1230 | Line 1243 | public class JSR166TestCase extends Test
1243       * Sleeps until the given time has elapsed.
1244       * Throws AssertionFailedError if interrupted.
1245       */
1246 <    void sleep(long millis) {
1246 >    static void sleep(long millis) {
1247          try {
1248              delay(millis);
1249          } catch (InterruptedException fail) {
# Line 1246 | Line 1259 | public class JSR166TestCase extends Test
1259       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1260       */
1261      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1262 <        long startTime = System.nanoTime();
1262 >        long startTime = 0L;
1263          for (;;) {
1264              Thread.State s = thread.getState();
1265              if (s == Thread.State.BLOCKED ||
# Line 1255 | Line 1268 | public class JSR166TestCase extends Test
1268                  return;
1269              else if (s == Thread.State.TERMINATED)
1270                  fail("Unexpected thread termination");
1271 +            else if (startTime == 0L)
1272 +                startTime = System.nanoTime();
1273              else if (millisElapsedSince(startTime) > timeoutMillis) {
1274                  threadAssertTrue(thread.isAlive());
1275                  return;
# Line 1747 | Line 1762 | public class JSR166TestCase extends Test
1762       * A CyclicBarrier that uses timed await and fails with
1763       * AssertionFailedErrors instead of throwing checked exceptions.
1764       */
1765 <    public class CheckedBarrier extends CyclicBarrier {
1765 >    public static class CheckedBarrier extends CyclicBarrier {
1766          public CheckedBarrier(int parties) { super(parties); }
1767  
1768          public int await() {
# Line 1868 | Line 1883 | public class JSR166TestCase extends Test
1883                                 1000L, MILLISECONDS,
1884                                 new SynchronousQueue<Runnable>());
1885  
1886 +    static <T> void shuffle(T[] array) {
1887 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1888 +    }
1889   }

Diff Legend

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