dion 2004/01/07 20:42:40
Modified: test/xdocs properties.xml changes.xml
test plugin.jelly project.xml plugin.properties
Log:
Added maven.junit.format property that defaults to brief.
Changed formatters to use maven.junit.usefile consistently.
Only set 'dir' property of junit task if fork != 'no'
Revision Changes Path
1.9 +8 -0 maven-plugins/test/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/test/xdocs/properties.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- properties.xml 21 Sep 2003 09:14:56 -0000 1.8
+++ properties.xml 8 Jan 2004 04:42:40 -0000 1.9
@@ -20,6 +20,14 @@
</td>
</tr>
<tr>
+ <td>maven.junit.format</td>
+ <td>Yes</td>
+ <td>
+ Specifies the formatter to use for output to the console.
+ Defaults to <code>brief</code>
+ </td>
+ </tr>
+ <tr>
<td>maven.junit.dir</td>
<td>Yes</td>
<td>
1.8 +7 -0 maven-plugins/test/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/test/xdocs/changes.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- changes.xml 28 Oct 2003 00:56:55 -0000 1.7
+++ changes.xml 8 Jan 2004 04:42:40 -0000 1.8
@@ -6,6 +6,13 @@
</properties>
<body>
+ <release version="1.5" date="in CVS">
+ <action dev="dion" type="add">
+ Added maven.junit.format property that defaults to brief.
+ Changed formatters to use maven.junit.usefile consistently.
+ Only set 'dir' property of junit task if fork != 'no'
+ </action>
+ </release>
<release version="1.4" date="2003-09-29">
<action dev="dion" type="update">
Apply MAVEN-309. Reorganise classpaths so that it's test, build,
dependencies
1.23 +7 -8 maven-plugins/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/test/plugin.jelly,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- plugin.jelly 28 Oct 2003 22:28:39 -0000 1.22
+++ plugin.jelly 8 Jan 2004 04:42:40 -0000 1.23
@@ -89,9 +89,10 @@
<junit printSummary="${maven.junit.printSummary}"
failureProperty="maven.test.failure"
- fork="${maven.junit.fork}"
- dir="${maven.junit.dir}">
-
+ fork="${maven.junit.fork}">
+ <j:if
test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no')}">
+ <setProperty name="dir" value="${maven.junit.dir}" />
+ </j:if>
<sysproperty key="basedir" value="${basedir}"/>
<u:tokenize var="listOfProperties" delim="
">${maven.junit.sysproperties}</u:tokenize>
<j:forEach var="someProperty" items="${listOfProperties}">
@@ -102,7 +103,7 @@
<jvmarg value="${somejvmarg}"/>
</j:forEach>
<formatter type="xml"/>
- <formatter type="plain" usefile="${maven.junit.usefile}"/>
+ <formatter type="${maven.junit.format}" usefile="${maven.junit.usefile}"/>
<classpath>
<pathelement location="${maven.test.dest}"/>
<pathelement location="${maven.build.dest}"/>
@@ -201,8 +202,7 @@
<jvmarg value="${somejvmarg}"/>
</j:forEach>
<formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <formatter type="plain" usefile="true"/>
+ <formatter type="${maven.junit.format}"
usefile="${maven.junit.usefile}"/>
<classpath>
<pathelement location="${maven.test.dest}"/>
@@ -265,8 +265,7 @@
<jvmarg line="${jvmargs}"/>
</j:if>
<formatter type="xml"/>
- <formatter type="plain" usefile="false"/>
- <formatter type="plain" usefile="true"/>
+ <formatter type="${maven.junit.format}"
usefile="${maven.junit.usefile}"/>
<classpath>
<pathelement location="${maven.test.dest}"/>
1.21 +1 -1 maven-plugins/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/test/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 28 Dec 2003 04:30:10 -0000 1.20
+++ project.xml 8 Jan 2004 04:42:40 -0000 1.21
@@ -5,7 +5,7 @@
<pomVersion>3</pomVersion>
<id>maven-test-plugin</id>
<name>Maven Test Plug-in</name>
- <currentVersion>1.4</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Run JUnit tests</shortDescription>
<url>http://maven.apache.org/reference/plugins/test/</url>
1.7 +5 -3 maven-plugins/test/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/test/plugin.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.properties 21 Sep 2003 09:14:56 -0000 1.6
+++ plugin.properties 8 Jan 2004 04:42:40 -0000 1.7
@@ -4,11 +4,13 @@
# JUnit test plugin.
# -------------------------------------------------------------------
-maven.junit.fork = no
maven.junit.dir = ${basedir}
-maven.junit.usefile = true
+maven.junit.fork = no
+maven.junit.format=brief
+maven.junit.jvmargs=
maven.junit.printSummary=true
+maven.junit.usefile = true
+
maven.test.dest = ${maven.build.dir}/test-classes
maven.test.reportsDirectory = ${maven.build.dir}/test-reports
maven.test.skip = false
-maven.junit.jvmargs=
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
