Author: kenney
Date: Sat Aug 13 07:58:04 2005
New Revision: 232500
URL: http://svn.apache.org/viewcvs?rev=232500&view=rev
Log:
Making sure there is always a filter present, to prevent malfunctioning
plugin configuration code disabling running any tests.
Modified:
maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Modified: maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=232500&r1=232499&r2=232500&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java (original)
+++ maven/components/trunk/maven-plugins/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Sat Aug 13 07:58:04 2005
@@ -99,12 +99,12 @@
/**
* @parameter
*/
- private List includes = new ArrayList( Collections.singletonList( "**/*Test.java" ) );
+ private List includes;
/**
* @parameter
*/
- private List excludes = new ArrayList( Collections.singletonList( "**/Abstract*Test.java" ) );
+ private List excludes;
/**
* The project whose project files to create.
@@ -179,15 +179,13 @@
else
{
// defaults here, qdox doesn't like the end javadoc value
- if ( includes == null )
+ if ( includes == null || includes.size() == 0 )
{
- includes = new ArrayList();
- includes.add( "**/*Test.java" );
+ includes = new ArrayList( Collections.singletonList( "**/*Test.java" ) );
}
- if ( excludes == null )
+ if ( excludes == null || excludes.size() == 0 )
{
- excludes = new ArrayList();
- excludes.add( "**/Abstract*Test.java" );
+ excludes = new ArrayList( Collections.singletonList( "**/Abstract*Test.java" ) );
}
surefireBooter.addBattery( "org.codehaus.surefire.battery.DirectoryBattery",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org