[maven-surefire] 01/04: Use simple String#valueOf() to convert a float to a string

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch backport
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit d93f1218f3dd8a53a99a415bda148f6a7dccff96
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Fri May 19 19:18:01 2023 +0200

    Use simple String#valueOf() to convert a float to a string
---
 .../surefire/report/StatelessXmlReporter.java      | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 7a9a019d9..10f496aee 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -48,41 +48,41 @@ import static 
org.apache.maven.plugin.surefire.report.ReportEntryType.SKIPPED;
 import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS;
 import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
 
-@SuppressWarnings({"javadoc", "checkstyle:javadoctype"})
 // CHECKSTYLE_OFF: LineLength
-/*
+/**
  * XML format reporter writing to 
<code>TEST-<i>reportName</i>[-<i>suffix</i>].xml</code> file like written and 
read
  * by Ant's <a 
href="http://ant.apache.org/manual/Tasks/junit.html";><code>&lt;junit&gt;</code></a>
 and
  * <a 
href="http://ant.apache.org/manual/Tasks/junitreport.html";><code>&lt;junitreport&gt;</code></a>
 tasks,
  * then supported by many tools like CI servers.
  * <br>
  * <pre>&lt;?xml version="1.0" encoding="UTF-8"?>
- * &lt;testsuite name="<i>suite name</i>" [group="<i>group</i>"] 
tests="<i>0</i>" failures="<i>0</i>" errors="<i>0</i>" skipped="<i>0</i>" 
time="<i>0,###.###</i>">
+ * &lt;testsuite name="<i>suite name</i>" [group="<i>group</i>"] 
tests="<i>0</i>" failures="<i>0</i>" errors="<i>0</i>" skipped="<i>0</i>" 
time="<i>{float}</i>">
  *  &lt;properties>
  *    &lt;property name="<i>name</i>" value="<i>value</i>"/>
  *    [...]
  *  &lt;/properties>
- *  &lt;testcase time="<i>0,###.###</i>" name="<i>test name</i> 
[classname="<i>class name</i>"] [group="<i>group</i>"]"/>
- *  &lt;testcase time="<i>0,###.###</i>" name="<i>test name</i> 
[classname="<i>class name</i>"] [group="<i>group</i>"]">
+ *  &lt;testcase time="<i>{float}</i>" name="<i>test name</i> 
[classname="<i>class name</i>"] [group="<i>group</i>"]"/>
+ *  &lt;testcase time="<i>{float}</i>" name="<i>test name</i> 
[classname="<i>class name</i>"] [group="<i>group</i>"]">
  *    &lt;<b>error</b> message="<i>message</i>" type="<i>exception class 
name</i>"><i>stacktrace</i>&lt;/error>
  *    &lt;system-out><i>system out content (present only if not 
empty)</i>&lt;/system-out>
  *    &lt;system-err><i>system err content (present only if not 
empty)</i>&lt;/system-err>
  *  &lt;/testcase>
- *  &lt;testcase time="<i>0,###.###</i>" name="<i>test name</i> 
[classname="<i>class name</i>"] [group="<i>group</i>"]">
+ *  &lt;testcase time="<i>{float}</i>" name="<i>test name</i> 
[classname="<i>class name</i>"] [group="<i>group</i>"]">
  *    &lt;<b>failure</b> message="<i>message</i>" type="<i>exception class 
name</i>"><i>stacktrace</i>&lt;/failure>
  *    &lt;system-out><i>system out content (present only if not 
empty)</i>&lt;/system-out>
  *    &lt;system-err><i>system err content (present only if not 
empty)</i>&lt;/system-err>
  *  &lt;/testcase>
- *  &lt;testcase time="<i>0,###.###</i>" name="<i>test name</i> 
[classname="<i>class name</i>"] [group="<i>group</i>"]">
+ *  &lt;testcase time="<i>{float}</i>" name="<i>test name</i> 
[classname="<i>class name</i>"] [group="<i>group</i>"]">
  *    &lt;<b>skipped</b>/>
  *  &lt;/testcase>
  *  [...]</pre>
  *
  * @author Kristian Rosenvold
- * @see <a 
href="http://wiki.apache.org/ant/Proposals/EnhancedTestReports";>Ant's format 
enhancement proposal</a>
+ * @see <a 
href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=115528872";>Ant's
 format enhancement proposal</a>
  *      (not yet implemented by Ant 1.8.2)
  */
-// todo this is no more stateless due to existence of 
testClassMethodRunHistoryMap since of 2.19.
+@SuppressWarnings({"javadoc", "checkstyle:javadoctype"})
+// TODO this is no more stateless due to existence of 
testClassMethodRunHistoryMap since of 2.19.
 public class StatelessXmlReporter implements 
StatelessReportEventListener<WrappedReportEntry, TestSetStats> {
     private static final String XML_INDENT = "  ";
 
@@ -387,7 +387,9 @@ public class StatelessXmlReporter implements 
StatelessReportEventListener<Wrappe
             ppw.addAttribute("classname", extraEscapeAttribute(className));
         }
 
-        ppw.addAttribute("time", report.elapsedTimeAsString());
+        if (report.getElapsed() != null) {
+            ppw.addAttribute("time", String.valueOf(report.getElapsed() / 
1000.0f));
+        }
     }
 
     private void createTestSuiteElement(XMLWriter ppw, WrappedReportEntry 
report, TestSetStats testSetStats)
@@ -407,7 +409,9 @@ public class StatelessXmlReporter implements 
StatelessReportEventListener<Wrappe
             ppw.addAttribute("group", report.getGroup());
         }
 
-        ppw.addAttribute("time", report.elapsedTimeAsString());
+        if (report.getElapsed() != null) {
+            ppw.addAttribute("time", String.valueOf(report.getElapsed() / 
1000.0f));
+        }
 
         ppw.addAttribute("tests", 
String.valueOf(testSetStats.getCompletedCount()));