Browse Source

Merge pull request #129 from simon04/appendElapsed

Extract LegacyPlainResultFormatter.Stats#appendElapsed
master
Stefan Bodewig GitHub 4 years ago
parent
commit
d32d5dc961
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 18 deletions
  1. +12
    -18
      src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java

+ 12
- 18
src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java View File

@@ -66,13 +66,8 @@ class LegacyPlainResultFormatter extends AbstractJUnitResultFormatter implements
sb.append(", Failures: ").append(stats.numTestsFailed.get());
sb.append(", Skipped: ").append(stats.numTestsSkipped.get());
sb.append(", Aborted: ").append(stats.numTestsAborted.get());
final long timeElapsed = stats.endedAt - stats.startedAt;
sb.append(", Time elapsed: ");
if (timeElapsed < 1000) {
sb.append(timeElapsed).append(" milli sec(s)");
} else {
sb.append(TimeUnit.SECONDS.convert(timeElapsed, TimeUnit.MILLISECONDS)).append(" sec(s)");
}
stats.appendElapsed(sb);
try {
this.writer.write(sb.toString());
this.writer.newLine();
@@ -117,13 +112,8 @@ class LegacyPlainResultFormatter extends AbstractJUnitResultFormatter implements
final StringBuilder sb = new StringBuilder();
sb.append("Test: ");
sb.append(testIdentifier.getLegacyReportingName());
final long timeElapsed = stats.endedAt - stats.startedAt;
sb.append(" took ");
if (timeElapsed < 1000) {
sb.append(timeElapsed).append(" milli sec(s)");
} else {
sb.append(TimeUnit.SECONDS.convert(timeElapsed, TimeUnit.MILLISECONDS)).append(" sec(s)");
}
stats.appendElapsed(sb);
sb.append(" SKIPPED");
if (reason != null && !reason.isEmpty()) {
sb.append(": ").append(reason);
@@ -187,13 +177,8 @@ class LegacyPlainResultFormatter extends AbstractJUnitResultFormatter implements
sb.append("Test: ");
sb.append(testIdentifier.getLegacyReportingName());
if (stats != null) {
final long timeElapsed = stats.endedAt - stats.startedAt;
sb.append(" took ");
if (timeElapsed < 1000) {
sb.append(timeElapsed).append(" milli sec(s)");
} else {
sb.append(TimeUnit.SECONDS.convert(timeElapsed, TimeUnit.MILLISECONDS)).append(" sec(s)");
}
stats.appendElapsed(sb);
}
switch (testExecutionResult.getStatus()) {
case ABORTED: {
@@ -286,5 +271,14 @@ class LegacyPlainResultFormatter extends AbstractJUnitResultFormatter implements
private void setEndedAt(final long endedAt) {
this.endedAt = endedAt;
}

private void appendElapsed(StringBuilder sb) {
final long timeElapsed = endedAt - startedAt;
if (timeElapsed < 1000) {
sb.append(timeElapsed).append(" milli sec(s)");
} else {
sb.append(TimeUnit.SECONDS.convert(timeElapsed, TimeUnit.MILLISECONDS)).append(" sec(s)");
}
}
}
}

Loading…
Cancel
Save