Repository: maven-surefire Updated Branches: refs/heads/master 5d61287af -> 604147c54
Updated documentation in SUREFIRE-1047 and SUREFIRE-1097 Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/604147c5 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/604147c5 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/604147c5 Branch: refs/heads/master Commit: 604147c54bbe90444f5188e6f084c943b00e39ca Parents: 5d61287 Author: tibordigana <tibo...@lycos.com> Authored: Sun Oct 26 11:50:21 2014 +0100 Committer: tibordigana <tibo...@lycos.com> Committed: Sun Oct 26 11:50:21 2014 +0100 ---------------------------------------------------------------------- .../plugin/failsafe/IntegrationTestMojo.java | 7 ++++++- .../plugin/surefire/AbstractSurefireMojo.java | 20 +++++++++++++++++--- .../maven/plugin/surefire/SurefirePlugin.java | 7 ++++++- 3 files changed, 29 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/604147c5/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java index 91fdfa7..3aec1a1 100644 --- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java +++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java @@ -177,7 +177,12 @@ public class IntegrationTestMojo * Each include item may also contain a comma-separated sublist of items, which will be treated as multiple * <include> entries.<br/> * <p/> - * This parameter is ignored if the TestNG <code>suiteXmlFiles</code> parameter is specified. + * This parameter is ignored if the TestNG <code>suiteXmlFiles</code> parameter is specified.<br/> + * <br/> + * <em>Notice that</em> these values are relative to the directory containing generated test classes of the project + * being tested. This directory is declared by the parameter <code>testClassesDirectory</code> which defaults + * to the POM property <code>${project.build.testOutputDirectory}</code>, typically <em>src/test/java</em> + * unless overridden. */ @Parameter private List<String> includes; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/604147c5/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java index 7398a25..bf1b9cd 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java @@ -225,6 +225,11 @@ public abstract class AbstractSurefireMojo * <p/> * Each exclude item may also contain a comma-separated sublist of items, which will be treated as multiple * <exclude> entries.<br/> + * <br/> + * <em>Notice that</em> these values are relative to the directory containing generated test classes of the project + * being tested. This directory is declared by the parameter <code>testClassesDirectory</code> which defaults + * to the POM property <code>${project.build.testOutputDirectory}</code>, typically <em>src/test/java</em> + * unless overridden. */ @Parameter protected List<String> excludes; @@ -342,6 +347,15 @@ public abstract class AbstractSurefireMojo /** * Arbitrary JVM options to set on the command line. + * <br/> + * <br/> + * Using an alternate syntax for <em>argLine</em>, <pre>@{...}</pre> allows late replacement of properties when the + * plugin is executed, so properties that have been modified by other plugins will be picked up correctly. + * <br/> + * See the Frequently Asked Questions page with more details:<br/> + * http://maven.apache.org/surefire/maven-surefire-plugin/faq.html + * <br/> + * http://maven.apache.org/surefire/maven-failsafe-plugin/faq.html * * @since 2.1 */ @@ -482,9 +496,9 @@ public abstract class AbstractSurefireMojo protected boolean useUnlimitedThreads; /** - * (TestNG only) When you use the <code>parallel</code> attribute, TestNG will try to run all your test methods in - * separate threads, except for methods that depend on each other, which will be run in the same thread in order to - * respect their order of execution. + * (TestNG provider) When you use the <code>parallel</code> attribute, TestNG will try to run all your test methods + * in separate threads, except for methods that depend on each other, which will be run in the same thread in order + * to respect their order of execution. * <p/> * (JUnit 4.7 provider) Supports values "classes"/"methods"/"both" to run in separate threads, as controlled by * <code>threadCount</code>.<br/> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/604147c5/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java index ea6f9df..714d79d 100644 --- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java +++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java @@ -159,7 +159,12 @@ public class SurefirePlugin * Each include item may also contain a comma-separated sublist of items, which will be treated as multiple * <include> entries.<br/> * <p/> - * This parameter is ignored if the TestNG <code>suiteXmlFiles</code> parameter is specified. + * This parameter is ignored if the TestNG <code>suiteXmlFiles</code> parameter is specified.<br/> + * <br/> + * <em>Notice that</em> these values are relative to the directory containing generated test classes of the project + * being tested. This directory is declared by the parameter <code>testClassesDirectory</code> which defaults + * to the POM property <code>${project.build.testOutputDirectory}</code>, typically <em>src/test/java</em> + * unless overridden. */ @Parameter private List<String> includes;