vmassol 2003/11/05 11:01:47
Modified: clover plugin.jelly plugin.properties project.xml
clover/xdocs changes.xml
Log:
Added optional properties to decide what reports to generate. Added a
<code>clover:report</code> goal which generates all the defined reports. The default
is to generate only the HTML report.
Revision Changes Path
1.11 +65 -19 maven-plugins/clover/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/clover/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 24 Sep 2003 05:14:53 -0000 1.10
+++ plugin.jelly 5 Nov 2003 19:01:47 -0000 1.11
@@ -85,12 +85,11 @@
<ant:mkdir dir="${maven.build.clover.classes}"/>
<ant:mkdir dir="${maven.clover.database.dir}"/>
<ant:mkdir dir="${cloverReportDirectory}"/>
-
-
+
<j:set var="tmp" value="${maven.build.clover.classes}"/>
${pom.getPluginContext('maven-java-plugin').setVariable('maven.build.dest',tmp)}
- <!--echo>Found maven-test-plugin:
${pom.getPluginContext('maven-test-plugin')}</echo-->
${pom.getPluginContext('maven-test-plugin').setVariable('maven.build.dest',tmp)}
+
</goal>
<!-- =================================================================== -->
@@ -98,14 +97,16 @@
<!-- =================================================================== -->
<goal name="clover"
- description="Generate HTML test coverage reports with Clover"
- prereqs="clover:html-report"/>
+ description="Generate test coverage reports with Clover"
+ prereqs="clover:report"/>
<goal name="clover:test" prereqs="clover:on">
- <!-- Make sure that the report is generated whether the tests pass or not -->
+
+ <!-- Make sure that the report is generated whether the tests pass or
+ not -->
<j:set var="ignoreTestFailureOld" value="${maven.test.failure.ignore}"/>
<j:set var="junitForkOld" value="${maven.junit.fork}"/>
-
+
<j:set var="maven.test.failure.ignore" scope="parent" value="true"/>
<j:set var="maven.junit.fork" scope="parent" value="true"/>
@@ -113,13 +114,51 @@
<j:set var="maven.test.failure.ignore" scope="parent"
value="${ignoreTestFailureOld}"/>
<j:set var="maven.junit.fork" scope="parent" value="${junitForkOld}"/>
+
+ </goal>
+
+ <!--
+ ========================================================================
+ Generate test coverage reports. It decides what kind of reports should
+ be generated.
+ ========================================================================
+ -->
+ <goal name="clover:report" prereqs="clover:test">
+ <j:if test="${context.getVariable('maven.clover.report.xml') == 'true'}">
+ <attainGoal name="clover:xml-report-internal"/>
+ </j:if>
+ <j:if test="${context.getVariable('maven.clover.report.html') == 'true'}">
+ <attainGoal name="clover:html-report-internal"/>
+ </j:if>
+ <j:if test="${context.getVariable('maven.clover.report.swing') == 'true'}">
+ <attainGoal name="clover:swing-report-internal"/>
+ </j:if>
+ </goal>
+
+ <!--
+ ========================================================================
+ Generate XML test coverage report.
+ ========================================================================
+ -->
+ <goal name="clover:xml-report-internal">
+ <ant:clover-report>
+ <current outfile="${maven.build.dir}/clover.xml"
+ title="${pom.name} - ${pom.currentVersion}">
+ <format type="xml" orderBy="${maven.clover.orderBy}"/>
+ </current>
+ </ant:clover-report>
</goal>
-
-
<goal
- name="clover:html-report"
- description="Generate HTML test coverage reports with Clover">
- <attainGoal name="clover:test"/>
+ name="clover:xml-report"
+ description="Generate XML test coverage reports with Clover"
+ prereqs="clover:test,clover:xml-report-internal"/>
+
+ <!--
+ ========================================================================
+ Generate HTML test coverage report.
+ ========================================================================
+ -->
+ <goal name="clover:html-report-internal">
<ant:clover-report>
<current
outfile="${cloverReportDirectory}"
@@ -128,14 +167,18 @@
</current>
</ant:clover-report>
</goal>
+ <goal
+ name="clover:html-report"
+ description="Generate HTML test coverage reports with Clover"
+ prereqs="clover:test,clover:html-report-internal"/>
- <goal
- name="clover:swing-report"
- prereqs="clover:test"
- description="Generate Swing test coverage reports with Clover">
-
+ <!--
+ ========================================================================
+ Generate Swing test coverage report.
+ ========================================================================
+ -->
+ <goal name="clover:swing-report-internal">
<ant:mkdir dir="${cloverReportDirectory}"/>
-
<ant:java classname="com.cortexeb.tools.clover.reporters.jfc.Viewer"
fork="yes">
<ant:arg line="${clover.initstring}"/>
@@ -144,7 +187,10 @@
<ant:pathelement path="${plugin.getDependencyPath('clover')}"/>
</ant:classpath>
</ant:java>
-
</goal>
+ <goal
+ name="clover:swing-report"
+ description="Generate Swing test coverage reports with Clover"
+ prereqs="clover:test,clover:swing-report-internal"/>
</project>
1.4 +6 -1 maven-plugins/clover/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/clover/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 24 Sep 2003 05:14:53 -0000 1.3
+++ plugin.properties 5 Nov 2003 19:01:47 -0000 1.4
@@ -8,4 +8,9 @@
maven.build.clover = ${maven.build.dir}/clover
maven.build.clover.classes = ${maven.build.clover}/classes
maven.clover.database.dir = ${maven.build.clover}/database
-maven.clover.orderBy=PcCoveredAsc
\ No newline at end of file
+maven.clover.orderBy=PcCoveredAsc
+
+# What are the reports that should be generated
+maven.clover.report.html=true
+maven.clover.report.xml=false
+maven.clover.report.swing=false
1.21 +6 -1 maven-plugins/clover/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/clover/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 10 Oct 2003 19:20:59 -0000 1.20
+++ project.xml 5 Nov 2003 19:01:47 -0000 1.21
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-clover-plugin</id>
<name>Maven Clover Plug-in</name>
- <currentVersion>1.2</currentVersion>
+ <currentVersion>1.3-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Produce Clover reports</shortDescription>
<url>http://maven.apache.org/reference/plugins/clover/</url>
@@ -19,6 +19,11 @@
<id>1.2</id>
<name>1.2</name>
<tag>NEVER RELEASED</tag>
+ </version>
+ <version>
+ <id>1.3</id>
+ <name>1.3</name>
+ <tag>HEAD</tag>
</version>
</versions>
<developers>
1.9 +12 -5 maven-plugins/clover/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/clover/xdocs/changes.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- changes.xml 29 Sep 2003 06:09:53 -0000 1.8
+++ changes.xml 5 Nov 2003 19:01:47 -0000 1.9
@@ -7,7 +7,16 @@
</properties>
<body>
- <release version="1.2" date="2003-09-29">
+
+ <release version="1.3" date="in CVS">
+ <action dev="vmassol" type="update">
+ Added optional properties to decide what reports to generate. Added
+ a <code>clover:report</code> goal which generates all the defined
+ reports. The default is to generate only the HTML report.
+ </action>
+ </release>
+
+ <release version="1.2" date="unknown">
<action dev="dion" type="fix">
Apply MAVEN-819. Allows a new property to be used to specify the
sort order of the HTML clover report.
@@ -22,16 +31,13 @@
<action dev="bwalding" type="update">
Upgrade to Clover 1.2
</action>
- </release>
-
- <release version="1.2" date="in CVS">
<action dev="vmassol" type="update">
Make sure that test failures or errors do not stop the generation
of the Clover reports.
</action>
</release>
- <release version="1.1" date="?">
+ <release version="1.1" date="unknown">
<action dev="vmassol" type="update">
The Clover plugin now depends on version 1.0 of the Clover jar.
</action>
@@ -44,6 +50,7 @@
Creation of this changes page.
</action>
</release>
+
<release version="1.0" date="unknown">
<action dev="vmassol" type="unknown">
This changes did not exist at that time. Please refer to CVS for
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
