From c3d75bc6fdc8f50d75fa9ee972fcb61e47bd7d18 Mon Sep 17 00:00:00 2001
From: Henry Coles <henry.colesgroupcmg.com>
Date: Wed, 28 Apr 2021 12:32:52 +0100
Subject: [PATCH] coverage number needs only test names

---
 .../java/org/pitest/coverage/CoverageData.java   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pitest-entry/src/main/java/org/pitest/coverage/CoverageData.java b/pitest-entry/src/main/java/org/pitest/coverage/CoverageData.java
index 710877a3a..30ac4804f 100644
--- a/pitest-entry/src/main/java/org/pitest/coverage/CoverageData.java
+++ b/pitest-entry/src/main/java/org/pitest/coverage/CoverageData.java
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +37,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.toCollection;
@@ -147,7 +147,7 @@ private void addTestsToBlockMap(final TestInfo ti, InstructionLocation each) {
 
   @Override
   public BigInteger getCoverageIdForClass(final ClassName clazz) {
-    final Map<ClassLine, Set<TestInfo>> coverage = getLineCoverageForClassName(clazz);
+    final Collection<TestInfo> coverage = getTestsForClass(clazz);
     if (coverage.isEmpty()) {
       return BigInteger.ZERO;
     }
@@ -181,11 +181,11 @@ public CoverageSummary createSummary() {
     return new CoverageSummary(numberOfLines(), coveredLines());
   }
 
-  private BigInteger generateCoverageNumber(
-      final Map<ClassLine, Set<TestInfo>> coverage) {
+  private BigInteger generateCoverageNumber(Collection<TestInfo> coverage) {
     BigInteger coverageNumber = BigInteger.ZERO;
-    final Set<ClassName> testClasses = new HashSet<>();
-    FCollection.flatMapTo(coverage.values(), testsToClassName(), testClasses);
+    Set<ClassName> testClasses = coverage.stream()
+            .map(TestInfo.toDefiningClassName())
+            .collect(Collectors.toSet());
 
     for (final ClassInfo each : this.code.getClassInfo(testClasses)) {
       coverageNumber = coverageNumber.add(each.getDeepHash());
@@ -194,10 +194,6 @@ private BigInteger generateCoverageNumber(
     return coverageNumber;
   }
 
-  private Function<Set<TestInfo>, Iterable<ClassName>> testsToClassName() {
-    return a -> FCollection.map(a, TestInfo.toDefiningClassName());
-  }
-
   private static Function<ClassInfo, String> keyFromClassInfo() {
 
     return c -> keyFromSourceAndPackage(c.getSourceFileName(), c.getName()