You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/02/22 15:37:33 UTC

svn commit: r1570844 - in /tomcat/tc7.0.x/trunk: ./ BUILDING.txt build.xml webapps/docs/changelog.xml

Author: kkolinko
Date: Sat Feb 22 14:37:33 2014
New Revision: 1570844

URL: http://svn.apache.org/r1570844
Log:
Merged r1570601, r1570713 from tomcat/trunk:
Allow to limit JUnit test run to a number of selected test case methods. 

BUILDING.txt says that Ant 1.8.x is needed.
If we require a later version of Ant, e.g. 1.9.3 due to javadoc task security fixes,
then Ant 1.8.2 comment in BUILDING.txt can be removed.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/BUILDING.txt
    tomcat/tc7.0.x/trunk/build.xml
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1570601,1570713

Modified: tomcat/tc7.0.x/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1570844&r1=1570843&r2=1570844&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc7.0.x/trunk/BUILDING.txt Sat Feb 22 14:37:33 2014
@@ -350,6 +350,16 @@ For example:
 
     test.entry=org.apache.catalina.util.TestServerInfo
 
+It is possible to further limit such run to a number of selected test
+methods by adding "test.entry.methods" property. The property specifies a
+comma-separated list of test case methods. (This feature requires
+Apache Ant 1.8.2 or later).
+
+For example:
+
+    test.entry=org.apache.el.lang.TestELArithmetic
+    test.entry.methods=testMultiply01,testMultiply02
+
 
 (7.3) Other configuration options
 

Modified: tomcat/tc7.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1570844&r1=1570843&r2=1570844&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Sat Feb 22 14:37:33 2014
@@ -1356,7 +1356,12 @@
                    extension="@{extension}${junit.formatter.extension}" />
 
         <!-- If test.entry is defined, run a single test, otherwise run all valid tests -->
-        <test todir="${tomcat.build}/logs" name="${test.entry}" if="test.entry"/>
+        <test todir="${tomcat.build}/logs" name="${test.entry}"
+              if="test.entry" unless="test.entry.methods"
+           />
+        <test todir="${tomcat.build}/logs" name="${test.entry}" methods="${test.entry.methods}"
+              if="test.entry.methods"
+           />
         <batchtest todir="${tomcat.build}/logs" unless="test.entry">
           <fileset dir="test" >
             <!-- Include all by default -->

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1570844&r1=1570843&r2=1570844&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Feb 22 14:37:33 2014
@@ -151,6 +151,10 @@
       <fix>
         Correct build script to avoid building JARs with empty packages. (markt)
       </fix>
+      <add>
+        Allow to limit JUnit test run to a number of selected test case
+        methods. (kkolinko)
+      </add>
     </changelog>
   </subsection>
 </section>



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