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.188 by jsr166, Mon Feb 22 23:16:06 2016 UTC vs.
Revision 1.205 by jsr166, Mon Oct 17 17:52:30 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 184 | Line 189 | public class JSR166TestCase extends Test
189      private static final int suiteRuns =
190          Integer.getInteger("jsr166.suiteRuns", 1);
191  
192 <    private static float systemPropertyValue(String name, float defaultValue) {
192 >    /**
193 >     * Returns the value of the system property, or NaN if not defined.
194 >     */
195 >    private static float systemPropertyValue(String name) {
196          String floatString = System.getProperty(name);
197          if (floatString == null)
198 <            return defaultValue;
198 >            return Float.NaN;
199          try {
200              return Float.parseFloat(floatString);
201          } catch (NumberFormatException ex) {
# Line 199 | Line 207 | public class JSR166TestCase extends Test
207  
208      /**
209       * The scaling factor to apply to standard delays used in tests.
210 <     */
211 <    private static final float delayFactor =
212 <        systemPropertyValue("jsr166.delay.factor", 1.0f);
213 <
214 <    /**
215 <     * The timeout factor as used in the jtreg test harness.
216 <     * See: http://openjdk.java.net/jtreg/tag-spec.html
217 <     */
218 <    private static final float jtregTestTimeoutFactor
219 <        = systemPropertyValue("test.timeout.factor", 1.0f);
210 >     * May be initialized from any of:
211 >     * - the "jsr166.delay.factor" system property
212 >     * - the "test.timeout.factor" system property (as used by jtreg)
213 >     *   See: http://openjdk.java.net/jtreg/tag-spec.html
214 >     * - hard-coded fuzz factor when using a known slowpoke VM
215 >     */
216 >    private static final float delayFactor = delayFactor();
217 >
218 >    private static float delayFactor() {
219 >        float x;
220 >        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
221 >            return x;
222 >        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
223 >            return x;
224 >        String prop = System.getProperty("java.vm.version");
225 >        if (prop != null && prop.matches(".*debug.*"))
226 >            return 4.0f; // How much slower is fastdebug than product?!
227 >        return 1.0f;
228 >    }
229  
230      public JSR166TestCase() { super(); }
231      public JSR166TestCase(String name) { super(name); }
# Line 430 | 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 452 | 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 488 | Line 507 | public class JSR166TestCase extends Test
507                  "Atomic8Test",
508                  "CompletableFutureTest",
509                  "ConcurrentHashMap8Test",
510 <                "CountedCompleterTest",
510 >                "CountedCompleter8Test",
511                  "DoubleAccumulatorTest",
512                  "DoubleAdderTest",
513                  "ForkJoinPool8Test",
# Line 499 | Line 518 | public class JSR166TestCase extends Test
518                  "StampedLockTest",
519                  "SubmissionPublisherTest",
520                  "ThreadLocalRandom8Test",
521 +                "TimeUnit8Test",
522              };
523              addNamedTestClasses(suite, java8TestClassNames);
524          }
# Line 506 | Line 526 | public class JSR166TestCase extends Test
526          // Java9+ test classes
527          if (atLeastJava9()) {
528              String[] java9TestClassNames = {
529 <                // Currently empty, but expecting varhandle tests
529 >                "AtomicBoolean9Test",
530 >                "AtomicInteger9Test",
531 >                "AtomicIntegerArray9Test",
532 >                "AtomicLong9Test",
533 >                "AtomicLongArray9Test",
534 >                "AtomicReference9Test",
535 >                "AtomicReferenceArray9Test",
536 >                "ExecutorCompletionService9Test",
537              };
538              addNamedTestClasses(suite, java9TestClassNames);
539          }
# Line 589 | Line 616 | public class JSR166TestCase extends Test
616       * http://openjdk.java.net/jtreg/command-help.html
617       */
618      protected long getShortDelay() {
619 <        return (long) (50 * delayFactor * jtregTestTimeoutFactor);
619 >        return (long) (50 * delayFactor);
620      }
621  
622      /**
# Line 933 | 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 964 | Line 995 | public class JSR166TestCase extends Test
995       * Uninteresting threads are filtered out.
996       */
997      static void dumpTestThreads() {
998 +        SecurityManager sm = System.getSecurityManager();
999 +        if (sm != null) {
1000 +            try {
1001 +                System.setSecurityManager(null);
1002 +            } catch (SecurityException giveUp) {
1003 +                return;
1004 +            }
1005 +        }
1006 +
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;
1024              System.err.print(info);
1025          }
1026          System.err.println("------ stacktrace dump end ------");
1027 +
1028 +        if (sm != null) System.setSecurityManager(sm);
1029      }
1030  
1031      /**
# Line 1197 | 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 1213 | 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 1222 | 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 1714 | 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 1820 | Line 1867 | public class JSR166TestCase extends Test
1867          } catch (NoSuchElementException success) {}
1868          assertFalse(it.hasNext());
1869      }
1870 +
1871 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1872 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1873 +    }
1874 +
1875 +    public Runnable runnableThrowing(final RuntimeException ex) {
1876 +        return new Runnable() { public void run() { throw ex; }};
1877 +    }
1878 +
1879 +    /** A reusable thread pool to be shared by tests. */
1880 +    static final ExecutorService cachedThreadPool =
1881 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
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