[JENKINS-27203] Fix handling of environment variables

Replace longer variables first to avoid replacing a partial long name with a short name. Example: - NODE = abc - NODE_ID = 123 Result "abc_ID" instead of "123"
jenkinsci · Mar 2, 2015 · 2542acd · 2542acd
1 parent 5276576
commit 2542acd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/cmake/EnvVarReplacer.java b/src/main/java/hudson/plugins/cmake/EnvVarReplacer.java
@@ -1,12 +1,27 @@
 package hudson.plugins.cmake;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+class StringLengthComparator implements Comparator<String>
+{
+	@Override
+	public int compare(String lhs, String rhs)
+	{
+		return rhs.length() - lhs.length();
+	}
+}
+
 public class EnvVarReplacer {
 
 	public static String replace(String stringContainingEnvVars, Map<String, String> envVars) {
-		Set<String> keys = envVars.keySet();
+		List<String> keys = new ArrayList<String>(envVars.keySet());
+		Collections.sort(keys, new StringLengthComparator());
+
     	for (String key : keys) {
     		stringContainingEnvVars = 
     			stringContainingEnvVars.replaceAll("\\$" + key, envVars.get(key));

diff --git a/src/test/java/hudson/plugins/cmake/EnvVarReplacerTest.java b/src/test/java/hudson/plugins/cmake/EnvVarReplacerTest.java
@@ -15,12 +15,14 @@ public class EnvVarReplacerTest {
 
   @Test
   public void checkReplacement() throws Exception {
-    String strWithEnvVars = "Is $HOME in $PATH?";
-    String desired = "Is /home/jonnyro in /usr/bin/;/usr/local/bin/?";
+    String strWithEnvVars = "Is $HOME in $PATH? $NODE $NODE_ID";
+    String desired = "Is /home/jonnyro in /usr/bin/;/usr/local/bin/? abc123 987";
     HashMap<String,String> envVars = new HashMap<String,String>();
 
     envVars.put("HOME","/home/jonnyro"); 
     envVars.put("PATH","/usr/bin/;/usr/local/bin/");
+    envVars.put("NODE","abc123");
+    envVars.put("NODE_ID","987");
 
     EnvVarReplacer e = new EnvVarReplacer();