propagate environment variables to surefire run

pitest-command-line/src/main/java/org/pitest/mutationtest/commandline/MutationCoverageReport.java

@@ -1,12 +1,12 @@
 /*
  * Copyright 2010 Henry Coles
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,6 +23,8 @@
 import org.pitest.mutationtest.tooling.EntryPoint;
 import org.pitest.util.Unchecked;
 
+import java.util.HashMap;
+
 /**
  * Entry point for command line interface
  */
@@ -39,9 +41,9 @@ public static void main(final String[] args) {
       System.out.println(">>>> " + pr.getErrorMessage().value());
     } else {
       final ReportOptions data = pr.getOptions();
-      
+
       final CombinedStatistics stats = runReport(data, plugins);
-            
+
       throwErrorIfScoreBelowCoverageThreshold(stats.getCoverageSummary(), data.getCoverageThreshold());
       throwErrorIfScoreBelowMutationThreshold(stats.getMutationStatistics(), data.getMutationThreshold());
     }
@@ -66,10 +68,10 @@ private static void throwErrorIfScoreBelowMutationThreshold(
     }
   }
 
-  private static CombinedStatistics runReport(final ReportOptions data, PluginServices plugins) {
+  private static CombinedStatistics runReport(ReportOptions data, PluginServices plugins) {
 
-    final EntryPoint e = new EntryPoint();
-    final AnalysisResult result = e.execute(null, data, plugins);
+    EntryPoint e = new EntryPoint();
+    AnalysisResult result = e.execute(null, data, plugins,new HashMap<String, String>());
     if (result.getError().hasSome()) {
       throw Unchecked.translateCheckedException(result.getError().value());
     }

pitest-maven/src/main/java/org/pitest/maven/GoalStrategy.java

@@ -14,15 +14,18 @@
  */
 package org.pitest.maven;
 
-import java.io.File;
-
 import org.apache.maven.plugin.MojoExecutionException;
 import org.pitest.mutationtest.config.PluginServices;
 import org.pitest.mutationtest.config.ReportOptions;
 import org.pitest.mutationtest.tooling.CombinedStatistics;
 
+import java.io.File;
+import java.util.Map;
+
 public interface GoalStrategy {
 
-  CombinedStatistics execute(File baseDir, ReportOptions options,
-      PluginServices plugins) throws MojoExecutionException;
+  CombinedStatistics execute(File baseDir,
+                             ReportOptions options,
+                             PluginServices plugins,
+                             Map<String,String> environmentVariables) throws MojoExecutionException;
 }

pitest-maven/src/main/java/org/pitest/maven/PitMojo.java

@@ -1,11 +1,5 @@
 package org.pitest.maven;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -21,9 +15,15 @@
 import org.pitest.plugin.ClientClasspathPlugin;
 import org.pitest.plugin.ToolClasspathPlugin;
 import org.slf4j.bridge.SLF4JBridgeHandler;
-
 import uk.org.lidalia.sysoutslf4j.context.SysOutOverSLF4J;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
 /**
  * Goal which runs a coverage mutation report
  *
@@ -287,27 +287,36 @@ public class PitMojo extends AbstractMojo {
 
   /**
    * honours common skipTests flag in a maven run
-   * 
+   *
    * @parameter default-value="false"
    */
   private boolean                     skipTests;
 
   /**
    * Use slf4j for logging
-   * 
+   *
    * @parameter default-value="false" expression="${useSlf4j}"
    */
   private boolean                     useSlf4j;
-  
+
   /**
    * Configuration properties.
-   * 
+   *
    * Value pairs may be used by pitest plugins.
-   * 
+   *
    * @parameter
    */
   private Map<String, String> configuration;
 
+  /**
+   * environment configuration
+   *
+   * Value pairs may be used by pitest plugins.
+   *
+   * @parameter
+   */
+  private Map<String, String> environmentVariables = new HashMap<String, String>();
+
 
   /**
    * <i>Internal</i>: Project to interact with.
@@ -326,7 +335,7 @@ public class PitMojo extends AbstractMojo {
    * @readonly
    */
   private Map<String, Artifact>       pluginArtifactMap;
-  
+
   protected final GoalStrategy        goalStrategy;
 
   public PitMojo() {
@@ -406,7 +415,7 @@ protected Option<CombinedStatistics> analyse() throws MojoExecutionException {
     final ReportOptions data = new MojoToReportOptionsConverter(this,
         new SurefireConfigConverter(), this.filter).convert();
     return Option.some(this.goalStrategy.execute(detectBaseDir(), data,
-        this.plugins));
+        this.plugins,this.environmentVariables));
   }
 
   protected File detectBaseDir() {
@@ -559,9 +568,12 @@ public List<String> getClasspathDependencyExcludes() {
   public boolean isParseSurefireConfig() {
     return this.parseSurefireConfig;
   }
-  
+
   public Map<String, String> getPluginProperties() {
     return configuration;
   }
 
+  public Map<String, String> getEnvironmentVariables() {
+    return environmentVariables;
+  }
 }

pitest-maven/src/main/java/org/pitest/maven/RunPitStrategy.java

@@ -1,35 +1,39 @@
 /*
  * Copyright 2011 Henry Coles
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and limitations under the License.
  */
 package org.pitest.maven;
 
-import java.io.File;
-
 import org.apache.maven.plugin.MojoExecutionException;
 import org.pitest.mutationtest.config.PluginServices;
 import org.pitest.mutationtest.config.ReportOptions;
 import org.pitest.mutationtest.tooling.AnalysisResult;
 import org.pitest.mutationtest.tooling.CombinedStatistics;
 import org.pitest.mutationtest.tooling.EntryPoint;
 
+import java.io.File;
+import java.util.Map;
+
 public class RunPitStrategy implements GoalStrategy {
 
-  public CombinedStatistics execute(final File baseDir, final ReportOptions data, PluginServices plugins)
+  public CombinedStatistics execute(File baseDir,
+                                    ReportOptions data,
+                                    PluginServices plugins,
+                                    Map<String,String> environmentVariables)
       throws MojoExecutionException {
 
      EntryPoint e = new EntryPoint();
-     AnalysisResult result = e.execute(baseDir, data, plugins);
+     AnalysisResult result = e.execute(baseDir, data, plugins,environmentVariables);
      if ( result.getError().hasSome() ) {
        throw new MojoExecutionException("fail", result.getError().value());
      }

pitest-maven/src/main/java/org/pitest/maven/ScmMojo.java

@@ -1,13 +1,5 @@
 package org.pitest.maven;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.scm.ScmException;
@@ -26,15 +18,24 @@
 import org.pitest.mutationtest.config.ReportOptions;
 import org.pitest.mutationtest.tooling.CombinedStatistics;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 /**
  * Goal which runs a coverage mutation report only for files that have been
  * modified or introduced locally based on the source control configured in
  * maven.
- * 
+ *
  * @goal scmMutationCoverage
- * 
+ *
  * @requiresDependencyResolution test
- * 
+ *
  * @phase integration-test
  */
 public class ScmMojo extends PitMojo {
@@ -47,24 +48,24 @@ public class ScmMojo extends PitMojo {
   /**
    * List of scm status to include. Names match those defined by the maven scm
    * plugin.
-   * 
+   *
    * Common values include ADDED,MODIFIED (the defaults) & UNKNOWN.
-   * 
+   *
    * @parameter expression="${include}"
    */
   private HashSet<String> include;
 
   /**
    * Connection type to use when querying scm for changed files. Can either be
    * "connection" or "developerConnection".
-   * 
+   *
    * @parameter default-value="connection" expression="${connectionType}"
    */
   private String      connectionType;
 
   /**
    * Project basedir
-   * 
+   *
    * @parameter expression="${basedir}"
    * @required
    */
@@ -73,7 +74,7 @@ public class ScmMojo extends PitMojo {
   /**
    * Base of scm root. For a multi module project this is probably the parent
    * project.
-   * 
+   *
    * @parameter expression="${project.parent.basedir}"
    */
   private File        scmRootDir;
@@ -104,7 +105,7 @@ protected Option<CombinedStatistics> analyse() throws MojoExecutionException {
     final ReportOptions data = new MojoToReportOptionsConverter(this, new SurefireConfigConverter(),filter).convert();
     data.setFailWhenNoMutations(false);
 
-    return Option.some(this.goalStrategy.execute(detectBaseDir(), data, plugins));
+    return Option.some(this.goalStrategy.execute(detectBaseDir(), data, plugins,new HashMap<String, String>()));
 
   }
 
@@ -210,7 +211,7 @@ public void setConnectionType(final String connectionType) {
   public void setScmRootDir(final File scmRootDir) {
     this.scmRootDir = scmRootDir;
   }
-  
+
   /**
    * A bug in maven 2 requires that all list fields
    * declare a concrete list type

pitest-maven/src/main/java/org/pitest/maven/SurefireConfigConverter.java

@@ -1,10 +1,5 @@
 package org.pitest.maven;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.pitest.functional.F;
 import org.pitest.functional.FCollection;
@@ -13,6 +8,11 @@
 import org.pitest.testapi.TestGroupConfig;
 import org.pitest.util.Glob;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * Extracts configuration from surefire plugin and create pitest equivalents
  */
@@ -44,7 +44,7 @@ private List<String> extractStrings(String element, Xpp3Dom configuration) {
       String[] parts = groups.getValue().split(" ");
       return Arrays.asList(parts);
     } else {
-      return Collections.<String> emptyList();
+      return Collections.emptyList();
     }
   }
 
@@ -74,7 +74,7 @@ private List<String> extract(String childname, Xpp3Dom config) {
       return result;
     }
 
-    return Collections.<String> emptyList();
+    return Collections.emptyList();
   }
 
 }

pitest-maven/src/main/java/org/pitest/maven/report/generator/ReportGenerationResultEnum.java

@@ -1,12 +1,12 @@
 /*
  * Copyright 2015 Jason Fehr
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,8 +16,8 @@
 
 public enum ReportGenerationResultEnum {
 
-    SUCCESS, 
-    FAILURE, 
-    NOT_EXECUTED;
-    
+    SUCCESS,
+    FAILURE,
+    NOT_EXECUTED
+
 }