You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ep...@apache.org on 2005/07/08 23:32:44 UTC

svn commit: r209894 - in /maven/maven-1/plugins/trunk/simian: plugin.jelly plugin.properties project.properties src/test/org/apache/maven/simian/ExcludeMe.java xdocs/changes.xml xdocs/properties.xml

Author: epugh
Date: Fri Jul  8 14:32:44 2005
New Revision: 209894

URL: http://svn.apache.org/viewcvs?rev=209894&view=rev
Log:
MPSIMIAN-7 customization of patternsets searched in test dir

Added:
    maven/maven-1/plugins/trunk/simian/src/test/org/apache/maven/simian/ExcludeMe.java
Modified:
    maven/maven-1/plugins/trunk/simian/plugin.jelly
    maven/maven-1/plugins/trunk/simian/plugin.properties
    maven/maven-1/plugins/trunk/simian/project.properties
    maven/maven-1/plugins/trunk/simian/xdocs/changes.xml
    maven/maven-1/plugins/trunk/simian/xdocs/properties.xml

Modified: maven/maven-1/plugins/trunk/simian/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/simian/plugin.jelly?rev=209894&r1=209893&r2=209894&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/simian/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/simian/plugin.jelly Fri Jul  8 14:32:44 2005
@@ -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>
 

Modified: maven/maven-1/plugins/trunk/simian/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/simian/plugin.properties?rev=209894&r1=209893&r2=209894&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/simian/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/simian/plugin.properties Fri Jul  8 14:32:44 2005
@@ -25,3 +25,5 @@
 
 maven.simian.includes = **/*.java
 maven.simian.excludes = 
+maven.simian.testincludes = **/*.java
+maven.simian.testexcludes = 

Modified: maven/maven-1/plugins/trunk/simian/project.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/simian/project.properties?rev=209894&r1=209893&r2=209894&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/simian/project.properties (original)
+++ maven/maven-1/plugins/trunk/simian/project.properties Fri Jul  8 14:32:44 2005
@@ -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

Added: maven/maven-1/plugins/trunk/simian/src/test/org/apache/maven/simian/ExcludeMe.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/simian/src/test/org/apache/maven/simian/ExcludeMe.java?rev=209894&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/simian/src/test/org/apache/maven/simian/ExcludeMe.java (added)
+++ maven/maven-1/plugins/trunk/simian/src/test/org/apache/maven/simian/ExcludeMe.java Fri Jul  8 14:32:44 2005
@@ -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";
+    }
+
+   
+}

Modified: maven/maven-1/plugins/trunk/simian/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/simian/xdocs/changes.xml?rev=209894&r1=209893&r2=209894&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/simian/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/simian/xdocs/changes.xml Fri Jul  8 14:32:44 2005
@@ -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>

Modified: maven/maven-1/plugins/trunk/simian/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/simian/xdocs/properties.xml?rev=209894&r1=209893&r2=209894&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/simian/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/simian/xdocs/properties.xml Fri Jul  8 14:32:44 2005
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org