From dcc3f1ea4f0ae28b43294553b543c464f40733dd Mon Sep 17 00:00:00 2001
From: epugh <epugh@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 8 Jul 2004 13:08:38 +0000
Subject: [PATCH] Show unit tests results in results tab of cc

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115711 13f79535-47bb-0310-9956-ffa450edef68
---
 cruisecontrol/src/plugin-resources/cruisecontrol.jsl | 4 +++-
 cruisecontrol/src/plugin-test/cvs-scm/maven.xml      | 3 +++
 cruisecontrol/xdocs/changes.xml                      | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
index 80da28e3..53460472 100644
--- a/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
+++ b/cruisecontrol/src/plugin-resources/cruisecontrol.jsl
@@ -55,7 +55,9 @@
         <schedule interval="${maven.cruisecontrol.schedule.interval}">
           <maven mavenscript="${maven.home}/bin/maven" goal="${maven.cruisecontrol.goals}" projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
         </schedule>
-        <log dir="${maven.cruisecontrol.logs.dir}/${pom.artifactId}"/>
+        <log dir="${maven.cruisecontrol.logs.dir}/${pom.artifactId}">
+          <merge dir="${maven.cruisecontrol.checkout.dir}/${module}/target/test-reports"/> 
+        </log>
         <publishers>
           <currentbuildstatuspublisher file="${maven.cruisecontrol.logs.dir}/currentbuildstatus.txt"/>
           <htmlemail 
diff --git a/cruisecontrol/src/plugin-test/cvs-scm/maven.xml b/cruisecontrol/src/plugin-test/cvs-scm/maven.xml
index aa67d23e..4f19f32d 100644
--- a/cruisecontrol/src/plugin-test/cvs-scm/maven.xml
+++ b/cruisecontrol/src/plugin-test/cvs-scm/maven.xml
@@ -57,6 +57,9 @@
     <x:set var="count" select="count($cruisecontrolDoc/cruisecontrol/project/modificationset/cvs)"/>
     <assert:assertEquals expected="1" value="${count.intValue().toString()}"/>  
     
+    <x:set var="count" select="count($cruisecontrolDoc/cruisecontrol/project/log/merge)"/>
+    <assert:assertEquals expected="1" value="${count.intValue().toString()}"/> 
+    
   </goal>  
 
 
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index 6a39ca3a..d5e71f81 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.3" date="2004-06-18">
+      <action dev="epugh" type="add" issue="MPCRUISECONTROL-6" due-to="Paul Spencer">Show unit test results in Test Results tab.</action>
       <action dev="brett" type="add" issue="MPCRUISECONTROL-3" due-to="Carsten Ziegeler">implementation of run goal</action>
       <action dev="epugh" type="add">Allow SVN repositories to by used by cruisecontrol.</action>
       <action dev="epugh" type="fix">allow the maven.cruisecontrol.home property to be overrided by other plugins via preGoal calls.</action>