You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by hl...@apache.org on 2005/05/26 04:59:43 UTC
cvs commit: jakarta-hivemind/jmx build.xml
hlship 2005/05/25 19:59:43
Modified: hivebuild module.properties
. status.xml
support update-copyrights.rb
library build.xml
hivebuild/hivedoc-xsl hivemind.xsl
framework build.xml
examples build.xml
jmx build.xml
Added: hivebuild/report-artifacts junit-report.xsl
hivebuild junit-report.xml
Log:
HIVEMIND-123: Add JUnit tests report.
Revision Changes Path
1.1 jakarta-hivemind/hivebuild/report-artifacts/junit-report.xsl
Index: junit-report.xsl
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!-- Transforms to Forrest XDOC format. -->
<xsl:output method="xml" indent="yes" encoding="US-ASCII" doctype-public="-//APACHE//DTD Documentation V1.3//EN" doctype-system="http://xml.apache.org/forrest/dtd/document-v13.dtd" />
<xsl:template match="/">
<document>
<header>
<title>JUnit Test Report</title>
</header>
<body>
<section>
<title>Test Suite Summary</title>
<p>
<strong> <xsl:value-of select="sum(//testsuite/@tests)"/> tests total. </strong>
</p>
<table>
<tr>
<th>TestCase</th>
<th>Tests</th>
<th>Time</th>
</tr>
<xsl:apply-templates select="//testsuite" mode="summary">
<xsl:sort select="@package"/>
<xsl:sort select="@name"/>
</xsl:apply-templates>
<tr>
<td>
<strong>** Total</strong>
</td>
<td>
<strong>
<xsl:value-of select="sum(//testsuite/@tests)"/>
</strong>
</td>
<td>
<strong>
<xsl:value-of select="sum(//testsuite/@time)"/>
</strong>
</td>
</tr>
</table>
</section>
<section>
<title>JUnit Test Details</title>
<table>
<tr>
<th>Test</th>
<th>Time</th>
</tr>
<xsl:apply-templates select="//testsuite" mode="detail">
<xsl:sort select="@package"/>
<xsl:sort select="@name"/>
</xsl:apply-templates>
</table>
</section>
</body>
</document>
</xsl:template>
<xsl:template match="testsuite" mode="summary">
<tr>
<td>
<link href="#{@package}.{@name}"><xsl:value-of select="@package"/>.<xsl:value-of select="@name"/></link>
</td>
<td>
<xsl:value-of select="@tests"/>
</td>
<td>
<xsl:value-of select="@time"/>
</td>
</tr>
</xsl:template>
<xsl:template match="testsuite" mode="detail">
<tr id="{@package}.{@name}">
<th colspan="2"> <xsl:value-of select="@package"/>.<xsl:value-of select="@name"/> </th>
</tr>
<xsl:apply-templates select="testcase"/>
</xsl:template>
<xsl:template match="testcase">
<tr>
<td>
<xsl:value-of select="@name"/>
</td>
<td>
<xsl:value-of select="@time"/>
</td>
</tr>
</xsl:template>
</xsl:stylesheet>
1.4 +3 -1 jakarta-hivemind/hivebuild/module.properties
Index: module.properties
===================================================================
RCS file: /home/cvs/jakarta-hivemind/hivebuild/module.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- module.properties 5 Jan 2005 22:23:12 -0000 1.3
+++ module.properties 26 May 2005 02:59:43 -0000 1.4
@@ -51,4 +51,6 @@
# Override this to compile if java sources uses JUnit classes.
module.junit.use=test
-forrest.report-menu.file=${project.forrest.xdocs.dir}/${module.name}-report-menu.ent
\ No newline at end of file
+forrest.report-menu.file=${project.forrest.xdocs.dir}/${module.name}-report-menu.ent
+
+module.forrest.xdocs.dir=${project.forrest.xdocs.dir}/${module.name}
1.1 jakarta-hivemind/hivebuild/junit-report.xml
Index: junit-report.xml
===================================================================
<?xml version="1.0"?>
<!--
Copyright 2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project name="junit-report">
<fail unless="ant.file.forrestdoc" message="Must import forrestdoc.xml first."/>
<macrodef name="junit-report">
<sequential>
<junitreport todir="${target.dir}">
<fileset dir="${junit.report.dir}" includes="*.xml"/>
</junitreport>
<announce message="Generating JUnit Report ..."/>
<style
in="${target.dir}/TESTS-TestSuites.xml"
out="${module.forrest.xdocs.dir}/junit-report.xml"
style="${forrest.report-artifacts.dir}/junit-report.xsl"/>
<add-report-to-menu element="junit-report" label="JUnit Report"
file="junit-report.html"/>
</sequential>
</macrodef>
</project>
1.141 +1 -0 jakarta-hivemind/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/status.xml,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- status.xml 25 May 2005 09:55:23 -0000 1.140
+++ status.xml 26 May 2005 02:59:43 -0000 1.141
@@ -44,6 +44,7 @@
<action type="fix" dev="HLS" fixes-bug="HIVEMIND-119"> Distribution .zip doesn't contain project directory </action>
<action type="add" dev="HLS"> Show counts of configuration points, service points and schemas in HiveDoc. </action>
<action type="add" dev="KW" fixes-bug="HIVEMIND-126" due-to="Richard Hensley"> New <push-content> rule added. </action>
+ <action type="add" dev="HLS" fixes-bug="HIVEMIND-123"> Add JUnit tests report. </action>
</release>
<release version="1.1-beta-1" date="Apr 29 2005">
<action type="fix" dev="JC" fixes-bug="HIVEMIND-108" >Bean services could not be autowired into other services.</action>
1.6 +1 -1 jakarta-hivemind/support/update-copyrights.rb
Index: update-copyrights.rb
===================================================================
RCS file: /home/cvs/jakarta-hivemind/support/update-copyrights.rb,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- update-copyrights.rb 10 Mar 2005 14:38:03 -0000 1.5
+++ update-copyrights.rb 26 May 2005 02:59:43 -0000 1.6
@@ -272,7 +272,7 @@
register_filter(/\.java$/, JavaFilter.new)
-register_filter(/(\/cli\.xconf|(\.(xml|jwc|application|library|page|script)))$/, XMLFilter.new)
+register_filter(/(\/cli\.xconf|(\.(xml|xsl|jwc|application|library|page|script)))$/, XMLFilter.new)
register_filter(/\.properties$/, PropertiesFilter.new)
$matches = 0
1.18 +3 -1 jakarta-hivemind/library/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/library/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 1 Mar 2005 20:40:10 -0000 1.17
+++ build.xml 26 May 2005 02:59:43 -0000 1.18
@@ -24,6 +24,7 @@
<import file="${root.dir}/hivebuild/jar-module.xml"/>
<import file="${hivebuild.dir}/javadoc-report.xml"/>
<import file="${hivebuild.dir}/clover-report.xml"/>
+ <import file="${hivebuild.dir}/junit-report.xml"/>
<target name="compile-dependencies">
@@ -50,8 +51,9 @@
</target>
<target name="run-reports">
+ <junit-report/>
<javadoc-report/>
- <clover-report/>
+ <clover-report/>
</target>
</project>
\ No newline at end of file
1.11 +1 -0 jakarta-hivemind/hivebuild/hivedoc-xsl/hivemind.xsl
Index: hivemind.xsl
===================================================================
RCS file: /home/cvs/jakarta-hivemind/hivebuild/hivedoc-xsl/hivemind.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hivemind.xsl 16 May 2005 14:51:40 -0000 1.10
+++ hivemind.xsl 26 May 2005 02:59:43 -0000 1.11
@@ -14,6 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect" extension-element-prefixes="redirect">
<xsl:template match="/registry">
<!-- The master index is one level up from most of the content, so a few things
1.23 +4 -1 jakarta-hivemind/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 18 May 2005 21:42:34 -0000 1.22
+++ build.xml 26 May 2005 02:59:43 -0000 1.23
@@ -25,7 +25,8 @@
<import file="${root.dir}/hivebuild/jar-module.xml"/>
<import file="${hivebuild.dir}/javadoc-report.xml"/>
<import file="${hivebuild.dir}/clover-report.xml"/>
-
+ <import file="${hivebuild.dir}/junit-report.xml"/>
+
<target name="compile-dependencies">
<ibiblio-dependency artifact="ant" version="1.6.3" group="ant"/>
<ibiblio-dependency artifact="commons-logging" version="1.0.3" group="commons-logging"/>
@@ -47,6 +48,8 @@
</target>
<target name="run-reports">
+
+ <junit-report/>
<javadoc-report/>
<default-clover>
1.15 +4 -2 jakarta-hivemind/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/examples/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 4 May 2005 16:00:56 -0000 1.14
+++ build.xml 26 May 2005 02:59:43 -0000 1.15
@@ -24,7 +24,8 @@
<import file="${hivebuild.dir}/javadoc-report.xml"/>
<import file="${hivebuild.dir}/clover-report.xml"/>
<import file="${hivebuild.dir}/hivedoc-report.xml"/>
-
+ <import file="${hivebuild.dir}/junit-report.xml"/>
+
<path id="hivedoc.classpath">
<path refid="default.hivedoc.classpath"/>
<fileset dir="${descriptor.src.dir}/META-INF">
@@ -69,9 +70,10 @@
</target>
<target name="run-reports">
+ <junit-report/>
<javadoc-report/>
<hivedoc-report doc-path-id="hivedoc.classpath"/>
- <clover-report/>
+ <clover-report/>
</target>
<target name="run-calculator" description="Execute the Calculator example.">
1.2 +4 -2 jakarta-hivemind/jmx/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/jmx/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 16 Apr 2005 14:41:39 -0000 1.1
+++ build.xml 26 May 2005 02:59:43 -0000 1.2
@@ -24,7 +24,8 @@
<import file="${root.dir}/hivebuild/jar-module.xml" />
<import file="${hivebuild.dir}/javadoc-report.xml" />
<import file="${hivebuild.dir}/clover-report.xml" />
-
+ <import file="${hivebuild.dir}/junit-report.xml"/>
+
<target name="compile-dependencies">
<ibiblio-dependency artifact="mx4j" version="2.1.1" group="mx4j" />
<ibiblio-dependency artifact="mx4j-tools" version="2.1.1" group="mx4j" />
@@ -38,8 +39,9 @@
</target>
<target name="run-reports">
+ <junit-report/>
<javadoc-report />
- <clover-report />
+ <clover-report />
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org