From 6ebcd2d97dbfbacf133c9a68877d137e196974bc Mon Sep 17 00:00:00 2001
From: mindless <mindless@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sun, 8 Nov 2009 17:44:44 +0000
Subject: [PATCH] [FIXED HUDSON-4765] Fix broken links for failed tests on
 MatrixBuild page. Also removed extra slashes in links on MatrixTestResult
 page.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@23569 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../src/main/java/hudson/tasks/test/MatrixTestResult.java | 7 +++++++
 .../hudson/tasks/test/MatrixTestResult/index.jelly        | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java b/core/src/main/java/hudson/tasks/test/MatrixTestResult.java
index 96d52a03b3..a61302ec34 100644
--- a/core/src/main/java/hudson/tasks/test/MatrixTestResult.java
+++ b/core/src/main/java/hudson/tasks/test/MatrixTestResult.java
@@ -28,6 +28,7 @@ import hudson.model.Action;
 import hudson.matrix.MatrixBuild;
 import hudson.matrix.Combination;
 import hudson.matrix.MatrixRun;
+import hudson.tasks.junit.CaseResult;
 
 /**
  * {@link Action} that aggregates all the test results from {@link MatrixRun}s.
@@ -55,4 +56,10 @@ public class MatrixTestResult extends AggregatedTestResultAction {
         MatrixBuild b = (MatrixBuild)owner;
         return b.getRun(Combination.fromString(child.name));
     }
+
+    @Override
+    public String getTestResultPath(CaseResult it) {
+        // Prepend Configuration path
+        return it.getOwner().getParent().getShortUrl() + super.getTestResultPath(it);
+    }
 }
diff --git a/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly b/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly
index 92099f3e48..8357c5276a 100644
--- a/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly
+++ b/core/src/main/resources/hudson/tasks/test/MatrixTestResult/index.jelly
@@ -41,7 +41,7 @@ THE SOFTWARE.
         <j:forEach var="report" items="${it.childReports}">
           <tr>
             <td class="pane">
-              <a href="../${report.child.project.shortUrl}/testReport">${report.child.project.name}</a>
+              <a href="../${report.child.project.shortUrl}testReport">${report.child.project.name}</a>
             </td>
             <td class="pane" style="text-align:right;">
               ${report.result.durationString}
@@ -73,7 +73,7 @@ THE SOFTWARE.
 
           <h3>
             <a name="${report.child.project.name}"/>
-            <a href="../${report.child.project.shortUrl}/testReport">${report.child.project.name}</a>
+            <a href="../${report.child.project.shortUrl}testReport">${report.child.project.name}</a>
           </h3>
 
           <table class="pane sortable">
@@ -85,7 +85,7 @@ THE SOFTWARE.
             <j:forEach var="f" items="${report.result.failedTests}" varStatus="i">
               <tr>
                 <td class="pane">
-                  <a href="../${report.child.project.shortUrl}/testReport/${f.getRelativePathFrom(report.result)}">
+                  <a href="../${report.child.project.shortUrl}testReport/${f.getRelativePathFrom(report.result)}">
                     <st:out value="${f.fullName}"/>
 		          	<st:nbsp/>
 			        <j:forEach var="badge" items="${f.testActions}">
@@ -106,4 +106,4 @@ THE SOFTWARE.
       </j:forEach>
     </l:main-panel>
   </l:layout>
-</j:jelly>
\ No newline at end of file
+</j:jelly>