You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by kr...@apache.org on 2010/07/29 23:09:41 UTC

svn commit: r980574 - in /maven/surefire/trunk: maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java

Author: krosenvold
Date: Thu Jul 29 21:09:41 2010
New Revision: 980574

URL: http://svn.apache.org/viewvc?rev=980574&view=rev
Log:
o Updated some javadocs on the plugins. 

Modified:
    maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
    maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java

Modified: maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java?rev=980574&r1=980573&r2=980574&view=diff
==============================================================================
--- maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java (original)
+++ maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java Thu Jul 29 21:09:41 2010
@@ -433,7 +433,7 @@ public class IntegrationTestMojo
     private String testNGArtifactName;
 
     /**
-     * (TestNG only) The attribute thread-count allows you to specify how many threads should be allocated for this execution. Only
+     * (TestNG/JUnit 4.7 provider only) The attribute thread-count allows you to specify how many threads should be allocated for this execution. Only
      * makes sense to use in conjunction with parallel.
      *
      * @parameter expression="${threadCount}"
@@ -442,7 +442,7 @@ public class IntegrationTestMojo
     private int threadCount;
 
     /**
-     * (junitcore only) Indicates that threadCount is per cpu core. Defaults to true
+     * (JUnit 4.7 provider) Indicates that threadCount is per cpu core. Defaults to true
      *
      * @parameter expression="${perCoreThreadCount}"
      * @since 2.5
@@ -450,7 +450,7 @@ public class IntegrationTestMojo
     private String perCoreThreadCount;
 
     /**
-     * (junitcore only) Indicates that the thread pool will be unlimited. The parallel parameter and the actual number of classes/methods
+     * (JUnit 4.7 provider) Indicates that the thread pool will be unlimited. The parallel parameter and the actual number of classes/methods
      * will decide. Setting this to true effectively disables perCoreThreadCount and threadCount.
      *
      * @parameter expression="${useUnlimitedThreads}"
@@ -463,7 +463,7 @@ public class IntegrationTestMojo
      * methods that depend on each other, which will be run in the same thread in order to respect their order of
      * execution.
      * <p/>
-     * In JUnit 4.7 the values are classes/methods/both to run in separate threads, as controlled by threadCount.
+     * (JUnit 4.7 provider) Supports values classes/methods/both to run in separate threads, as controlled by threadCount.
      *
      * @parameter expression="${parallel}"
      * @todo test how this works with forking, and console/file output parallelism

Modified: maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=980574&r1=980573&r2=980574&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java Thu Jul 29 21:09:41 2010
@@ -410,7 +410,7 @@ public class SurefirePlugin
     private String testNGArtifactName;
 
     /**
-     * (TestNG only) The attribute thread-count allows you to specify how many threads should be allocated for this execution. Only
+     * (TestNG/JUnit 4.7 provider only) The attribute thread-count allows you to specify how many threads should be allocated for this execution. Only
      * makes sense to use in conjunction with parallel.
      *
      * @parameter expression="${threadCount}"
@@ -419,7 +419,7 @@ public class SurefirePlugin
     private int threadCount;
 
     /**
-     * (junitcore only) Indicates that threadCount is per cpu core. Defaults to true
+     * (JUnit 4.7 provider) Indicates that threadCount is per cpu core. Defaults to true
      *
      * @parameter expression="${perCoreThreadCount}"
      * @since 2.5
@@ -427,7 +427,7 @@ public class SurefirePlugin
     private String perCoreThreadCount;
 
     /**
-     * (junitcore only) Indicates that the thread pool will be unlimited. The parallel parameter and the actual number of classes/methods
+     * (JUnit 4.7 provider) Indicates that the thread pool will be unlimited. The parallel parameter and the actual number of classes/methods
      * will decide. Setting this to true effectively disables perCoreThreadCount and threadCount.
      *
      * @parameter expression="${useUnlimitedThreads}"
@@ -440,7 +440,7 @@ public class SurefirePlugin
      * methods that depend on each other, which will be run in the same thread in order to respect their order of
      * execution.
      * <p/>
-     * In JUnit 4.7 the values are classes/methods/both to run in separate threads, as controlled by threadCount.
+     * (JUnit 4.7 provider) Supports values classes/methods/both to run in separate threads, as controlled by threadCount.
      *
      * @parameter expression="${parallel}"
      * @todo test how this works with forking, and console/file output parallelism