Add tests.

Author: jorgenpt

.classpath

@@ -1,4 +1,5 @@
 <classpath>
+  <classpathentry kind="src" path="src/test/java" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
   <classpathentry kind="src" path="target/generated-sources/localizer" including="**/*.java"/>
   <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>

pom.xml

@@ -11,6 +11,10 @@
   <version>1.0-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <repositories>
     <repository>
       <snapshots>

src/main/java/com/lookout/jenkins/EnvironmentScript.java

@@ -1,5 +1,4 @@
 package com.lookout.jenkins;
-import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
@@ -13,9 +12,8 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.AbstractMap;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -24,14 +22,13 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
- *
+ * Runs a specific chunk of code before each build, parsing output for new environment variables.
  *
  * @author Jørgen P. Tjernø
  */
 public class EnvironmentScript extends BuildWrapper {
 	private final String script;
 
-	// Fields in config.jelly must match the parameter names in the "DataBoundConstructor"
 	@DataBoundConstructor
 	public EnvironmentScript(String script) {
 		this.script = script;
@@ -48,7 +45,7 @@ public String getScript() {
 	@Override
 	public Environment setUp(AbstractBuild build,
 			final Launcher launcher,
-			BuildListener listener) throws IOException, InterruptedException {
+			final BuildListener listener) throws IOException, InterruptedException {
 
 		// First we create the script in a temporary directory.
 		FilePath ws = build.getWorkspace();
@@ -77,9 +74,10 @@ public Environment setUp(AbstractBuild build,
 			return null;
 		}
 
+
 		// Then we parse the variables out of it. We could use java.util.Properties, but it doesn't order the properties, so expanding variables with previous variables (like a shell script expects) doesn't work.
 		String[] lines = commandOutput.toString().split("(\n|\r\n)");
-		final List<Map.Entry<String, String>> injectedVariables = new ArrayList<Map.Entry<String, String>>(lines.length);
+		final Map<String, String> envAdditions = new HashMap<String, String>(lines.length);
 		for (String line : lines)
 		{
 			if (line.trim().isEmpty()) {
@@ -90,29 +88,23 @@ public Environment setUp(AbstractBuild build,
 			if (keyAndValue.length < 2) {
 				listener.error("[environment-script] Invalid line encountered, ignoring: " + line);
 			} else {
-				Map.Entry<String, String> entry = new AbstractMap.SimpleEntry<String, String>(keyAndValue[0], keyAndValue[1]);
-				listener.getLogger().println("[environment-script] Adding variable '" + entry.getKey() + "' with value '" + entry.getValue() + "'");
-				injectedVariables.add(entry);
+				listener.getLogger().println("[environment-script] Adding variable '" + keyAndValue[0] + "' with value '" + keyAndValue[1] + "'");
+				envAdditions.put(keyAndValue[0], keyAndValue[1]);
 			}
 		}
 
 		return new Environment() {
 			@Override
 			public void buildEnvVars(Map<String, String> env) {
-				// Here we evaluate the variables we parsed above, in order.
-				// We expand against all the environment variables we have so far.
-				EnvVars vars = new EnvVars(env);
-				for (Map.Entry<String, String> variable : injectedVariables) {
-					env.put(variable.getKey(), vars.expand(variable.getValue()));
-				}
+				env.putAll(envAdditions);
 			}
 		};
 	}
 
 	// Mostly stolen from hudson.tasks.Shell.buildCommandLine.
 	public String[] buildCommandLine(FilePath scriptFile) {
 		// Respect shebangs
-		if(script.startsWith("#!")) {
+		if (script.startsWith("#!")) {
 			// Find first line, or just entire script if it's one line.
 			int end = script.indexOf('\n');
 			if (end < 0)

src/test/java/com/lookout/jenkins/EnvironmentScriptTest.java

@@ -0,0 +1,67 @@
+package com.lookout.jenkins;
+
+import hudson.EnvVars;
+import hudson.model.Build;
+import hudson.model.Project;
+
+import org.jvnet.hudson.test.CaptureEnvironmentBuilder;
+import org.jvnet.hudson.test.HudsonTestCase;
+import org.jvnet.hudson.test.SingleFileSCM;
+
+public class EnvironmentScriptTest extends HudsonTestCase {
+	class TestJob {
+		public Project<?,?> project;
+		public CaptureEnvironmentBuilder builder;
+
+		public TestJob (String script) throws Exception {
+			project = createFreeStyleProject();
+			builder = new CaptureEnvironmentBuilder();
+			project.getBuildersList().add(builder);
+			project.getBuildWrappersList().add(new EnvironmentScript(script));
+		}
+	}
+
+	public void testWithEmptyScript () throws Exception {
+		TestJob job = new TestJob("");
+		assertBuildStatusSuccess(job.project.scheduleBuild2(0).get());
+	}
+
+	final String SCRIPT_SIMPLE_VARIABLES =
+		"echo var1=one\n"
+		+ "echo var2=two\n"
+		+ "echo var3=three";
+	public void testWithSimpleVariables () throws Exception {
+		TestJob job = new TestJob(SCRIPT_SIMPLE_VARIABLES);
+		assertBuildStatusSuccess(job.project.scheduleBuild2(0).get());
+
+		EnvVars vars = job.builder.getEnvVars();
+		assertEquals("one", vars.get("var1"));
+		assertEquals("two", vars.get("var2"));
+		assertEquals("three", vars.get("var3"));
+	}
+
+	final String SCRIPT_DEPENDENT_VARIABLES =
+		"echo var1=one\n"
+		+ "echo var2='$var1 two'\n"
+		+ "echo var3='yo $var4'\n"
+		+ "echo var4='three ${var2}'";
+	public void testWithDependentVariables () throws Exception {
+		TestJob job = new TestJob(SCRIPT_DEPENDENT_VARIABLES);
+		Build<?, ?> b = assertBuildStatusSuccess(job.project.scheduleBuild2(0).get());
+		System.out.println(b.getLog());
+
+		EnvVars vars = job.builder.getEnvVars();
+		assertEquals("one", vars.get("var1"));
+		assertEquals("one two", vars.get("var2"));
+		assertEquals("yo three ${var2}", vars.get("var3"));
+		assertEquals("three one two", vars.get("var4"));
+	}
+
+	public void testReadingFileFromSCM () throws Exception {
+		TestJob job = new TestJob("cat envs");
+		job.project.setScm(new SingleFileSCM("envs", "foo_var=bar"));
+
+		assertBuildStatusSuccess(job.project.scheduleBuild2(0).get());
+		assertEquals("bar", job.builder.getEnvVars().get("foo_var"));
+	}
+}