[SUREFIRE-2170] Use ChoiceFormat to selectively render elapsed time i…

…n WrappedReportEntry
apache · May 28, 2023 · ed307a6 · ed307a6
1 parent 40e1d03
commit ed307a6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 48 deletions.
diff --git a/...-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ReporterUtils.java b/...-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ReporterUtils.java
diff --git a/...fire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/...fire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
@@ -20,7 +20,9 @@
 
 import javax.annotation.Nonnull;
 
+import java.text.MessageFormat;
 import java.util.Collections;
+import java.util.Locale;
 import java.util.Map;
 
 import org.apache.maven.surefire.api.report.ReportEntry;
@@ -29,14 +31,15 @@
 import org.apache.maven.surefire.api.report.TestSetReportEntry;
 
 import static java.util.Collections.unmodifiableMap;
-import static org.apache.maven.plugin.surefire.report.ReporterUtils.formatElapsedTime;
 import static org.apache.maven.surefire.api.util.internal.StringUtils.NL;
 import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
 
 /**
  * @author Kristian Rosenvold
  */
 public class WrappedReportEntry implements TestSetReportEntry {
+    private static final float ONE_SECOND = 1000.0f;
+
     private final ReportEntry original;
 
     private final ReportEntryType reportEntryType;
@@ -49,6 +52,14 @@ public class WrappedReportEntry implements TestSetReportEntry {
 
     private final Map<String, String> systemProperties;
 
+    /*
+     * Rationale: The idea is to always display four digits for visually consistent output
+     * Important: Keep in sync with maven-surefire-report-plugin/src/main/resources/surefire-report.properties
+     */
+    private final MessageFormat elapsedTimeFormat = new MessageFormat(
+            "{0,choice,0#0|0.0<{0,number,0.000}|10#{0,number,0.00}|100#{0,number,0.0}|1000#{0,number,0}} s",
+            Locale.ROOT);
+
     public WrappedReportEntry(
             ReportEntry original,
             ReportEntryType reportEntryType,
@@ -140,7 +151,7 @@ public String getStackTrace(boolean trimStackTrace) {
     }
 
     public String elapsedTimeAsString() {
-        return getElapsed() != null ? formatElapsedTime(getElapsed()) : null;
+        return getElapsed() != null ? elapsedTimeFormat.format(new Object[] {getElapsed() / ONE_SECOND}) : null;
     }
 
     String getReportSourceName() {
@@ -165,13 +176,13 @@ String getReportName() {
 
     public String getOutput(boolean trimStackTrace) {
         String outputLine =
-                getElapsedTimeSummary() + "  <<< " + getReportEntryType().name() + "!";
+                getElapsedTimeSummary() + " <<< " + getReportEntryType().name() + "!";
         String trimmedStackTrace = getStackTrace(trimStackTrace);
         return trimmedStackTrace == null ? outputLine : outputLine + NL + trimmedStackTrace;
     }
 
     public String getElapsedTimeVerbose() {
-        return "Time elapsed: " + (getElapsed() != null ? elapsedTimeAsString() + " s" : "(unknown)");
+        return "Time elapsed: " + (getElapsed() != null ? elapsedTimeAsString() : "(unknown)");
     }
 
     public String getElapsedTimeSummary() {