JENKINS-31150 - supporting multiple coma separated scm tags, aded tests

jenkinsci · Oct 24, 2015 · b20a96e · b20a96e
1 parent 3ddad7c
commit b20a96e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/rundeck/RundeckNotifier.java b/src/main/java/org/jenkinsci/plugins/rundeck/RundeckNotifier.java
@@ -635,9 +635,17 @@ private String[] extracttags(String tagsStr, String delimiter){
 
         if (tagsStr == null)
             return new String[0];
-
         List<String> list = new ArrayList<String>(Arrays.asList(tagsStr.split(delimiter)));
-        list.removeAll(Collections.singleton(""));
+
+        for (ListIterator<String> iterator = list.listIterator(); iterator.hasNext(); ) {
+            String tag  = iterator.next();
+            tag=tag.replaceAll("\\s+","").trim();
+            iterator.remove();
+            if (!tag.equals(""))
+                iterator.add(tag);
+
+        }
+
         return list.toArray(new String[list.size()]);
     }
 

diff --git a/src/test/java/org/jenkinsci/plugins/rundeck/RundeckNotifierTest.java b/src/test/java/org/jenkinsci/plugins/rundeck/RundeckNotifierTest.java
@@ -7,6 +7,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.lang.reflect.Array;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Properties;
 import org.apache.commons.io.FileUtils;
@@ -284,6 +286,32 @@ public void testWaitForRundeckJob() throws Exception {
     }
 
 
+    public void testGetTags(){
+
+        RundeckNotifier notifier;
+        String[] tags;
+
+        notifier = new RundeckNotifier("1", null, null, "#deploy", false, true);
+        tags= new String[] {"#deploy"};
+        assertTrue(Arrays.equals(tags, notifier.getTags()));
+
+        notifier = new RundeckNotifier("1", null, null, null, false, true);
+        tags= new String[0];
+        assertTrue(Arrays.equals(tags, notifier.getTags()));
+
+        notifier = new RundeckNotifier("1", null, null, "", false, true);
+        tags= new String[0];
+        assertTrue(Arrays.equals(tags, notifier.getTags()));
+
+        notifier = new RundeckNotifier("1", null, null, "  ", false, true);
+        tags= new String[0];
+        assertTrue(Arrays.equals(tags, notifier.getTags()));
+
+        notifier = new RundeckNotifier("1", null, null, "#tag1, #tag2", false, true);
+        tags= new String[] {"#tag1", "#tag2"};
+        assertTrue(Arrays.equals(tags, notifier.getTags()));
+
+    }
 
 
     private String createOptions() {