[SUREFIRE] refactoring with Java Generics
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/7907adea Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/7907adea Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/7907adea Branch: refs/heads/master Commit: 7907adea3d3120b6a9473330f048a33b1ce8375b Parents: 30199c9 Author: Tibor17 <tibo...@lycos.com> Authored: Sat Jul 18 00:34:05 2015 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Thu Jul 23 23:28:17 2015 +0200 ---------------------------------------------------------------------- ...erDeserializerProviderConfigurationTest.java | 2 +- ...terDeserializerStartupConfigurationTest.java | 4 +-- .../testset/DirectoryScannerParameters.java | 20 ++++++------- .../surefire/util/DefaultDirectoryScanner.java | 26 ++++++++--------- .../util/DefaultRunOrderCalculator.java | 3 +- .../maven/surefire/util/DefaultScanResult.java | 4 ++- .../apache/maven/surefire/util/TestsToRun.java | 26 +++++------------ .../util/DefaultDirectoryScannerTest.java | 4 +-- .../surefire/util/RunOrderCalculatorTest.java | 9 +++--- .../maven/surefire/util/TestsToRunTest.java | 30 +++++++++++++++----- .../surefire/booter/BooterDeserializer.java | 10 +++---- .../surefire/booter/SurefireReflectorTest.java | 4 +-- .../surefire/junitcore/Surefire746Test.java | 2 +- 13 files changed, 76 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java index 144b38c..113e2de 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java @@ -198,7 +198,7 @@ public class BooterDeserializerProviderConfigurationTest excludes.add( "xx1" ); excludes.add( "xx2" ); - return new DirectoryScannerParameters( aDir, includes, excludes, Collections.emptyList(), true, + return new DirectoryScannerParameters( aDir, includes, excludes, Collections.<String>emptyList(), true, RunOrder.asString( RunOrder.DEFAULT ) ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java index 3b85274..89c1f3e 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java @@ -158,8 +158,8 @@ public class BooterDeserializerStartupConfigurationTest return new File( "TestSrc" ); } - private Object[] getSuiteXmlFileStrings() + private String[] getSuiteXmlFileStrings() { - return new Object[]{ "A1", "A2" }; + return new String[]{ "A1", "A2" }; } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java index 42ce805..336ffa1 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/DirectoryScannerParameters.java @@ -30,18 +30,18 @@ public class DirectoryScannerParameters { private final File testClassesDirectory; - private final List includes; + private final List<String> includes; - private final List excludes; + private final List<String> excludes; - private final List specificTests; + private final List<String> specificTests; private final boolean failIfNoTests; private final RunOrder[] runOrder; - private DirectoryScannerParameters( File testClassesDirectory, List includes, List excludes, List specificTests, - boolean failIfNoTests, RunOrder[] runOrder ) + private DirectoryScannerParameters( File testClassesDirectory, List<String> includes, List<String> excludes, + List<String> specificTests, boolean failIfNoTests, RunOrder[] runOrder ) { this.testClassesDirectory = testClassesDirectory; this.includes = includes; @@ -51,14 +51,14 @@ public class DirectoryScannerParameters this.runOrder = runOrder; } - public DirectoryScannerParameters( File testClassesDirectory, List includes, List excludes, List specificTests, - boolean failIfNoTests, String runOrder ) + public DirectoryScannerParameters( File testClassesDirectory, List<String> includes, List<String> excludes, + List<String> specificTests, boolean failIfNoTests, String runOrder ) { this( testClassesDirectory, includes, excludes, specificTests, failIfNoTests, runOrder == null ? RunOrder.DEFAULT : RunOrder.valueOfMulti( runOrder ) ); } - public List getSpecificTests() + public List<String> getSpecificTests() { return specificTests; } @@ -78,7 +78,7 @@ public class DirectoryScannerParameters * * @return A list of patterns. May contain both source file designators and .class extensions. */ - public List getIncludes() + public List<String> getIncludes() { return includes; } @@ -88,7 +88,7 @@ public class DirectoryScannerParameters * * @return A list of patterns. May contain both source file designators and .class extensions. */ - public List getExcludes() + public List<String> getExcludes() { return excludes; } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java index 81a6054..38dec8a 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultDirectoryScanner.java @@ -24,7 +24,9 @@ import org.apache.maven.surefire.SpecificTestClassFilter; import java.io.File; import java.util.ArrayList; import java.util.Collections; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; /** * Scans directories looking for tests. @@ -46,13 +48,14 @@ public class DefaultDirectoryScanner private final File basedir; - private final List includes; + private final List<String> includes; - private final List excludes; + private final List<String> excludes; - private final List specificTests; + private final List<String> specificTests; - public DefaultDirectoryScanner( File basedir, List includes, List excludes, List specificTests ) + public DefaultDirectoryScanner( File basedir, List<String> includes, List<String> excludes, + List<String> specificTests ) { this.basedir = basedir; this.includes = includes; @@ -63,14 +66,14 @@ public class DefaultDirectoryScanner public TestsToRun locateTestClasses( ClassLoader classLoader, ScannerFilter scannerFilter ) { String[] testClassNames = collectTests(); - List<Class<?>> result = new ArrayList<Class<?>>(); + Set<Class<?>> result = new LinkedHashSet<Class<?>>(); String[] specific = specificTests == null ? new String[0] : processIncludesExcludes( specificTests ); SpecificTestClassFilter specificTestFilter = new SpecificTestClassFilter( specific ); for ( String className : testClassNames ) { - Class testClass = loadClass( classLoader, className ); + Class<?> testClass = loadClass( classLoader, className ); if ( !specificTestFilter.accept( testClass ) ) { @@ -87,18 +90,16 @@ public class DefaultDirectoryScanner return new TestsToRun( result ); } - private static Class loadClass( ClassLoader classLoader, String className ) + private static Class<?> loadClass( ClassLoader classLoader, String className ) { - Class testClass; try { - testClass = classLoader.loadClass( className ); + return classLoader.loadClass( className ); } catch ( ClassNotFoundException e ) { throw new RuntimeException( "Unable to create test class '" + className + "'", e ); } - return testClass; } String[] collectTests() @@ -134,12 +135,11 @@ public class DefaultDirectoryScanner return tests; } - private static String[] processIncludesExcludes( List list ) + private static String[] processIncludesExcludes( List<String> list ) { List<String> newList = new ArrayList<String>(); - for ( Object aList : list ) + for ( String include : list ) { - String include = (String) aList; String[] includes = include.split( "," ); Collections.addAll( newList, includes ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java index a67052e..7f8d9e1 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultRunOrderCalculator.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; import java.util.Comparator; +import java.util.LinkedHashSet; import java.util.List; /** @@ -63,7 +64,7 @@ public class DefaultRunOrderCalculator } orderTestClasses( result, runOrder.length != 0 ? runOrder[0] : null ); - return new TestsToRun( result ); + return new TestsToRun( new LinkedHashSet<Class<?>>( result ) ); } private void orderTestClasses( List<Class<?>> testClasses, RunOrder runOrder ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java index e8a16c1..ff75508 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/DefaultScanResult.java @@ -21,8 +21,10 @@ package org.apache.maven.surefire.util; import java.util.ArrayList; import java.util.Collections; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; +import java.util.Set; /** * @author Kristian Rosenvold @@ -84,7 +86,7 @@ public class DefaultScanResult public TestsToRun applyFilter( ScannerFilter scannerFilter, ClassLoader testClassLoader ) { - List<Class<?>> result = new ArrayList<Class<?>>(); + Set<Class<?>> result = new LinkedHashSet<Class<?>>(); int size = size(); for ( int i = 0; i < size; i++ ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java index 1f88a5c..d7e4489 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/TestsToRun.java @@ -22,9 +22,7 @@ package org.apache.maven.surefire.util; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Set; import org.apache.maven.surefire.testset.TestSetFailedException; @@ -36,32 +34,22 @@ import org.apache.maven.surefire.testset.TestSetFailedException; */ public class TestsToRun implements Iterable<Class<?>> { - private final List<Class<?>> locatedClasses; + private final Set<Class<?>> locatedClasses; /** * Constructor * - * @param locatedClasses A list of java.lang.Class objects representing tests to run + * @param locatedClasses A set of java.lang.Class objects representing tests to run */ - public TestsToRun( List<Class<?>> locatedClasses ) + public TestsToRun( Set<Class<?>> locatedClasses ) { - this.locatedClasses = Collections.unmodifiableList( locatedClasses ); - Set<Class<?>> testSets = new HashSet<Class<?>>(); - - for ( Class<?> testClass : locatedClasses ) - { - if ( testSets.contains( testClass ) ) - { - throw new RuntimeException( "Duplicate test set '" + testClass.getName() + "'" ); - } - testSets.add( testClass ); - } + this.locatedClasses = Collections.unmodifiableSet( locatedClasses ); } public static TestsToRun fromClass( Class<?> clazz ) throws TestSetFailedException { - return new TestsToRun( Collections.<Class<?>>singletonList( clazz ) ); + return new TestsToRun( Collections.<Class<?>>singleton( clazz ) ); } /** @@ -92,7 +80,7 @@ public class TestsToRun implements Iterable<Class<?>> return containsAtLeast( iterator(), atLeast ); } - private boolean containsAtLeast( Iterator it, int atLeast ) + private boolean containsAtLeast( Iterator<Class<?>> it, int atLeast ) { for ( int i = 0; i < atLeast; i++ ) { @@ -109,7 +97,7 @@ public class TestsToRun implements Iterable<Class<?>> public boolean containsExactly( int items ) { - Iterator it = iterator(); + Iterator<Class<?>> it = iterator(); return containsAtLeast( it, items ) && !it.hasNext(); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java index 1b4757b..4b24292 100644 --- a/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java +++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/DefaultDirectoryScannerTest.java @@ -41,10 +41,10 @@ public class DefaultDirectoryScannerTest File baseDir = new File( new File( "target" ).getCanonicalPath() ); List<String> include = new ArrayList<String>(); include.add( "**/*ZT*A.java" ); - List exclude = new ArrayList(); + List<String> exclude = new ArrayList<String>(); DefaultDirectoryScanner surefireDirectoryScanner = - new DefaultDirectoryScanner( baseDir, include, exclude, new ArrayList() ); + new DefaultDirectoryScanner( baseDir, include, exclude, new ArrayList<String>() ); String[] classNames = surefireDirectoryScanner.collectTests(); assertNotNull( classNames ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java index 965417c..30a7560 100644 --- a/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java +++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/RunOrderCalculatorTest.java @@ -18,8 +18,9 @@ package org.apache.maven.surefire.util; * under the License. */ -import java.util.ArrayList; -import java.util.List; +import java.util.LinkedHashSet; +import java.util.Set; + import org.apache.maven.surefire.testset.RunOrderParameters; import junit.framework.TestCase; @@ -42,9 +43,9 @@ public class RunOrderCalculatorTest } - private List<Class<?>> getClassesToRun() + private Set<Class<?>> getClassesToRun() { - List<Class<?>> classesToRun = new ArrayList<Class<?>>(); + Set<Class<?>> classesToRun = new LinkedHashSet<Class<?>>(); classesToRun.add( B.class ); classesToRun.add( A.class ); return classesToRun; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-api/src/test/java/org/apache/maven/surefire/util/TestsToRunTest.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/TestsToRunTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/TestsToRunTest.java index 84854d8..ea3226a 100644 --- a/surefire-api/src/test/java/org/apache/maven/surefire/util/TestsToRunTest.java +++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/TestsToRunTest.java @@ -19,8 +19,9 @@ package org.apache.maven.surefire.util; * under the License. */ -import java.util.Arrays; import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.Set; import junit.framework.TestCase; @@ -34,7 +35,10 @@ public class TestsToRunTest public void testGetTestSets() throws Exception { - TestsToRun testsToRun = new TestsToRun( Arrays.<Class<?>>asList( T1.class, T2.class ) ); + Set<Class<?>> classes = new LinkedHashSet<Class<?>>(); + classes.add( T1.class ); + classes.add( T2.class ); + TestsToRun testsToRun = new TestsToRun( classes ); Iterator<Class<?>> it = testsToRun.iterator(); assertTrue( it.hasNext() ); assertEquals( it.next(), T1.class ); @@ -43,16 +47,22 @@ public class TestsToRunTest assertFalse( it.hasNext() ); } - public void testContainsAtleast() + public void testContainsAtLeast() { - TestsToRun testsToRun = new TestsToRun( Arrays.<Class<?>>asList( T1.class, T2.class ) ); + Set<Class<?>> classes = new LinkedHashSet<Class<?>>(); + classes.add( T1.class ); + classes.add( T2.class ); + TestsToRun testsToRun = new TestsToRun( classes ); assertTrue( testsToRun.containsAtLeast( 2 ) ); assertFalse( testsToRun.containsAtLeast( 3 ) ); } public void testContainsExactly() { - TestsToRun testsToRun = new TestsToRun( Arrays.<Class<?>>asList( T1.class, T2.class ) ); + Set<Class<?>> classes = new LinkedHashSet<Class<?>>(); + classes.add( T1.class ); + classes.add( T2.class ); + TestsToRun testsToRun = new TestsToRun( classes ); assertFalse( testsToRun.containsExactly( 1 ) ); assertTrue( testsToRun.containsExactly( 2 ) ); assertFalse( testsToRun.containsExactly( 3 ) ); @@ -60,14 +70,20 @@ public class TestsToRunTest public void testToRunArray() { - TestsToRun testsToRun = new TestsToRun( Arrays.<Class<?>>asList( T1.class, T2.class ) ); + Set<Class<?>> classes = new LinkedHashSet<Class<?>>(); + classes.add( T1.class ); + classes.add( T2.class ); + TestsToRun testsToRun = new TestsToRun( classes ); Class<?>[] locatedClasses = testsToRun.getLocatedClasses(); assertEquals( 2, locatedClasses.length ); } public void testGetClassByName() { - TestsToRun testsToRun = new TestsToRun( Arrays.<Class<?>>asList( T1.class, T2.class ) ); + Set<Class<?>> classes = new LinkedHashSet<Class<?>>(); + classes.add( T1.class ); + classes.add( T2.class ); + TestsToRun testsToRun = new TestsToRun( classes ); assertEquals( T1.class, testsToRun.getClassByName( "org.apache.maven.surefire.util.TestsToRunTest$T1" ) ); assertEquals( T2.class, testsToRun.getClassByName( "org.apache.maven.surefire.util.TestsToRunTest$T2" ) ); assertEquals( null, testsToRun.getClassByName( "org.apache.maven.surefire.util.TestsToRunTest$T3" ) ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java ---------------------------------------------------------------------- diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java index c5f7c03..5b89ed0 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/BooterDeserializer.java @@ -73,11 +73,11 @@ public class BooterDeserializer final String requestedTest = properties.getProperty( REQUESTEDTEST ); final File sourceDirectory = properties.getFileProperty( SOURCE_DIRECTORY ); - final List excludesList = properties.getStringList( EXCLUDES_PROPERTY_PREFIX ); - final List includesList = properties.getStringList( INCLUDES_PROPERTY_PREFIX ); - final List specificTestsList = properties.getStringList( SPECIFIC_TEST_PROPERTY_PREFIX ); + final List<String> excludes = properties.getStringList( EXCLUDES_PROPERTY_PREFIX ); + final List<String> includes = properties.getStringList( INCLUDES_PROPERTY_PREFIX ); + final List<String> specificTests = properties.getStringList( SPECIFIC_TEST_PROPERTY_PREFIX ); - final List testSuiteXmlFiles = properties.getStringList( TEST_SUITE_XML_FILES ); + final List<String> testSuiteXmlFiles = properties.getStringList( TEST_SUITE_XML_FILES ); final File testClassesDirectory = properties.getFileProperty( TEST_CLASSES_DIRECTORY ); final String runOrder = properties.getProperty( RUN_ORDER ); final String runStatisticsFile = properties.getProperty( RUN_STATISTICS_FILE ); @@ -85,7 +85,7 @@ public class BooterDeserializer final int rerunFailingTestsCount = properties.getIntProperty( RERUN_FAILING_TESTS_COUNT ); DirectoryScannerParameters dirScannerParams = - new DirectoryScannerParameters( testClassesDirectory, includesList, excludesList, specificTestsList, + new DirectoryScannerParameters( testClassesDirectory, includes, excludes, specificTests, properties.getBooleanObjectProperty( FAILIFNOTESTS ), runOrder ); RunOrderParameters runOrderParameters = new RunOrderParameters( runOrder, runStatisticsFile ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java ---------------------------------------------------------------------- diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java index d41849d..dd2f271 100644 --- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java +++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java @@ -48,8 +48,8 @@ public class SurefireReflectorTest Object foo = getFoo(); DirectoryScannerParameters directoryScannerParameters = - new DirectoryScannerParameters( new File( "ABC" ), new ArrayList(), new ArrayList(), new ArrayList(), - false, "hourly" ); + new DirectoryScannerParameters( new File( "ABC" ), new ArrayList<String>(), new ArrayList<String>(), + new ArrayList<String>(), false, "hourly" ); surefireReflector.setDirectoryScannerParameters( foo, directoryScannerParameters ); assertTrue( isCalled( foo ) ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/7907adea/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java index 93873bf..538b31a 100644 --- a/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java +++ b/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java @@ -98,7 +98,7 @@ public class Surefire746Test RunListener listener = ConcurrentRunListener.createInstance( testSetMap, reporterFactory, false, false, consoleLogger ); - TestsToRun testsToRun = new TestsToRun( Collections.<Class<?>>singletonList( TestClassTest.class ) ); + TestsToRun testsToRun = new TestsToRun( Collections.<Class<?>>singleton( TestClassTest.class ) ); org.junit.runner.notification.RunListener jUnit4RunListener = new JUnitCoreRunListener( listener, testSetMap );
