[FIXED JENKINS-19944] Links to failed tests need to be URL encoded

jenkinsci · Oct 17, 2013 · ad56d7f · ad56d7f
1 parent f5be850
commit ad56d7f
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 6 deletions.
diff --git a/src/main/java/hudson/plugins/im/tools/MessageHelper.java b/src/main/java/hudson/plugins/im/tools/MessageHelper.java
@@ -49,8 +49,9 @@ public static String getBuildURL(AbstractBuild<?, ?> build) {
 	 * Returns the full URL to the test details page for a given test result;
 	 */
 	public static String getTestUrl(hudson.tasks.test.TestResult result) {
-		String url = getBuildURL(result.getOwner());
-		AbstractTestResultAction action = result.getTestResultAction();
+		String buildUrl = getBuildURL(result.getOwner());
+		@SuppressWarnings("rawtypes")
+        AbstractTestResultAction action = result.getTestResultAction();
 
 		TestObject parent = result.getParent();
 		TestResult testResultRoot = null;
@@ -62,10 +63,19 @@ public static String getTestUrl(hudson.tasks.test.TestResult result) {
 			parent = parent.getParent();
 		}
 
-		url += action.getUrlName()
+		String testUrl = action.getUrlName()
 			+ (testResultRoot != null ? testResultRoot.getUrl() : "")
 			+ result.getUrl();
-		return url;
+
+		String[] pathComponents = testUrl.split("/");
+		StringBuilder buf = new StringBuilder();
+		for (String c : pathComponents) {
+		    buf.append(Util.rawEncode(c)).append('/');
+		}
+		// remove last /
+		buf.deleteCharAt(buf.length() - 1);
+
+        return buildUrl + buf.toString();
 	}
 
 	/**
@@ -146,7 +156,7 @@ private static List<String> extractParameters(String commandLine) {
 	 * Note: Unfortunately in Java 5 there is no Arrays#copyOfRange, yet.
 	 * So we have to implement it ourself.
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> T[] copyOfRange(T[] original, int from, int to) {
         int newLength = to - from;
         if (newLength < 0)
@@ -178,7 +188,7 @@ public static <T> T[] copyOfRange(T[] original, int from, int to) {
      * 
      * Note: copied from java 6
      */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> T[] copyOf(T[] original, int newLength) {
 		Class type = original.getClass();
         T[] copy = (type == Object[].class)

diff --git a/src/test/java/hudson/plugins/im/tools/MessageHelperTest.java b/src/test/java/hudson/plugins/im/tools/MessageHelperTest.java
@@ -1,7 +1,12 @@
 package hudson.plugins.im.tools;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import hudson.model.AbstractBuild;
 import hudson.plugins.im.tools.MessageHelper;
+import hudson.tasks.test.AbstractTestResultAction;
+import hudson.tasks.test.TestResult;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -62,4 +67,22 @@ public void testConcat() {
 		concat = MessageHelper.concat(a);
 		Assert.assertArrayEquals(a, concat);
 	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+    @Test
+	public void testUrlShouldBeUrlEncoded() {
+	    TestResult result = mock(TestResult.class);
+	    AbstractBuild build = mock(AbstractBuild.class);
+	    when(build.getUrl()).thenReturn("/a build");
+
+	    AbstractTestResultAction action = mock(AbstractTestResultAction.class);
+	    when(action.getUrlName()).thenReturn("/action");
+
+	    when(result.getOwner()).thenReturn(build);
+	    when(result.getTestResultAction()).thenReturn(action);
+	    when(result.getUrl()).thenReturn("/some id with spaces");
+
+	    String testUrl = MessageHelper.getTestUrl(result);
+	    assertEquals("null/a%20build/action/some%20id%20with%20spaces", testUrl);
+	}
 }