--- jsr166/src/test/tck/JSR166TestCase.java 2015/10/23 21:59:58 1.179
+++ jsr166/src/test/tck/JSR166TestCase.java 2015/11/09 06:06:54 1.181
@@ -112,8 +112,7 @@ import junit.framework.TestSuite;
* methods as there are exceptions the method can throw. Sometimes
* there are multiple tests per JSR166 method when the different
* "normal" behaviors differ significantly. And sometimes testcases
- * cover multiple methods when they cannot be tested in
- * isolation.
+ * cover multiple methods when they cannot be tested in isolation.
*
*
The documentation style for testcases is to provide as javadoc
* a simple sentence or two describing the property that the testcase
@@ -176,6 +175,12 @@ public class JSR166TestCase extends Test
private static final int suiteRuns =
Integer.getInteger("jsr166.suiteRuns", 1);
+ /**
+ * The scaling factor to apply to standard delays used in tests.
+ */
+ private static final int delayFactor =
+ Integer.getInteger("jsr166.delay.factor", 1);
+
public JSR166TestCase() { super(); }
public JSR166TestCase(String name) { super(name); }
@@ -549,11 +554,11 @@ public class JSR166TestCase extends Test
public static long LONG_DELAY_MS;
/**
- * Returns the shortest timed delay. This could
- * be reimplemented to use for example a Property.
+ * Returns the shortest timed delay. This can be scaled up for
+ * slow machines using the jsr166.delay.factor system property.
*/
protected long getShortDelay() {
- return 50;
+ return 50 * delayFactor;
}
/**