Do not depend on specific map implementation

Author: mpkorstanje

java/src/main/java/io/cucumber/testngxmlformatter/XmlReportData.java

@@ -19,7 +19,6 @@
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.AbstractMap.SimpleEntry;
-import java.util.EnumMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -56,7 +55,7 @@ long getDurationInMilliSeconds(TestCaseStarted testCaseStarted) {
                 .toMillis();
     }
 
-    EnumMap<TestStepResultStatus, Long> getTestCaseStatusCounts() {
+    Map<TestStepResultStatus, Long> getTestCaseStatusCounts() {
         return query.countMostSevereTestStepResultStatus();
     }
 

java/src/main/java/io/cucumber/testngxmlformatter/XmlReportWriter.java

@@ -9,12 +9,12 @@
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import java.io.Writer;
-import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Supplier;
 
 import static io.cucumber.messages.types.TestStepResultStatus.PASSED;
@@ -47,19 +47,19 @@ private void writeTestngResults(EscapingXmlStreamWriter writer) throws XMLStream
     }
 
     private void writeTestngResultsAttributes(EscapingXmlStreamWriter writer) throws XMLStreamException {
-        EnumMap<TestStepResultStatus, Long> counts = data.getTestCaseStatusCounts();
+        Map<TestStepResultStatus, Long> counts = data.getTestCaseStatusCounts();
 
         writer.writeAttribute("failed", String.valueOf(countFailures(counts)));
         writer.writeAttribute("passed", counts.get(PASSED).toString());
         writer.writeAttribute("skipped", counts.get(SKIPPED).toString());
         writer.writeAttribute("total", String.valueOf(data.getTestCaseCount()));
     }
 
-    private static long countFailures(EnumMap<TestStepResultStatus, Long> counts) {
+    private static long countFailures(Map<TestStepResultStatus, Long> counts) {
         return createNotPassedNotSkippedSet().stream().mapToLong(counts::get).sum();
     }
 
-    private static EnumSet<TestStepResultStatus> createNotPassedNotSkippedSet() {
+    private static Set<TestStepResultStatus> createNotPassedNotSkippedSet() {
         EnumSet<TestStepResultStatus> notPassedNotSkipped = EnumSet.allOf(TestStepResultStatus.class);
         notPassedNotSkipped.remove(PASSED);
         notPassedNotSkipped.remove(SKIPPED);