[SUREFIRE-2167] Simplify deserialization of elapsed time in TestSuite…

…XmlParser
apache · May 25, 2023 · 8d50205 · 8d50205
1 parent 6692a70
commit 8d50205
Showing 1 changed file with 12 additions and 21 deletions.
diff --git a/...ort-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java b/...ort-parser/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
@@ -26,8 +26,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.text.NumberFormat;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -40,15 +38,12 @@
 import org.xml.sax.helpers.DefaultHandler;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Locale.ENGLISH;
 import static org.apache.maven.shared.utils.StringUtils.isBlank;
 
 /**
  *
  */
 public final class TestSuiteXmlParser extends DefaultHandler {
-    private final NumberFormat numberFormat = NumberFormat.getInstance(ENGLISH);
-
     private final ConsoleLogger consoleLogger;
 
     private ReportTestSuite defaultSuite;
@@ -111,13 +106,11 @@ public void startElement(String uri, String localName, String qName, Attributes
                     case "testsuite":
                         defaultSuite = new ReportTestSuite();
                         currentSuite = defaultSuite;
-
-                        try {
-                            Number time = numberFormat.parse(attributes.getValue("time"));
-
-                            defaultSuite.setTimeElapsed(time.floatValue());
-                        } catch (NullPointerException e) {
-                            consoleLogger.error("WARNING: no time attribute found on testsuite element");
+                        String timeStr = attributes.getValue("time");
+                        if (timeStr != null) {
+                            defaultSuite.setTimeElapsed(Float.parseFloat(timeStr));
+                        } else {
+                            consoleLogger.warning("No time attribute found on testsuite element");
                         }
 
                         final String name = attributes.getValue("name");
@@ -151,13 +144,12 @@ public void startElement(String uri, String localName, String qName, Attributes
                             }
                         }
 
-                        String timeAsString = attributes.getValue("time");
-                        Number time = isBlank(timeAsString) ? 0 : numberFormat.parse(timeAsString);
+                        timeStr = attributes.getValue("time");
 
                         testCase.setFullClassName(currentSuite.getFullClassName())
                                 .setClassName(currentSuite.getName())
                                 .setFullName(currentSuite.getFullClassName() + "." + testCase.getName())
-                                .setTime(time.floatValue());
+                                .setTime(timeStr != null ? Float.parseFloat(timeStr) : 0.0f);
 
                         if (currentSuite != defaultSuite) {
                             currentSuite.setTimeElapsed(testCase.getTime() + currentSuite.getTimeElapsed());
@@ -193,8 +185,8 @@ public void startElement(String uri, String localName, String qName, Attributes
                     default:
                         break;
                 }
-            } catch (ParseException e) {
-                throw new SAXException(e.getMessage(), e);
+            } catch (NumberFormatException e) {
+                throw new SAXException("Failed to parse time value", e);
             }
         }
     }
@@ -215,10 +207,9 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
                 break;
             case "time":
                 try {
-                    defaultSuite.setTimeElapsed(
-                            numberFormat.parse(currentElement.toString()).floatValue());
-                } catch (ParseException e) {
-                    throw new SAXException(e.getMessage(), e);
+                    defaultSuite.setTimeElapsed(Float.parseFloat(currentElement.toString()));
+                } catch (NumberFormatException e) {
+                    throw new SAXException("Failed to parse time value", e);
                 }
                 break;
             default: