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.206 by jsr166, Tue Oct 25 01:32:55 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 485 | 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 499 | Line 519 | public class JSR166TestCase extends Test
519                  "StampedLockTest",
520                  "SubmissionPublisherTest",
521                  "ThreadLocalRandom8Test",
522 +                "TimeUnit8Test",
523              };
524              addNamedTestClasses(suite, java8TestClassNames);
525          }
# Line 506 | Line 527 | public class JSR166TestCase extends Test
527          // Java9+ test classes
528          if (atLeastJava9()) {
529              String[] java9TestClassNames = {
530 <                // Currently empty, but expecting varhandle tests
530 >                "AtomicBoolean9Test",
531 >                "AtomicInteger9Test",
532 >                "AtomicIntegerArray9Test",
533 >                "AtomicLong9Test",
534 >                "AtomicLongArray9Test",
535 >                "AtomicReference9Test",
536 >                "AtomicReferenceArray9Test",
537 >                "ExecutorCompletionService9Test",
538              };
539              addNamedTestClasses(suite, java9TestClassNames);
540          }
# Line 589 | Line 617 | public class JSR166TestCase extends Test
617       * http://openjdk.java.net/jtreg/command-help.html
618       */
619      protected long getShortDelay() {
620 <        return (long) (50 * delayFactor * jtregTestTimeoutFactor);
620 >        return (long) (50 * delayFactor);
621      }
622  
623      /**
# Line 933 | 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 964 | Line 996 | public class JSR166TestCase extends Test
996       * Uninteresting threads are filtered out.
997       */
998      static void dumpTestThreads() {
999 +        SecurityManager sm = System.getSecurityManager();
1000 +        if (sm != null) {
1001 +            try {
1002 +                System.setSecurityManager(null);
1003 +            } catch (SecurityException giveUp) {
1004 +                return;
1005 +            }
1006 +        }
1007 +
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;
1025              System.err.print(info);
1026          }
1027          System.err.println("------ stacktrace dump end ------");
1028 +
1029 +        if (sm != null) System.setSecurityManager(sm);
1030      }
1031  
1032      /**
# Line 1197 | 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 1213 | 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 1222 | 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 1714 | 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 1820 | Line 1868 | public class JSR166TestCase extends Test
1868          } catch (NoSuchElementException success) {}
1869          assertFalse(it.hasNext());
1870      }
1871 +
1872 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1873 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1874 +    }
1875 +
1876 +    public Runnable runnableThrowing(final RuntimeException ex) {
1877 +        return new Runnable() { public void run() { throw ex; }};
1878 +    }
1879 +
1880 +    /** A reusable thread pool to be shared by tests. */
1881 +    static final ExecutorService cachedThreadPool =
1882 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
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