Allow multiple patterns in testmatchpattern and testnotmatchpattern

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@190649 13f79535-47bb-0310-9956-ffa450edef68

test/plugin.jelly

@@ -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>
 

test/xdocs/changes.xml

@@ -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>

test/xdocs/properties.xml

@@ -255,14 +255,16 @@ maven.test.search.classdir=true
           <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>