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.179 by jsr166, Fri Oct 23 21:59:58 2015 UTC vs.
Revision 1.183 by jsr166, Sat Jan 23 20:15:28 2016 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 + /*
10 + * @test
11 + * @summary JSR-166 tck tests
12 + * @build *
13 + * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
14 + */
15 +
16   import static java.util.concurrent.TimeUnit.MILLISECONDS;
17   import static java.util.concurrent.TimeUnit.MINUTES;
18   import static java.util.concurrent.TimeUnit.NANOSECONDS;
# Line 112 | Line 119 | import junit.framework.TestSuite;
119   * methods as there are exceptions the method can throw. Sometimes
120   * there are multiple tests per JSR166 method when the different
121   * "normal" behaviors differ significantly. And sometimes testcases
122 < * cover multiple methods when they cannot be tested in
116 < * isolation.
122 > * cover multiple methods when they cannot be tested in isolation.
123   *
124   * <li>The documentation style for testcases is to provide as javadoc
125   * a simple sentence or two describing the property that the testcase
# Line 176 | Line 182 | public class JSR166TestCase extends Test
182      private static final int suiteRuns =
183          Integer.getInteger("jsr166.suiteRuns", 1);
184  
185 +    /**
186 +     * The scaling factor to apply to standard delays used in tests.
187 +     */
188 +    private static final int delayFactor =
189 +        Integer.getInteger("jsr166.delay.factor", 1);
190 +
191      public JSR166TestCase() { super(); }
192      public JSR166TestCase(String name) { super(name); }
193  
# Line 549 | Line 561 | public class JSR166TestCase extends Test
561      public static long LONG_DELAY_MS;
562  
563      /**
564 <     * Returns the shortest timed delay. This could
565 <     * be reimplemented to use for example a Property.
564 >     * Returns the shortest timed delay. This can be scaled up for
565 >     * slow machines using the jsr166.delay.factor system property.
566       */
567      protected long getShortDelay() {
568 <        return 50;
568 >        return 50 * delayFactor;
569      }
570  
571      /**

Diff Legend

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