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.189 by jsr166, Fri Mar 4 21:00:45 2016 UTC vs.
Revision 1.204 by jsr166, Sat Oct 15 18:51:12 2016 UTC

# Line 12 | Line 12
12   * @modules java.management
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 39 | 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 58 | Line 61 | import java.util.concurrent.RecursiveAct
61   import java.util.concurrent.RecursiveTask;
62   import java.util.concurrent.RejectedExecutionHandler;
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 464 | 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 500 | Line 506 | public class JSR166TestCase extends Test
506                  "Atomic8Test",
507                  "CompletableFutureTest",
508                  "ConcurrentHashMap8Test",
509 <                "CountedCompleterTest",
509 >                "CountedCompleter8Test",
510                  "DoubleAccumulatorTest",
511                  "DoubleAdderTest",
512                  "ForkJoinPool8Test",
# Line 511 | Line 517 | public class JSR166TestCase extends Test
517                  "StampedLockTest",
518                  "SubmissionPublisherTest",
519                  "ThreadLocalRandom8Test",
520 +                "TimeUnit8Test",
521              };
522              addNamedTestClasses(suite, java8TestClassNames);
523          }
# Line 518 | Line 525 | public class JSR166TestCase extends Test
525          // Java9+ test classes
526          if (atLeastJava9()) {
527              String[] java9TestClassNames = {
528 <                // Currently empty, but expecting varhandle tests
528 >                "AtomicBoolean9Test",
529 >                "AtomicInteger9Test",
530 >                "AtomicIntegerArray9Test",
531 >                "AtomicLong9Test",
532 >                "AtomicLongArray9Test",
533 >                "AtomicReference9Test",
534 >                "AtomicReferenceArray9Test",
535 >                "ExecutorCompletionService9Test",
536              };
537              addNamedTestClasses(suite, java9TestClassNames);
538          }
# Line 945 | Line 959 | public class JSR166TestCase extends Test
959          }
960      }
961  
962 <    /** Like Runnable, but with the freedom to throw anything */
962 >    /**
963 >     * Like Runnable, but with the freedom to throw anything.
964 >     * junit folks had the same idea:
965 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
966 >     */
967      interface Action { public void run() throws Throwable; }
968  
969      /**
# Line 976 | Line 994 | public class JSR166TestCase extends Test
994       * Uninteresting threads are filtered out.
995       */
996      static void dumpTestThreads() {
997 +        SecurityManager sm = System.getSecurityManager();
998 +        if (sm != null) {
999 +            try {
1000 +                System.setSecurityManager(null);
1001 +            } catch (SecurityException giveUp) {
1002 +                return;
1003 +            }
1004 +        }
1005 +
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;
1023              System.err.print(info);
1024          }
1025          System.err.println("------ stacktrace dump end ------");
1026 +
1027 +        if (sm != null) System.setSecurityManager(sm);
1028      }
1029  
1030      /**
# Line 1209 | 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 1225 | Line 1257 | public class JSR166TestCase extends Test
1257       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1258       */
1259      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1260 <        long startTime = System.nanoTime();
1260 >        long startTime = 0L;
1261          for (;;) {
1262              Thread.State s = thread.getState();
1263              if (s == Thread.State.BLOCKED ||
# Line 1234 | Line 1266 | public class JSR166TestCase extends Test
1266                  return;
1267              else if (s == Thread.State.TERMINATED)
1268                  fail("Unexpected thread termination");
1269 +            else if (startTime == 0L)
1270 +                startTime = System.nanoTime();
1271              else if (millisElapsedSince(startTime) > timeoutMillis) {
1272                  threadAssertTrue(thread.isAlive());
1273                  return;
# Line 1726 | 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() {
# Line 1832 | Line 1866 | public class JSR166TestCase extends Test
1866          } catch (NoSuchElementException success) {}
1867          assertFalse(it.hasNext());
1868      }
1869 +
1870 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1871 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1872 +    }
1873 +
1874 +    public Runnable runnableThrowing(final RuntimeException ex) {
1875 +        return new Runnable() { public void run() { throw ex; }};
1876 +    }
1877 +
1878 +    /** A reusable thread pool to be shared by tests. */
1879 +    static final ExecutorService cachedThreadPool =
1880 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1881 +                               1000L, MILLISECONDS,
1882 +                               new SynchronousQueue<Runnable>());
1883 +
1884 +    static <T> void shuffle(T[] array) {
1885 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1886 +    }
1887   }

Diff Legend

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