You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2020/07/29 13:05:56 UTC
[ant] branch master updated: Extract
LegacyPlainResultFormatter.Stats#appendElapsed
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
The following commit(s) were added to refs/heads/master by this push:
new 39c31c8 Extract LegacyPlainResultFormatter.Stats#appendElapsed
new d32d5dc Merge pull request #129 from simon04/appendElapsed
39c31c8 is described below
commit 39c31c83206822a4442001562e28188ec38d8f66
Author: Simon Legner <Si...@gmail.com>
AuthorDate: Sun Jun 21 11:22:54 2020 +0200
Extract LegacyPlainResultFormatter.Stats#appendElapsed
---
.../junitlauncher/LegacyPlainResultFormatter.java | 30 +++++++++-------------
1 file changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java
index 1578e27..997e86e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junitlauncher/LegacyPlainResultFormatter.java
@@ -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)");
+ }
+ }
}
}