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.190 by jsr166, Sat Mar 26 06:58:47 2016 UTC vs.
Revision 1.200 by jsr166, Wed Aug 10 01:28:14 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 519 | Line 524 | public class JSR166TestCase extends Test
524          // Java9+ test classes
525          if (atLeastJava9()) {
526              String[] java9TestClassNames = {
527 <                // Currently empty, but expecting varhandle tests
527 >                "AtomicBoolean9Test",
528 >                "AtomicInteger9Test",
529 >                "AtomicIntegerArray9Test",
530 >                "AtomicLong9Test",
531 >                "AtomicLongArray9Test",
532 >                "AtomicReference9Test",
533 >                "AtomicReferenceArray9Test",
534 >                "ExecutorCompletionService9Test",
535              };
536              addNamedTestClasses(suite, java9TestClassNames);
537          }
# Line 946 | Line 958 | public class JSR166TestCase extends Test
958          }
959      }
960  
961 <    /** Like Runnable, but with the freedom to throw anything */
961 >    /**
962 >     * Like Runnable, but with the freedom to throw anything.
963 >     * junit folks had the same idea:
964 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
965 >     */
966      interface Action { public void run() throws Throwable; }
967  
968      /**
# Line 977 | Line 993 | public class JSR166TestCase extends Test
993       * Uninteresting threads are filtered out.
994       */
995      static void dumpTestThreads() {
996 +        SecurityManager sm = System.getSecurityManager();
997 +        if (sm != null) {
998 +            try {
999 +                System.setSecurityManager(null);
1000 +            } catch (SecurityException giveUp) {
1001 +                return;
1002 +            }
1003 +        }
1004 +
1005          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1006          System.err.println("------ stacktrace dump start ------");
1007          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
# Line 994 | Line 1019 | public class JSR166TestCase extends Test
1019              System.err.print(info);
1020          }
1021          System.err.println("------ stacktrace dump end ------");
1022 +
1023 +        if (sm != null) System.setSecurityManager(sm);
1024      }
1025  
1026      /**
# Line 1226 | Line 1253 | public class JSR166TestCase extends Test
1253       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1254       */
1255      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1256 <        long startTime = System.nanoTime();
1256 >        long startTime = 0L;
1257          for (;;) {
1258              Thread.State s = thread.getState();
1259              if (s == Thread.State.BLOCKED ||
# Line 1235 | Line 1262 | public class JSR166TestCase extends Test
1262                  return;
1263              else if (s == Thread.State.TERMINATED)
1264                  fail("Unexpected thread termination");
1265 +            else if (startTime == 0L)
1266 +                startTime = System.nanoTime();
1267              else if (millisElapsedSince(startTime) > timeoutMillis) {
1268                  threadAssertTrue(thread.isAlive());
1269                  return;
# Line 1833 | Line 1862 | public class JSR166TestCase extends Test
1862          } catch (NoSuchElementException success) {}
1863          assertFalse(it.hasNext());
1864      }
1865 +
1866 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1867 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1868 +    }
1869 +
1870 +    public Runnable runnableThrowing(final RuntimeException ex) {
1871 +        return new Runnable() { public void run() { throw ex; }};
1872 +    }
1873 +
1874 +    /** A reusable thread pool to be shared by tests. */
1875 +    static final ExecutorService cachedThreadPool =
1876 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1877 +                               1000L, MILLISECONDS,
1878 +                               new SynchronousQueue<Runnable>());
1879 +
1880 +    static <T> void shuffle(T[] array) {
1881 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1882 +    }
1883   }

Diff Legend

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