replace surefire argline

hcoles · hcoles · commit 9defbc47a6ed · 2024-01-22T12:37:07.000Z
Move argline property replacement after surefire config extraction
diff --git a/pitest-maven/src/main/java/org/pitest/maven/MojoToReportOptionsConverter.java b/pitest-maven/src/main/java/org/pitest/maven/MojoToReportOptionsConverter.java
@@ -88,7 +88,16 @@ public ReportOptions convert() {
     removeExcludedDependencies(classPath);
 
     ReportOptions option = parseReportOptions(classPath);
-    return updateFromSurefire(option);
+    ReportOptions withSureFire = updateFromSurefire(option);
+
+    // Null check here is a bad unit testing artifact, should never be null in real life
+    ReportOptions effective = withSureFire != null ? withSureFire : option;
+
+    // argline may contain surefire style properties that require expanding
+    if (effective.getArgLine() != null) {
+      effective.setArgLine(this.replacePropertyExpressions(option.getArgLine()));
+    }
+    return effective;
 
   }
 
@@ -196,7 +205,7 @@ private ReportOptions parseReportOptions(final List<String> classPath) {
       data.addChildJVMArgs(this.mojo.getJvmArgs());
     }
     if (this.mojo.getArgLine() != null) {
-      data.setArgLine(replacePropertyExpressions(this.mojo.getArgLine()));
+      data.setArgLine(this.mojo.getArgLine());
     }
 
     data.setMutators(determineMutators());
