Merge b444b74 into 73b7dd0

src/main/java/eu/stamp_project/testrunner/listener/CoveragePerTestMethod.java

@@ -24,4 +24,6 @@ public interface CoveragePerTestMethod extends Serializable {
 
     public void save();
 
+    public void computeCoverages();
+
 }

src/main/java/eu/stamp_project/testrunner/listener/CoveredTestResultPerTestMethod.java

@@ -25,4 +25,6 @@ public interface CoveredTestResultPerTestMethod extends TestResult, Serializable
 
 	public void save();
 
+	public void computeCoverages();
+
 }

src/main/java/eu/stamp_project/testrunner/listener/impl/CoveragePerTestMethodImpl.java

@@ -16,6 +16,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -27,7 +28,9 @@ public class CoveragePerTestMethodImpl implements CoveragePerTestMethod {
 
     private static final long serialVersionUID = 606642107403361456L;
 
-    protected final Map<String, Coverage> coverageResultsMap;
+    protected transient final Map<String, ExecutionDataStore> executionDataStoreMap;
+
+    protected final ConcurrentHashMap<String, Coverage> coverageResultsMap;
 
     protected final List<String> classesDirectory;
 
@@ -39,16 +42,11 @@ public class CoveragePerTestMethodImpl implements CoveragePerTestMethod {
 
     protected transient CoverageTransformer coverageTransformer;
 
-    public CoveragePerTestMethodImpl() {
-        coverageResultsMap = null;
-        classesDirectory = null;
-        this.coverageTransformer = new CoverageCollectorSummarization();
-    }
-
     public CoveragePerTestMethodImpl(RuntimeData data, List<String> classesDirectory, CoverageTransformer coverageTransformer) {
         this.data = data;
         this.classesDirectory = classesDirectory;
-        this.coverageResultsMap = new HashMap<>();
+        this.executionDataStoreMap = new HashMap<>();
+        this.coverageResultsMap = new ConcurrentHashMap<>();
         this.coverageTransformer = coverageTransformer;
     }
 
@@ -84,6 +82,23 @@ public void setSessionInfos(SessionInfoStore sessionInfos) {
         this.sessionInfos = sessionInfos;
     }
 
+    public Map<String, ExecutionDataStore> getExecutionDataStoreMap() {
+        return executionDataStoreMap;
+    }
+
+    @Override
+    public void computeCoverages() {
+        executionDataStoreMap.entrySet().parallelStream()
+                .forEach(x -> {
+                    Coverage jUnit4Coverage = coverageTransformer.transformJacocoObject(
+                            x.getValue(),
+                            classesDirectory
+                    );
+                    coverageResultsMap.put(x.getKey(), jUnit4Coverage);
+                });
+    }
+
+
     @Override
     public Map<String, Coverage> getCoverageResultsMap() {
         return coverageResultsMap;

src/main/java/eu/stamp_project/testrunner/listener/impl/CoveredTestResultPerTestMethodImpl.java

@@ -18,6 +18,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -29,7 +30,9 @@ public class CoveredTestResultPerTestMethodImpl implements CoveredTestResultPerT
 
 	private static final long serialVersionUID = -789740001022671146L;
 
-	protected final Map<String, Coverage> coverageResultsMap;
+	protected transient final Map<String, ExecutionDataStore> executionDataStoreMap;
+
+	protected final ConcurrentHashMap<String, Coverage> coverageResultsMap;
 
 	protected final List<String> classesDirectory;
 
@@ -49,7 +52,8 @@ public class CoveredTestResultPerTestMethodImpl implements CoveredTestResultPerT
 	public CoveredTestResultPerTestMethodImpl(RuntimeData data, List<String> classesDirectory, CoverageTransformer coverageTransformer) {
 		this.data = data;
 		this.classesDirectory = classesDirectory;
-		this.coverageResultsMap = new HashMap<>();
+		this.executionDataStoreMap = new HashMap<>();
+		this.coverageResultsMap = new ConcurrentHashMap<>();
 		this.coverageTransformer = coverageTransformer;
 		this.runningTests = new ArrayList<>();
 		this.failingTests = new ArrayList<>();
@@ -90,6 +94,22 @@ public void setSessionInfos(SessionInfoStore sessionInfos) {
 		this.sessionInfos = sessionInfos;
 	}
 
+	public Map<String, ExecutionDataStore> getExecutionDataStoreMap() {
+		return executionDataStoreMap;
+	}
+
+	@Override
+	public void computeCoverages() {
+		executionDataStoreMap.entrySet().parallelStream()
+				.forEach(x -> {
+					Coverage jUnit4Coverage = coverageTransformer.transformJacocoObject(
+							x.getValue(),
+							classesDirectory
+					);
+					coverageResultsMap.put(x.getKey(), jUnit4Coverage);
+				});
+	}
+
 	@Override
 	public Map<String, Coverage> getCoverageResultsMap() {
 		return coverageResultsMap;

src/main/java/eu/stamp_project/testrunner/listener/junit4/CoveragePerJUnit4TestMethod.java

@@ -9,6 +9,7 @@
 import org.jacoco.core.analysis.CoverageBuilder;
 import org.jacoco.core.analysis.IClassCoverage;
 import org.jacoco.core.analysis.ICounter;
+import org.jacoco.core.data.ExecutionData;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.SessionInfoStore;
 import org.jacoco.core.runtime.RuntimeData;
@@ -71,12 +72,19 @@ public synchronized void testFinished(Description description) throws Exception
                 false
         );
 
-        Coverage jUnit4Coverage =
-                internalCoverage.getCoverageTransformer().transformJacocoObject(
-                        this.internalCoverage.getExecutionData(),
-                        this.internalCoverage.getClassesDirectory()
-                );
-        this.internalCoverage.getCoverageResultsMap().put(this.toString.apply(description), jUnit4Coverage);
+        // We need to clone each result so it doesn't get changed by the runtime afterwards
+        ExecutionDataStore executionDataStore = new ExecutionDataStore();
+        this.internalCoverage.getExecutionData().getContents().stream().forEach(x -> {
+            ExecutionData executionData = new ExecutionData(x.getId(), x.getName(), x.getProbes().clone());
+            synchronized (executionDataStore) {
+                executionDataStore.put(executionData);
+            }
+        });
+        this.internalCoverage.getExecutionDataStoreMap().put(
+                this.toString.apply(description),
+                executionDataStore
+        );
+
         if (isParametrized.test(description.getMethodName())) {
             this.collectForParametrizedTest(this.toStringParametrized.apply(description));
         }
@@ -178,5 +186,8 @@ private List<IClassCoverage> getSameClassCoverage(String className, List<IClassC
                 .collect(Collectors.toList());
     }
 
+    public void computeCoverages() {
+        internalCoverage.computeCoverages();
+    }
 
 }

src/main/java/eu/stamp_project/testrunner/listener/junit4/CoveredTestResultsPerJUnit4TestMethod.java

@@ -11,6 +11,7 @@
 import org.jacoco.core.analysis.CoverageBuilder;
 import org.jacoco.core.analysis.IClassCoverage;
 import org.jacoco.core.analysis.ICounter;
+import org.jacoco.core.data.ExecutionData;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.SessionInfoStore;
 import org.jacoco.core.runtime.RuntimeData;
@@ -73,12 +74,19 @@ public synchronized void testFinished(Description description) throws Exception
 				false
 		);
 
-		Coverage jUnit4Coverage =
-				internalCoveredTestResult.getCoverageTransformer().transformJacocoObject(
-						this.internalCoveredTestResult.getExecutionData(),
-						this.internalCoveredTestResult.getClassesDirectory()
-				);
-		this.internalCoveredTestResult.getCoverageResultsMap().put(this.toString.apply(description), jUnit4Coverage);
+		// We need to clone each result so it doesn't get changed by the runtime afterwards
+		ExecutionDataStore executionDataStore = new ExecutionDataStore();
+		this.internalCoveredTestResult.getExecutionData().getContents().stream().forEach(x -> {
+			ExecutionData executionData = new ExecutionData(x.getId(), x.getName(), x.getProbes().clone());
+			synchronized (executionDataStore) {
+				executionDataStore.put(executionData);
+			}
+		});
+		this.internalCoveredTestResult.getExecutionDataStoreMap().put(
+				this.toString.apply(description),
+				executionDataStore
+		);
+
 		if (isParametrized.test(description.getMethodName())) {
 			this.collectForParametrizedTest(this.toStringParametrized.apply(description));
 		}
@@ -249,4 +257,8 @@ private List<IClassCoverage> getSameClassCoverage(String className, List<IClassC
 				.collect(Collectors.toList());
 	}
 
+	public void computeCoverages() {
+		internalCoveredTestResult.computeCoverages();
+	}
+
 }

src/main/java/eu/stamp_project/testrunner/listener/junit5/CoveragePerJUnit5TestMethod.java

@@ -5,6 +5,7 @@
 import eu.stamp_project.testrunner.listener.CoverageTransformer;
 import eu.stamp_project.testrunner.listener.impl.CoveragePerTestMethodImpl;
 import eu.stamp_project.testrunner.runner.Failure;
+import org.jacoco.core.data.ExecutionData;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.SessionInfoStore;
 import org.jacoco.core.runtime.RuntimeData;
@@ -56,12 +57,19 @@ public synchronized void executionFinished(TestIdentifier testIdentifier, TestEx
                     false
             );
 
-            Coverage jUnit5Coverage =
-                    internalCoverage.getCoverageTransformer().transformJacocoObject(
-                            this.internalCoverage.getExecutionData(),
-                            this.internalCoverage.getClassesDirectory()
-                    );
-            this.internalCoverage.getCoverageResultsMap().put(this.toString.apply(testIdentifier), jUnit5Coverage);
+            // We need to clone each result so it doesn't get changed by the runtime afterwards
+            ExecutionDataStore executionDataStore = new ExecutionDataStore();
+            this.internalCoverage.getExecutionData().getContents().stream().forEach(x -> {
+                ExecutionData executionData = new ExecutionData(x.getId(), x.getName(), x.getProbes().clone());
+                synchronized (executionDataStore) {
+                    executionDataStore.put(executionData);
+                }
+            });
+            this.internalCoverage.getExecutionDataStoreMap().put(
+                    this.toString.apply(testIdentifier),
+                    executionDataStore
+            );
+
             switch (testExecutionResult.getStatus()) {
                 case FAILED:
                     this.getFailingTests().add(
@@ -93,4 +101,8 @@ public void save() {
         this.internalCoverage.save();
     }
 
+    public void computeCoverages() {
+        this.internalCoverage.computeCoverages();
+    }
+
 }

src/main/java/eu/stamp_project/testrunner/listener/junit5/CoveredTestResultsPerJUnit5TestMethod.java

@@ -5,6 +5,7 @@
 import eu.stamp_project.testrunner.listener.CoveredTestResultPerTestMethod;
 import eu.stamp_project.testrunner.listener.impl.CoveredTestResultPerTestMethodImpl;
 import eu.stamp_project.testrunner.runner.Failure;
+import org.jacoco.core.data.ExecutionData;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.SessionInfoStore;
 import org.jacoco.core.runtime.RuntimeData;
@@ -62,12 +63,19 @@ public synchronized void executionFinished(TestIdentifier testIdentifier, TestEx
 					false
 			);
 
-			Coverage jUnit5Coverage =
-					internalCoveredTestResult.getCoverageTransformer().transformJacocoObject(
-							this.internalCoveredTestResult.getExecutionData(),
-							this.internalCoveredTestResult.getClassesDirectory()
-					);
-			this.internalCoveredTestResult.getCoverageResultsMap().put(this.toString.apply(testIdentifier), jUnit5Coverage);
+			// We need to clone each result so it doesn't get changed by the runtime afterwards
+			ExecutionDataStore executionDataStore = new ExecutionDataStore();
+			this.internalCoveredTestResult.getExecutionData().getContents().stream().forEach(x -> {
+				ExecutionData executionData = new ExecutionData(x.getId(), x.getName(), x.getProbes().clone());
+				synchronized (executionDataStore) {
+					executionDataStore.put(executionData);
+				}
+			});
+			this.internalCoveredTestResult.getExecutionDataStoreMap().put(
+					this.toString.apply(testIdentifier),
+					executionDataStore
+			);
+
 			switch (testExecutionResult.getStatus()) {
 				case FAILED:
 					this.internalCoveredTestResult.getFailingTests().add(
@@ -98,4 +106,9 @@ public Coverage getCoverageOf(String testMethodName) {
 	public void save() {
 		this.internalCoveredTestResult.save();
 	}
+
+	public void computeCoverages() {
+		internalCoveredTestResult.computeCoverages();
+	}
+
 }

src/main/java/eu/stamp_project/testrunner/runner/coverage/JUnit4JacocoRunnerCoveredResultPerTestMethod.java

@@ -36,6 +36,7 @@ protected CoveredTestResultPerTestMethod executeCoveredTestPerTestMethod(Runtime
 				(JUnit4TestResult) listener,
 				this.instrumentedClassLoader
 		);
+		listener.computeCoverages();
 		return listener;
 	}
 

src/main/java/eu/stamp_project/testrunner/runner/coverage/JUnit4JacocoRunnerPerTestMethod.java

@@ -36,6 +36,7 @@ protected CoveragePerTestMethod executeTestPerTestMethod(RuntimeData data,
                 (JUnit4TestResult) listener,
                 this.instrumentedClassLoader
         );
+        listener.computeCoverages();
         return listener;
     }
 

src/main/java/eu/stamp_project/testrunner/runner/coverage/JUnit5JacocoRunnerCoveredResultPerTestMethod.java

@@ -36,6 +36,7 @@ protected CoveredTestResultPerTestMethod executeCoveredTestPerTestMethod(Runtime
 				(JUnit5TestResult) listener,
 				this.instrumentedClassLoader
 		);
+		listener.computeCoverages();
 		return listener;
 	}
 

src/main/java/eu/stamp_project/testrunner/runner/coverage/JUnit5JacocoRunnerPerTestMethod.java

@@ -35,6 +35,7 @@ protected CoveragePerTestMethod executeTestPerTestMethod(RuntimeData data,
                 listener,
                 this.instrumentedClassLoader
         );
+        listener.computeCoverages();
         return listener;
     }