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/11/14 20:19:02 UTC
svn commit: r1035052 [2/2] - in /maven/surefire/trunk:
maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/
surefire-api/src/main/java/org/apache/maven/surefire/
surefire-api/src/main/java/org/apache/maven/surefire/suite/ surefire-api/...
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreDirectoryTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreDirectoryTestSuite.java?rev=1035052&r1=1035051&r2=1035052&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreDirectoryTestSuite.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreDirectoryTestSuite.java Sun Nov 14 19:19:01 2010
@@ -23,7 +23,8 @@ import org.apache.maven.surefire.report.
import org.apache.maven.surefire.report.ReporterManagerFactory;
import org.apache.maven.surefire.suite.SurefireTestSuite;
import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.apache.maven.surefire.util.SurefireDirectoryScanner;
+import org.apache.maven.surefire.util.DefaultDirectoryScanner;
+import org.apache.maven.surefire.util.DirectoryScanner;
import java.io.File;
import java.util.ArrayList;
@@ -41,7 +42,7 @@ import java.util.Properties;
public class JUnitCoreDirectoryTestSuite
implements SurefireTestSuite
{
- private final SurefireDirectoryScanner directoryScanner;
+ private final DirectoryScanner directoryScanner;
private TestsToRun testsToRun;
@@ -52,7 +53,7 @@ public class JUnitCoreDirectoryTestSuite
public JUnitCoreDirectoryTestSuite( File basedir, ArrayList includes, ArrayList excludes, Properties properties )
{
- directoryScanner = new SurefireDirectoryScanner( basedir, includes, excludes );
+ directoryScanner = new DefaultDirectoryScanner( basedir, includes, excludes );
this.jUnitCoreParameters = new JUnitCoreParameters( properties );
}
@@ -71,7 +72,7 @@ public class JUnitCoreDirectoryTestSuite
public List getClassesSkippedByValidation()
{
- return new ArrayList( );
+ return new ArrayList();
}
public void execute( String testSetName, ReporterManagerFactory reporterManagerFactory, ClassLoader classLoader )
@@ -83,7 +84,6 @@ public class JUnitCoreDirectoryTestSuite
}
JUnitCoreTestSet testSet = testsToRun.getTestSet( testSetName );
-
if ( testSet == null )
{
throw new TestSetFailedException( "Unable to find test set '" + testSetName + "' in suite" );