--- jsr166/src/test/tck/JSR166TestCase.java 2015/10/09 01:26:36 1.172
+++ jsr166/src/test/tck/JSR166TestCase.java 2015/11/09 05:43:39 1.180
@@ -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
@@ -193,21 +192,27 @@ public class JSR166TestCase extends Test
// Instrumentation to debug very rare, but very annoying hung test runs.
static volatile TestCase currentTestCase;
- static volatile int currentRun = 0;
+ // static volatile int currentRun = 0;
static {
Runnable checkForWedgedTest = new Runnable() { public void run() {
- // avoid spurious reports with enormous runsPerTest
- final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
+ // Avoid spurious reports with enormous runsPerTest.
+ // A single test case run should never take more than 1 second.
+ // But let's cap it at the high end too ...
+ final int timeoutMinutes =
+ Math.min(15, Math.max(runsPerTest / 60, 1));
for (TestCase lastTestCase = currentTestCase;;) {
try { MINUTES.sleep(timeoutMinutes); }
catch (InterruptedException unexpected) { break; }
if (lastTestCase == currentTestCase) {
System.err.printf(
- "Looks like we're stuck running test: %s (%d/%d)%n",
- lastTestCase, currentRun, runsPerTest);
- System.err.println("availableProcessors=" +
- Runtime.getRuntime().availableProcessors());
- System.err.printf("cpu model = %s%n", cpuModel());
+ "Looks like we're stuck running test: %s%n",
+ lastTestCase);
+// System.err.printf(
+// "Looks like we're stuck running test: %s (%d/%d)%n",
+// lastTestCase, currentRun, runsPerTest);
+// System.err.println("availableProcessors=" +
+// Runtime.getRuntime().availableProcessors());
+// System.err.printf("cpu model = %s%n", cpuModel());
dumpTestThreads();
// one stack dump is probably enough; more would be spam
break;
@@ -219,15 +224,15 @@ public class JSR166TestCase extends Test
thread.start();
}
- public static String cpuModel() {
- try {
- Matcher matcher = Pattern.compile("model name\\s*: (.*)")
- .matcher(new String(
- Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
- matcher.find();
- return matcher.group(1);
- } catch (Exception ex) { return null; }
- }
+// public static String cpuModel() {
+// try {
+// Matcher matcher = Pattern.compile("model name\\s*: (.*)")
+// .matcher(new String(
+// Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
+// matcher.find();
+// return matcher.group(1);
+// } catch (Exception ex) { return null; }
+// }
public void runBare() throws Throwable {
currentTestCase = this;
@@ -238,7 +243,7 @@ public class JSR166TestCase extends Test
protected void runTest() throws Throwable {
for (int i = 0; i < runsPerTest; i++) {
- currentRun = i;
+ // currentRun = i;
if (profileTests)
runTestProfiled();
else
@@ -267,6 +272,34 @@ public class JSR166TestCase extends Test
main(suite(), args);
}
+ static class PithyResultPrinter extends junit.textui.ResultPrinter {
+ PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
+ long runTime;
+ public void startTest(Test test) {}
+ protected void printHeader(long runTime) {
+ this.runTime = runTime; // defer printing for later
+ }
+ protected void printFooter(TestResult result) {
+ if (result.wasSuccessful()) {
+ getWriter().println("OK (" + result.runCount() + " tests)"
+ + " Time: " + elapsedTimeAsString(runTime));
+ } else {
+ getWriter().println("Time: " + elapsedTimeAsString(runTime));
+ super.printFooter(result);
+ }
+ }
+ }
+
+ /**
+ * Returns a TestRunner that doesn't bother with unnecessary
+ * fluff, like printing a "." for each test case.
+ */
+ static junit.textui.TestRunner newPithyTestRunner() {
+ junit.textui.TestRunner runner = new junit.textui.TestRunner();
+ runner.setPrinter(new PithyResultPrinter(System.out));
+ return runner;
+ }
+
/**
* Runs all unit tests in the given test suite.
* Actual behavior influenced by jsr166.* system properties.
@@ -278,7 +311,7 @@ public class JSR166TestCase extends Test
System.setSecurityManager(new SecurityManager());
}
for (int i = 0; i < suiteRuns; i++) {
- TestResult result = junit.textui.TestRunner.run(suite);
+ TestResult result = newPithyTestRunner().doRun(suite);
if (!result.wasSuccessful())
System.exit(1);
System.gc();
@@ -1222,7 +1255,7 @@ public class JSR166TestCase extends Test
} finally {
if (t.getState() != Thread.State.TERMINATED) {
t.interrupt();
- threadFail("Test timed out");
+ threadFail("timed out waiting for thread to terminate");
}
}
}
@@ -1390,7 +1423,9 @@ public class JSR166TestCase extends Test
public void await(CountDownLatch latch) {
try {
- assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
+ if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
+ fail("timed out waiting for CountDownLatch for "
+ + (LONG_DELAY_MS/1000) + " sec");
} catch (Throwable fail) {
threadUnexpectedException(fail);
}
@@ -1398,7 +1433,9 @@ public class JSR166TestCase extends Test
public void await(Semaphore semaphore) {
try {
- assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
+ if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
+ fail("timed out waiting for Semaphore for "
+ + (LONG_DELAY_MS/1000) + " sec");
} catch (Throwable fail) {
threadUnexpectedException(fail);
}