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.205 by jsr166, Mon Oct 17 17:52:30 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 502 | Line 507 | public class JSR166TestCase extends Test
507                  "Atomic8Test",
508                  "CompletableFutureTest",
509                  "ConcurrentHashMap8Test",
510 <                "CountedCompleterTest",
510 >                "CountedCompleter8Test",
511                  "DoubleAccumulatorTest",
512                  "DoubleAdderTest",
513                  "ForkJoinPool8Test",
# Line 955 | Line 960 | public class JSR166TestCase extends Test
960          }
961      }
962  
963 <    /** Like Runnable, but with the freedom to throw anything */
963 >    /**
964 >     * Like Runnable, but with the freedom to throw anything.
965 >     * junit folks had the same idea:
966 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
967 >     */
968      interface Action { public void run() throws Throwable; }
969  
970      /**
# Line 998 | Line 1007 | public class JSR166TestCase extends Test
1007          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1008          System.err.println("------ stacktrace dump start ------");
1009          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1010 <            String name = info.getThreadName();
1010 >            final String name = info.getThreadName();
1011 >            String lockName;
1012              if ("Signal Dispatcher".equals(name))
1013                  continue;
1014              if ("Reference Handler".equals(name)
1015 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1015 >                && (lockName = info.getLockName()) != null
1016 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1017                  continue;
1018              if ("Finalizer".equals(name)
1019 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1019 >                && (lockName = info.getLockName()) != null
1020 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1021                  continue;
1022              if ("checkForWedgedTest".equals(name))
1023                  continue;
# Line 1230 | Line 1242 | public class JSR166TestCase extends Test
1242       * Sleeps until the given time has elapsed.
1243       * Throws AssertionFailedError if interrupted.
1244       */
1245 <    void sleep(long millis) {
1245 >    static void sleep(long millis) {
1246          try {
1247              delay(millis);
1248          } catch (InterruptedException fail) {
# Line 1246 | Line 1258 | public class JSR166TestCase extends Test
1258       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1259       */
1260      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1261 <        long startTime = System.nanoTime();
1261 >        long startTime = 0L;
1262          for (;;) {
1263              Thread.State s = thread.getState();
1264              if (s == Thread.State.BLOCKED ||
# Line 1255 | Line 1267 | public class JSR166TestCase extends Test
1267                  return;
1268              else if (s == Thread.State.TERMINATED)
1269                  fail("Unexpected thread termination");
1270 +            else if (startTime == 0L)
1271 +                startTime = System.nanoTime();
1272              else if (millisElapsedSince(startTime) > timeoutMillis) {
1273                  threadAssertTrue(thread.isAlive());
1274                  return;
# Line 1747 | Line 1761 | public class JSR166TestCase extends Test
1761       * A CyclicBarrier that uses timed await and fails with
1762       * AssertionFailedErrors instead of throwing checked exceptions.
1763       */
1764 <    public class CheckedBarrier extends CyclicBarrier {
1764 >    public static class CheckedBarrier extends CyclicBarrier {
1765          public CheckedBarrier(int parties) { super(parties); }
1766  
1767          public int await() {
# Line 1868 | Line 1882 | public class JSR166TestCase extends Test
1882                                 1000L, MILLISECONDS,
1883                                 new SynchronousQueue<Runnable>());
1884  
1885 +    static <T> void shuffle(T[] array) {
1886 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1887 +    }
1888   }

Diff Legend

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