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.193 by jsr166, Mon May 23 18:19:48 2016 UTC

# Line 58 | Line 58 | import java.util.concurrent.RecursiveAct
58   import java.util.concurrent.RecursiveTask;
59   import java.util.concurrent.RejectedExecutionHandler;
60   import java.util.concurrent.Semaphore;
61 + import java.util.concurrent.SynchronousQueue;
62   import java.util.concurrent.ThreadFactory;
63   import java.util.concurrent.ThreadPoolExecutor;
64   import java.util.concurrent.TimeoutException;
# Line 184 | Line 185 | public class JSR166TestCase extends Test
185      private static final int suiteRuns =
186          Integer.getInteger("jsr166.suiteRuns", 1);
187  
188 <    private static float systemPropertyValue(String name, float defaultValue) {
188 >    /**
189 >     * Returns the value of the system property, or NaN if not defined.
190 >     */
191 >    private static float systemPropertyValue(String name) {
192          String floatString = System.getProperty(name);
193          if (floatString == null)
194 <            return defaultValue;
194 >            return Float.NaN;
195          try {
196              return Float.parseFloat(floatString);
197          } catch (NumberFormatException ex) {
# Line 199 | Line 203 | public class JSR166TestCase extends Test
203  
204      /**
205       * The scaling factor to apply to standard delays used in tests.
206 <     */
207 <    private static final float delayFactor =
208 <        systemPropertyValue("jsr166.delay.factor", 1.0f);
209 <
210 <    /**
211 <     * The timeout factor as used in the jtreg test harness.
212 <     * See: http://openjdk.java.net/jtreg/tag-spec.html
213 <     */
214 <    private static final float jtregTestTimeoutFactor
215 <        = systemPropertyValue("test.timeout.factor", 1.0f);
206 >     * May be initialized from any of:
207 >     * - the "jsr166.delay.factor" system property
208 >     * - the "test.timeout.factor" system property (as used by jtreg)
209 >     *   See: http://openjdk.java.net/jtreg/tag-spec.html
210 >     * - hard-coded fuzz factor when using a known slowpoke VM
211 >     */
212 >    private static final float delayFactor = delayFactor();
213 >
214 >    private static float delayFactor() {
215 >        float x;
216 >        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
217 >            return x;
218 >        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
219 >            return x;
220 >        String prop = System.getProperty("java.vm.version");
221 >        if (prop != null && prop.matches(".*debug.*"))
222 >            return 4.0f; // How much slower is fastdebug than product?!
223 >        return 1.0f;
224 >    }
225  
226      public JSR166TestCase() { super(); }
227      public JSR166TestCase(String name) { super(name); }
# Line 499 | Line 512 | public class JSR166TestCase extends Test
512                  "StampedLockTest",
513                  "SubmissionPublisherTest",
514                  "ThreadLocalRandom8Test",
515 +                "TimeUnit8Test",
516              };
517              addNamedTestClasses(suite, java8TestClassNames);
518          }
# Line 506 | Line 520 | public class JSR166TestCase extends Test
520          // Java9+ test classes
521          if (atLeastJava9()) {
522              String[] java9TestClassNames = {
523 <                // Currently empty, but expecting varhandle tests
523 >                "ExecutorCompletionService9Test",
524              };
525              addNamedTestClasses(suite, java9TestClassNames);
526          }
# Line 589 | Line 603 | public class JSR166TestCase extends Test
603       * http://openjdk.java.net/jtreg/command-help.html
604       */
605      protected long getShortDelay() {
606 <        return (long) (50 * delayFactor * jtregTestTimeoutFactor);
606 >        return (long) (50 * delayFactor);
607      }
608  
609      /**
# Line 1466 | Line 1480 | public class JSR166TestCase extends Test
1480          return new LatchAwaiter(latch);
1481      }
1482  
1483 <    public void await(CountDownLatch latch) {
1483 >    public void await(CountDownLatch latch, long timeoutMillis) {
1484          try {
1485 <            if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1485 >            if (!latch.await(timeoutMillis, MILLISECONDS))
1486                  fail("timed out waiting for CountDownLatch for "
1487 <                     + (LONG_DELAY_MS/1000) + " sec");
1487 >                     + (timeoutMillis/1000) + " sec");
1488          } catch (Throwable fail) {
1489              threadUnexpectedException(fail);
1490          }
1491      }
1492  
1493 +    public void await(CountDownLatch latch) {
1494 +        await(latch, LONG_DELAY_MS);
1495 +    }
1496 +
1497      public void await(Semaphore semaphore) {
1498          try {
1499              if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
# Line 1816 | Line 1834 | public class JSR166TestCase extends Test
1834          } catch (NoSuchElementException success) {}
1835          assertFalse(it.hasNext());
1836      }
1837 +
1838 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1839 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1840 +    }
1841 +
1842 +    public Runnable runnableThrowing(final RuntimeException ex) {
1843 +        return new Runnable() { public void run() { throw ex; }};
1844 +    }
1845 +
1846 +    /** A reusable thread pool to be shared by tests. */
1847 +    static final ExecutorService cachedThreadPool =
1848 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1849 +                               1000L, MILLISECONDS,
1850 +                               new SynchronousQueue<Runnable>());
1851 +
1852   }

Diff Legend

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