Merge pull request #1248 from hcoles/feature/avoid_mutator_scans

delay test class identification
hcoles · Aug 22, 2023 · 1d81ffa · 1d81ffa
2 parents fb572f6 + d3dd3ae
commit 1d81ffa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 27 deletions.
diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/build/MutationTestBuilder.java b/pitest-entry/src/main/java/org/pitest/mutationtest/build/MutationTestBuilder.java
@@ -15,7 +15,6 @@
 package org.pitest.mutationtest.build;
 
 import org.pitest.classinfo.ClassName;
-import org.pitest.coverage.TestInfo;
 import org.pitest.functional.FCollection;
 import org.pitest.functional.prelude.Prelude;
 import org.pitest.mutationtest.DetectionStatus;
@@ -25,10 +24,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -96,22 +92,11 @@ private MutationAnalysisUnit makePreAnalysedUnit(
 
   private MutationAnalysisUnit makeUnanalysedUnit(
       final Collection<MutationDetails> needAnalysis) {
-    final Set<ClassName> uniqueTestClasses = new HashSet<>();
-    FCollection.flatMapTo(needAnalysis, mutationDetailsToTestClass(),
-        uniqueTestClasses);
-
-    return new MutationTestUnit(needAnalysis, uniqueTestClasses,
-        this.workerFactory);
+    return new MutationTestUnit(needAnalysis, this.workerFactory);
   }
 
   private static Predicate<MutationResult> statusNotKnown() {
     return a -> a.getStatus() == DetectionStatus.NOT_STARTED;
   }
 
-  private static Function<MutationDetails, Iterable<ClassName>> mutationDetailsToTestClass() {
-    return a -> a.getTestsInOrder().stream()
-            .map(TestInfo.toDefiningClassName())
-            .collect(Collectors.toList());
-  }
-
 }
diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/build/MutationTestUnit.java b/pitest-entry/src/main/java/org/pitest/mutationtest/build/MutationTestUnit.java
@@ -16,9 +16,12 @@
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.Set;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import org.pitest.classinfo.ClassName;
+import org.pitest.coverage.TestInfo;
 import org.pitest.mutationtest.DetectionStatus;
 import org.pitest.mutationtest.MutationMetaData;
 import org.pitest.mutationtest.MutationStatusMap;
@@ -34,12 +37,9 @@ public class MutationTestUnit implements MutationAnalysisUnit {
   private final Collection<MutationDetails> availableMutations;
   private final WorkerFactory               workerFactory;
 
-  private final Collection<ClassName>       testClasses;
 
-  public MutationTestUnit(final Collection<MutationDetails> availableMutations,
-      final Collection<ClassName> testClasses, final WorkerFactory workerFactory) {
+  public MutationTestUnit(Collection<MutationDetails> availableMutations, WorkerFactory workerFactory) {
     this.availableMutations = availableMutations;
-    this.testClasses = testClasses;
     this.workerFactory = workerFactory;
   }
 
@@ -76,7 +76,7 @@ private void runTestInSeperateProcessForMutationRange(
     final Collection<MutationDetails> remainingMutations = mutations
         .getUnrunMutations();
     final MutationTestProcess worker = this.workerFactory.createWorker(
-        remainingMutations, this.testClasses);
+        remainingMutations, testClassesFor(remainingMutations));
     worker.start();
 
     setFirstMutationToStatusOfStartedInCaseMinionFailsAtBoot(mutations,
@@ -88,6 +88,12 @@ private void runTestInSeperateProcessForMutationRange(
     correctResultForProcessExitCode(mutations, exitCode);
   }
 
+  private Set<ClassName> testClassesFor(Collection<MutationDetails> remainingMutations) {
+    return remainingMutations.stream()
+            .flatMap(m -> m.getTestsInOrder().stream().map(TestInfo.toDefiningClassName()))
+            .collect(Collectors.toSet());
+  }
+
   private static ExitCode waitForMinionToDie(final MutationTestProcess worker) {
     final ExitCode exitCode = worker.waitToDie();
     LOG.fine("Exit code was - " + exitCode);

diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationTestUnitTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationTestUnitTest.java
@@ -25,7 +25,6 @@
 import org.pitest.mutationtest.engine.MutationEngine;
 import org.pitest.process.JavaAgent;
 import org.pitest.process.LaunchOptions;
-import org.pitest.testapi.Configuration;
 import org.pitest.util.Verbosity;
 
 public class MutationTestUnitTest {
@@ -34,9 +33,6 @@ public class MutationTestUnitTest {
   private List<MutationDetails> mutations;
   private Collection<ClassName> tests;
 
-  @Mock
-  private Configuration         config;
-
   private MutationConfig        mutationConfig;
 
   @Mock
@@ -55,7 +51,7 @@ public void setUp() {
         this.javaAgent));
     this.mutations = new ArrayList<>();
     this.tests = new ArrayList<>();
-    this.testee = new MutationTestUnit(this.mutations, this.tests,
+    this.testee = new MutationTestUnit(this.mutations,
         new WorkerFactory(null, TestPluginArguments.defaults(), this.mutationConfig, EngineArguments.arguments(), this.timeout,
             Verbosity.DEFAULT, false, null));
 
@@ -75,7 +71,7 @@ public void shouldReportWhenMutationsNotCoveredByAnyTest() throws Exception {
   public void shouldReportPriorityBasedOnNumberOfMutations() {
     this.mutations.add(MutationDetailsMother.aMutationDetail().build());
     this.testee = new MutationTestUnit(MutationDetailsMother.aMutationDetail()
-        .build(42), this.tests, null);
+        .build(42), null);
     assertThat(this.testee.priority()).isEqualTo(42);
   }