Author: carlos
Date: Tue Jun 14 12:12:23 2005
New Revision: 190649
URL: http://svn.apache.org/viewcvs?rev=190649&view=rev
Log:
Allow multiple patterns in testmatchpattern and testnotmatchpattern
Modified:
maven/maven-1/plugins/trunk/test/plugin.jelly
maven/maven-1/plugins/trunk/test/xdocs/changes.xml
maven/maven-1/plugins/trunk/test/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/test/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/plugin.jelly?rev=190649&r1=190648&r2=190649&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/test/plugin.jelly Tue Jun 14 12:12:23 2005
@@ -366,10 +366,21 @@
<batchtest todir="${maven.test.reportsDirectory}">
<fileset dir="${maven.test.searchdir}">
- <include name="${testmatchpattern}"/>
+
+ <!-- includes -->
+ <u:tokenize var="includeItems"
delim=",">${testmatchpattern}</u:tokenize>
+ <j:forEach var="include" items="${includeItems}">
+ <include name="${include}"/>
+ </j:forEach>
+
+ <!-- excludes -->
<j:if test="${context.getVariable('testnotmatchpattern') !=
null}">
- <exclude name="${testnotmatchpattern}"/>
+ <u:tokenize var="excludeItems"
delim=",">${testnotmatchpattern}</u:tokenize>
+ <j:forEach var="exclude" items="${excludeItems}">
+ <exclude name="${exclude}"/>
+ </j:forEach>
</j:if>
+
</fileset>
</batchtest>
Modified: maven/maven-1/plugins/trunk/test/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/xdocs/changes.xml?rev=190649&r1=190648&r2=190649&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/changes.xml Tue Jun 14 12:12:23 2005
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in CVS">
+ <action dev="carlos" type="update">Allow multiple patterns in
testmatchpattern and testnotmatchpattern</action>
<action dev="carlos" type="add">Added testnotmatchpattern that can be
used in test:match</action>
<action dev="carlos" type="fix" issue="MPTEST-48">Deprecated testmatch
property by testmatchpattern to allow more complex patterns in
test:match</action>
<action dev="brett" type="update">Deprecate dependency handle</action>
Modified: maven/maven-1/plugins/trunk/test/xdocs/properties.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/test/xdocs/properties.xml?rev=190649&r1=190648&r2=190649&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/test/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/test/xdocs/properties.xml Tue Jun 14 12:12:23
2005
@@ -255,14 +255,16 @@
<td>testmatchpattern</td>
<td>Yes (required in test:match)</td>
<td>
- Ant pattern used in test:match goal to specify the tests that
should run
+ List of ant patterns (spared by commas) used in test:match goal to
specify the
+ tests that should run
</td>
</tr>
<tr>
<td>testnotmatchpattern</td>
<td>Yes</td>
<td>
- Ant pattern used in test:match goal to specify the tests that
shouldn't run
+ List of ant patterns (spared by commas) used in test:match goal to
specify the
+ tests that shouldn't run
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
