From 5092c2c19f408be2043e488a96242d755d71edfe Mon Sep 17 00:00:00 2001
From: epugh <epugh@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 8 Jul 2005 21:32:44 +0000
Subject: [PATCH] MPSIMIAN-7 customization of patternsets searched in test dir

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@209894 13f79535-47bb-0310-9956-ffa450edef68
---
 simian/plugin.jelly                           |  5 +-
 simian/plugin.properties                      |  2 +
 simian/project.properties                     |  1 +
 .../org/apache/maven/simian/ExcludeMe.java    | 52 +++++++++++++++++++
 simian/xdocs/changes.xml                      |  3 +-
 simian/xdocs/properties.xml                   | 24 +++++++++
 6 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 simian/src/test/org/apache/maven/simian/ExcludeMe.java

diff --git a/simian/plugin.jelly b/simian/plugin.jelly
index d5c1cbec..14c31972 100644
--- a/simian/plugin.jelly
+++ b/simian/plugin.jelly
@@ -84,7 +84,10 @@
       <j:set var="includeTests" value="${maven.simian.includetests}"/>
       <j:if test="${includeTests == 'true'}">
         <j:if test="${unitTestSourcesPresent == 'true'}">
-          <ant:fileset dir="${pom.build.unitTestSourceDirectory}" includes="**/*.java"/>
+          <ant:fileset dir="${pom.build.unitTestSourceDirectory}">
+            <ant:include name="${maven.simian.testincludes}"/>
+            <ant:exclude name="${maven.simian.testexcludes}"/>          
+          </ant:fileset>
         </j:if>
       </j:if>
 
diff --git a/simian/plugin.properties b/simian/plugin.properties
index fe2de42b..7155b7d5 100644
--- a/simian/plugin.properties
+++ b/simian/plugin.properties
@@ -25,3 +25,5 @@ maven.simian.ignoremodifiers = false
 
 maven.simian.includes = **/*.java
 maven.simian.excludes = 
+maven.simian.testincludes = **/*.java
+maven.simian.testexcludes = 
diff --git a/simian/project.properties b/simian/project.properties
index bc408a43..7d9abd54 100644
--- a/simian/project.properties
+++ b/simian/project.properties
@@ -19,3 +19,4 @@
 # -------------------------------------------------------------------
 maven.javadoc.links = http://java.sun.com/j2se/1.4.1/docs/api/
 maven.junit.fork=yes
+maven.simian.testexcludes = **/ExcludeMe.java
diff --git a/simian/src/test/org/apache/maven/simian/ExcludeMe.java b/simian/src/test/org/apache/maven/simian/ExcludeMe.java
new file mode 100644
index 00000000..38592ff5
--- /dev/null
+++ b/simian/src/test/org/apache/maven/simian/ExcludeMe.java
@@ -0,0 +1,52 @@
+package org.apache.maven.simian;
+
+/* ====================================================================
+ *   Copyright 2001-2004 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.
+ * ====================================================================
+ */
+
+/**
+ *
+ * @author Eric Pugh
+ * @version $Revision: 170200 $
+ */
+public class ExcludeMe {
+    public void iShouldNotBeIncluded() {
+        String one = "one";
+        String two = "two";
+        String three = "three";
+        String four = "four";
+        String five= "five";
+        String six = "six";
+        String seven = "seven";
+        String eight = "eight";
+        String nine = "nine";
+        String ten = "ten";
+    }
+
+    public void iShouldNotBeIncluded2() {
+        String one = "one";
+        String two = "two";
+        String three = "three";
+        String four = "four";
+        String five= "five";
+        String six = "six";
+        String seven = "seven";
+        String eight = "eight";
+        String nine = "nine";
+    }
+
+   
+}
diff --git a/simian/xdocs/changes.xml b/simian/xdocs/changes.xml
index c7783a0f..567bb3d6 100644
--- a/simian/xdocs/changes.xml
+++ b/simian/xdocs/changes.xml
@@ -26,7 +26,8 @@
   </properties>
   <body>
     <release version="1.5" date="in CVS">
-      <action dev="benoitx" type="update">Upgrade to Simian 2.2.4 and XML file output from Simian.</action>
+      <action dev="epugh" type="add" issue="MPSIMIAN-7">Add include/exclude pattern for test directories.</action>
+      <action dev="benoitx" type="update" issue="MPSIMIAN-14">Upgrade to Simian 2.2.4 and XML file output from Simian.</action>
     </release>
     <release version="1.4.1-SNAPSHOT" date="in CVS">
       <action dev="dion" type="update">Ant dependency changed to 1.5.3.1.</action>
diff --git a/simian/xdocs/properties.xml b/simian/xdocs/properties.xml
index 7184214e..4ad6e223 100644
--- a/simian/xdocs/properties.xml
+++ b/simian/xdocs/properties.xml
@@ -110,6 +110,30 @@
             <code>${maven.src.dir}</code>.  The default value is to not
             exclude any files.
           </td>
+        </tr>         
+        <tr>
+          <td>maven.simian.testincludes</td>
+          <td>Yes</td>
+          <td>
+            Specifies a comma-separated list of Ant patterns to use
+            when matching files in the test source tree to be included in the
+            Simian report.  The pattern specified is relative to
+            <code>${pom.build.unitTestSourceDirectory}</code>.  The default value is
+            <code>**/*.java</code>, which matches all Java source files
+            in the source tree (specified by the <code>${pom.build.unitTestSourceDirectory}</code>
+            property.
+          </td>
+        </tr>       
+        <tr>
+          <td>maven.simian.testexcludes</td>
+          <td>Yes</td>
+          <td>
+            Specifies a comma-separated list of Ant patterns to use when
+            matching files in the test source tree to be excluded from the
+            Simian report.  The pattern specified is relative to
+            <code>${pom.build.unitTestSourceDirectory}</code>.  The default value is to not
+            exclude any files.
+          </td>
         </tr>          
       </table>
     </section>