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.187 by jsr166, Mon Feb 22 20:41:59 2016 UTC vs.
Revision 1.201 by jsr166, Sun Aug 28 18:10:37 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 499 | Line 516 | public class JSR166TestCase extends Test
516                  "StampedLockTest",
517                  "SubmissionPublisherTest",
518                  "ThreadLocalRandom8Test",
519 +                "TimeUnit8Test",
520              };
521              addNamedTestClasses(suite, java8TestClassNames);
522          }
# Line 506 | 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 589 | Line 614 | public class JSR166TestCase extends Test
614       * http://openjdk.java.net/jtreg/command-help.html
615       */
616      protected long getShortDelay() {
617 <        return (long) (50 * delayFactor * jtregTestTimeoutFactor);
617 >        return (long) (50 * delayFactor);
618      }
619  
620      /**
# Line 933 | 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 964 | 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 981 | 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 1197 | Line 1237 | public class JSR166TestCase extends Test
1237       * Sleeps until the given time has elapsed.
1238       * Throws AssertionFailedError if interrupted.
1239       */
1240 <    void sleep(long millis) {
1240 >    static void sleep(long millis) {
1241          try {
1242              delay(millis);
1243          } catch (InterruptedException fail) {
# Line 1213 | 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 1222 | 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 1466 | Line 1508 | public class JSR166TestCase extends Test
1508          return new LatchAwaiter(latch);
1509      }
1510  
1511 <    public void await(CountDownLatch latch) {
1511 >    public void await(CountDownLatch latch, long timeoutMillis) {
1512          try {
1513 <            if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1513 >            if (!latch.await(timeoutMillis, MILLISECONDS))
1514                  fail("timed out waiting for CountDownLatch for "
1515 <                     + (LONG_DELAY_MS/1000) + " sec");
1515 >                     + (timeoutMillis/1000) + " sec");
1516          } catch (Throwable fail) {
1517              threadUnexpectedException(fail);
1518          }
1519      }
1520  
1521 +    public void await(CountDownLatch latch) {
1522 +        await(latch, LONG_DELAY_MS);
1523 +    }
1524 +
1525      public void await(Semaphore semaphore) {
1526          try {
1527              if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
# Line 1816 | 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