You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/04/12 22:08:25 UTC
svn commit: r393589 - in /maven/maven-1/plugins/trunk/junit-report:
src/plugin-resources/junit.jsl xdocs/changes.xml
Author: ltheussl
Date: Wed Apr 12 13:08:23 2006
New Revision: 393589
URL: http://svn.apache.org/viewcvs?rev=393589&view=rev
Log:
PR: MPJUNITREPORT-6
Submitted by: Cyrille Le Clerc
Include System.out/System.err in the generated report.
Modified:
maven/maven-1/plugins/trunk/junit-report/src/plugin-resources/junit.jsl
maven/maven-1/plugins/trunk/junit-report/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/junit-report/src/plugin-resources/junit.jsl
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/junit-report/src/plugin-resources/junit.jsl?rev=393589&r1=393588&r2=393589&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/junit-report/src/plugin-resources/junit.jsl (original)
+++ maven/maven-1/plugins/trunk/junit-report/src/plugin-resources/junit.jsl Wed Apr 12 13:08:23 2006
@@ -27,6 +27,7 @@
xmlns:util="jelly:util"
xmlns:junit="junit"
xmlns:doc="doc"
+ xmlns:ant="jelly:ant"
trim="false">
<j:useBean var="stringTool" class="org.apache.maven.util.StringTool"/>
@@ -249,6 +250,54 @@
<j:forEach var="testsuite" items="${testsuites}">
<a name="${testsuite.attribute('name').value}"></a>
<subsection name="${testsuite.attribute('name').value}">
+ <j:set var="package" value="${testsuite.attribute('package').value}" />
+ <j:set var="name" value="${testsuite.attribute('name').value}" />
+ <j:set var="systemOut" value="${testsuite.element('system-out').getText()}" />
+ <j:set var="systemErr" value="${testsuite.element('system-err').getText()}" />
+
+ <j:set var="baseFolder">${maven.build.dir}/generated-xdocs/junit-report/${package.replaceAll('\.','/')}</j:set>
+ <ant:mkdir dir="${baseFolder}"/>
+
+ <p>
+ <j:if test="${systemOut.length() > 0 }">
+ <j:set var="systemOutFilePath">${baseFolder}/${name}-out.xml</j:set>
+ [<a href="junit-report/${package.replaceAll('\.','/')}/${name}-out.html">system out</a>]
+ <j:file name="${systemOutFilePath}" outputMode="xml">
+ <document>
+ <properties>
+ <title>System Out for ${name}</title>
+ </properties>
+ <body>
+ <section name="System Out for ${name}">
+ <code>
+ <pre>${systemOut}</pre>
+ </code>
+ </section>
+ </body>
+ </document>
+ </j:file>
+ </j:if>
+
+ <j:if test="${systemErr.length() > 0 }">
+ <j:set var="systemErrFilePath">${baseFolder}/${name}-err.xml</j:set>
+ [<a href="junit-report/${package.replaceAll('\.','/')}/${name}-err.html">system err</a>]
+ <j:file name="${systemErrFilePath}" outputMode="xml">
+ <document>
+ <properties>
+ <title>System Err for ${name}</title>
+ </properties>
+ <body>
+ <section name="System Err for ${name}">
+ <code>
+ <pre>${systemErr}</pre>
+ </code>
+ </section>
+ </body>
+ </document>
+ </j:file>
+ </j:if>
+ </p>
+
<table summary="Testsuite: ${testsuite.attribute('name').value}">
<x:set var="errors" select="$testsuite/error"/>
Modified: maven/maven-1/plugins/trunk/junit-report/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/junit-report/xdocs/changes.xml?rev=393589&r1=393588&r2=393589&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/junit-report/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/junit-report/xdocs/changes.xml Wed Apr 12 13:08:23 2006
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.5.1-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="add" issue="MPJUNITREPORT-6" due-to="Cyrille Le Clerc">Include System.out/System.err in the generated report.</action>
<action dev="ltheussl" type="fix" issue="MPJUNITREPORT-8">Add description for default goal.</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>