Fix JENKINS-15146

jenkinsci · Sep 23, 2012 · 7185864 · 7185864
1 parent 3e9cb61
commit 7185864
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectEnvVars.java b/src/main/java/org/jenkinsci/plugins/envinject/service/EnvInjectEnvVars.java
@@ -241,8 +241,9 @@ private boolean isUnresolvedVar(String value) {
             return true;
         }
 
+        //Empty environment variables are acceptable
         if (value.trim().length() == 0) {
-            return true;
+            return false;
         }
 
         return value.contains("$") && !value.contains("\\$");

diff --git a/src/test/java/org/jenkinsci/plugins/envinject/EnvInjectEnvVarsEmpty.java b/src/test/java/org/jenkinsci/plugins/envinject/EnvInjectEnvVarsEmpty.java
@@ -0,0 +1,46 @@
+package org.jenkinsci.plugins.envinject;
+
+import hudson.model.FreeStyleBuild;
+import hudson.model.FreeStyleProject;
+import hudson.model.Result;
+import junit.framework.Assert;
+import org.jvnet.hudson.test.HudsonTestCase;
+
+import java.util.Map;
+
+/**
+ * @author Gregory Boissinot
+ */
+public class EnvInjectEnvVarsEmpty extends HudsonTestCase {
+
+
+    public void testEmptyVars1() throws Exception {
+
+        FreeStyleProject project = createFreeStyleProject();
+        StringBuffer propertiesContent = new StringBuffer("EMPTYVAR1=\n");
+        propertiesContent.append("VAR2=VAL2");
+        EnvInjectJobPropertyInfo jobPropertyInfo = new EnvInjectJobPropertyInfo(null, propertiesContent.toString(), null, null, null, false);
+        EnvInjectJobProperty envInjectJobProperty = new EnvInjectJobProperty();
+        envInjectJobProperty.setOn(true);
+        envInjectJobProperty.setInfo(jobPropertyInfo);
+        project.addProperty(envInjectJobProperty);
+
+        FreeStyleBuild build = project.scheduleBuild2(0).get();
+        Assert.assertEquals(Result.SUCCESS, build.getResult());
+
+
+        org.jenkinsci.lib.envinject.EnvInjectAction envInjectAction = build.getAction(org.jenkinsci.lib.envinject.EnvInjectAction.class);
+        Assert.assertNotNull(envInjectAction);
+        Map<String, String> envVars = envInjectAction.getEnvMap();
+        Assert.assertNotNull(envVars);
+
+
+        String resultValEnvVar1 = envVars.get("EMPTYVAR1");
+        String resultValEnvVar2 = envVars.get("VAR2");
+        Assert.assertNotNull(resultValEnvVar1);
+        Assert.assertNotNull(resultValEnvVar2);
+
+        Assert.assertTrue(resultValEnvVar1.length() == 0);
+        Assert.assertEquals("VAL2", resultValEnvVar2);
+    }
+}