Updated Branches: refs/heads/master 25e8a5933 -> 8f18aa724
[SUREFIRE-958] Fix documentation of "includes" property o includes property now has separated javadocs for failsafe and surefire Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/8f18aa72 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8f18aa72 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8f18aa72 Branch: refs/heads/master Commit: 8f18aa72440825d4af237818685a334e2abdc540 Parents: 25e8a59 Author: Andreas Gudian <andreas.gud...@gmail.com> Authored: Wed Feb 20 19:39:58 2013 +0100 Committer: Andreas Gudian <andreas.gud...@gmail.com> Committed: Wed Feb 20 19:39:58 2013 +0100 ---------------------------------------------------------------------- .../maven/plugin/failsafe/IntegrationTestMojo.java | 31 ++++++++++++++- .../plugin/surefire/AbstractSurefireMojo.java | 28 +------------ .../maven/plugin/surefire/SurefirePlugin.java | 28 +++++++++++++ 3 files changed, 60 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8f18aa72/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 fd1f5fb..8716ce1 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 @@ -136,7 +136,24 @@ public class IntegrationTestMojo */ @Parameter( property = "failsafe.timeout" ) private int forkedProcessTimeoutInSeconds; - + + /** + * A list of <include> elements specifying the tests (by pattern) that should be included in testing. When not + * specified and when the <code>test</code> parameter is not specified, the default includes will be <code><br/> + * <includes><br/> + * <include>**/IT*.java</include><br/> + * <include>**/*IT.java</include><br/> + * <include>**/*ITCase.java</include><br/> + * </includes><br/> + * </code> + * <p/> + * 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. + */ + @Parameter + private List<String> includes; /** * Option to pass dependencies to the system's classloader instead of using an isolated class loader when forking. @@ -492,4 +509,16 @@ public class IntegrationTestMojo { this.failIfNoSpecifiedTests = failIfNoSpecifiedTests; } + + @Override + public List<String> getIncludes() + { + return includes; + } + + @Override + public void setIncludes( List<String> includes ) + { + this.includes = includes; + } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8f18aa72/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 d97848d..bb88358 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 @@ -202,24 +202,6 @@ public abstract class AbstractSurefireMojo protected File testSourceDirectory; /** - * A list of <include> elements specifying the tests (by pattern) that should be included in testing. When not - * specified and when the <code>test</code> parameter is not specified, the default includes will be <code><br/> - * <includes><br/> - * <include>**/IT*.java</include><br/> - * <include>**/*IT.java</include><br/> - * <include>**/*ITCase.java</include><br/> - * </includes><br/> - * </code> - * <p/> - * 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. - */ - @Parameter - protected List<String> includes; - - /** * A file containing include patterns. * Blank lines, or lines starting with # are ignored. If {@code includes} are also specified these patterns are appended. */ @@ -2091,20 +2073,14 @@ public abstract class AbstractSurefireMojo } - public List<String> getIncludes() - { - return includes; - } + public abstract List<String> getIncludes(); public File getIncludesFile() { return includesFile; } - public void setIncludes( List<String> includes ) - { - this.includes = includes; - } + public abstract void setIncludes( List<String> includes ); public List<String> getExcludes() { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8f18aa72/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 7582ff9..86d23cd 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 @@ -119,6 +119,24 @@ public class SurefirePlugin */ @Parameter( property = "surefire.timeout" ) private int forkedProcessTimeoutInSeconds; + + /** + * A list of <include> elements specifying the tests (by pattern) that should be included in testing. When not + * specified and when the <code>test</code> parameter is not specified, the default includes will be <code><br/> + * <includes><br/> + * <include>**/*Test*.java</include><br/> + * <include>**/*Test.java</include><br/> + * <include>**/*TestCase.java</include><br/> + * </includes><br/> + * </code> + * <p/> + * 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. + */ + @Parameter + private List<String> includes; /** * Option to pass dependencies to the system's classloader instead of using an isolated class loader when forking. @@ -444,5 +462,15 @@ public class SurefirePlugin this.test = test; } + @Override + public List<String> getIncludes() + { + return includes; + } + @Override + public void setIncludes( List<String> includes ) + { + this.includes = includes; + } }
