More compact layout of SuiteExecutionReport

This commit aligns the format of the SuiteExecutionReport to the more compact and more readable TestTextFormatter format: * Duration put to the front * Page name and path are in separate columns * Instead of an absolute path only a relative path is printed.
six42 · Mar 31, 2015 · eb41839 · eb41839
1 parent 6509b04
commit eb41839
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/fitnesse/reporting/history/SuiteExecutionReport.java b/src/fitnesse/reporting/history/SuiteExecutionReport.java
@@ -160,6 +160,14 @@ public String getRelativePageName() {
       return PathParser.parse(pageName).last();
     }
 
+    public String getPath() {
+        return PathParser.parse(pageName).parentPath().toString();
+      }
+
+    public String subtractFromFront(String operand){
+    	return  PathParser.parse(pageName).parentPath().subtractFromFront(PathParser.parse(operand)).toString();
+    }
+
     public long getTime() {
       return time;
     }

diff --git a/src/fitnesse/resources/templates/suiteExecutionReport.vm b/src/fitnesse/resources/templates/suiteExecutionReport.vm
@@ -28,11 +28,13 @@
     <th class="numeric">Wrong</th>
     <th class="numeric">Ignored</th>
     <th class="numeric">Exceptions</th>
-    <th>Page</th>
     #if($suiteExecutionReport.hasRunTimes())
     <th class="numeric">Run&nbsp;time&nbsp;(ms)</th>
     #end
+    <th>Page</th>
+    <th>Path</th>
   </tr>
+  #set ($previousPage = $suiteExecutionReport.getRootPath())
   #foreach($pageHistoryReference in $suiteExecutionReport.getPageHistoryReferences())
   #set($counts = $pageHistoryReference.getTestSummary())
   <tr class="$ExecutionResult.getExecutionResult($pageHistoryReference.pageName, $counts)">
@@ -48,14 +50,17 @@
     <td class="numeric">
       $counts.Exceptions
     </td>
-    <td>
-      <a href="$pageHistoryReference.pageName?pageHistory&resultDate=$pageHistoryReference.getResultDate()">$pageHistoryReference.getPageName()</a>
-    </td>
     #if($suiteExecutionReport.hasRunTimes())
     <td class="numeric">
       $pageHistoryReference.RunTimeInMillis
     </td>
     #end
+    <td>
+      <a href="$pageHistoryReference.pageName?pageHistory&resultDate=$pageHistoryReference.getResultDate()">$pageHistoryReference.getRelativePageName()</a>
+    </td>
+    <td>
+      $pageHistoryReference.subtractFromFront($previousPage)
+    </td>
   </tr>
   #end
 </table>