Updated Branches: refs/heads/master 35fc2ceec -> 9b609fe7a
More 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/3a2014fd Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/3a2014fd Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/3a2014fd Branch: refs/heads/master Commit: 3a2014fdee64402ea9ef8f89e40e60775992cc59 Parents: 35fc2ce Author: Kristian Rosenvold <krosenv...@apache.org> Authored: Thu Apr 11 21:04:03 2013 +0200 Committer: Kristian Rosenvold <krosenv...@apache.org> Committed: Thu Apr 11 21:04:03 2013 +0200 ---------------------------------------------------------------------- .../surefire/runorder/RunEntryStatisticsMap.java | 2 +- .../runorder/ThreadedExecutionScheduler.java | 2 +- .../maven/surefire/SpecificTestClassFilter.java | 15 +++------- .../surefire/util/DefaultRunOrderCalculator.java | 22 +++++++------- .../org/apache/maven/surefire/util/UrlUtils.java | 4 +- .../maven/surefire/util/internal/ByteBuffer.java | 2 +- .../surefire/util/DefaultDirectoryScannerTest.java | 2 +- .../surefire/util/RunOrderCalculatorTest.java | 4 +- .../apache/maven/surefire/util/ScanResultTest.java | 2 +- .../apache/maven/surefire/util/UrlUtilsTest.java | 2 +- .../apache/maven/surefire/booter/Classpath.java | 7 ++--- 11 files changed, 29 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java index d9432ed..5c51689 100644 --- a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java +++ b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMap.java @@ -152,7 +152,7 @@ public class RunEntryStatisticsMap } } - public List getPrioritizedTestsClassRunTime( List testsToRun, int threadCount ) + public List<Class> getPrioritizedTestsClassRunTime( List testsToRun, int threadCount ) { final List<PrioritizedTest> prioritizedTests = getPrioritizedTests( testsToRun, new TestRuntimeComparator() ); ThreadedExecutionScheduler threadedExecutionScheduler = new ThreadedExecutionScheduler( threadCount ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java index 5cd34a0..6519ff6 100644 --- a/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java +++ b/surefire-api/src/main/java/org/apache/maven/plugin/surefire/runorder/ThreadedExecutionScheduler.java @@ -52,7 +52,7 @@ public class ThreadedExecutionScheduler lists[leastBusySlot].add( prioritizedTest.getClazz() ); } - public List getResult() + public List<Class> getResult() { List<Class> result = new ArrayList<Class>(); int index = 0; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java b/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java index 31b1340..6288e8a 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/SpecificTestClassFilter.java @@ -18,8 +18,8 @@ package org.apache.maven.surefire; * under the License. */ +import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import org.apache.maven.shared.utils.io.SelectorUtils; import org.apache.maven.surefire.util.ScannerFilter; @@ -32,18 +32,14 @@ public class SpecificTestClassFilter private static final String JAVA_CLASS_FILE_EXTENSION = ".class"; - private Set names; + private Set<String> names; public SpecificTestClassFilter( String[] classNames ) { if ( classNames != null && classNames.length > 0 ) { - this.names = new HashSet(); - for ( int i = 0; i < classNames.length; i++ ) - { - String name = classNames[i]; - names.add( name ); - } + this.names = new HashSet<String>(); + Collections.addAll( names, classNames ); } } @@ -57,9 +53,8 @@ public class SpecificTestClassFilter String className = testClass.getName().replace( '.', FS ) + JAVA_CLASS_FILE_EXTENSION; boolean found = false; - for ( Iterator it = names.iterator(); it.hasNext(); ) + for ( String pattern : names ) { - String pattern = (String) it.next(); if ( '\\' == FS ) { pattern = pattern.replace( '/', FS ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/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 780c09d..147c6e7 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 @@ -36,7 +36,7 @@ import java.util.List; public class DefaultRunOrderCalculator implements RunOrderCalculator { - private final Comparator sortOrder; + private final Comparator<Class> sortOrder; private final RunOrder[] runOrder; @@ -85,7 +85,7 @@ public class DefaultRunOrderCalculator { RunEntryStatisticsMap runEntryStatisticsMap = RunEntryStatisticsMap.fromFile( runOrderParameters.getRunStatisticsFile() ); - final List prioritized = runEntryStatisticsMap.getPrioritizedTestsClassRunTime( testClasses, threadCount ); + final List<Class> prioritized = runEntryStatisticsMap.getPrioritizedTestsClassRunTime( testClasses, threadCount ); testClasses.clear(); testClasses.addAll( prioritized ); @@ -96,7 +96,7 @@ public class DefaultRunOrderCalculator } } - private Comparator getSortOrderComparator( RunOrder runOrder ) + private Comparator<Class> getSortOrderComparator( RunOrder runOrder ) { if ( RunOrder.ALPHABETICAL.equals( runOrder ) ) { @@ -117,24 +117,24 @@ public class DefaultRunOrderCalculator } } - private Comparator getReverseAlphabeticalComparator() + private Comparator<Class> getReverseAlphabeticalComparator() { - return new Comparator() + return new Comparator<Class>() { - public int compare( Object o1, Object o2 ) + public int compare( Class o1, Class o2 ) { - return ( (Class) o2 ).getName().compareTo( ( (Class) o1 ).getName() ); + return o2.getName().compareTo( o1.getName() ); } }; } - private Comparator getAlphabeticalComparator() + private Comparator<Class> getAlphabeticalComparator() { - return new Comparator() + return new Comparator<Class>() { - public int compare( Object o1, Object o2 ) + public int compare( Class o1, Class o2 ) { - return ( (Class) o1 ).getName().compareTo( ( (Class) o2 ).getName() ); + return o1.getName().compareTo( o2.getName() ); } }; } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/surefire-api/src/main/java/org/apache/maven/surefire/util/UrlUtils.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/UrlUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/UrlUtils.java index f6f2b89..b7059d9 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/UrlUtils.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/UrlUtils.java @@ -48,9 +48,9 @@ public class UrlUtils { byte[] bytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.!~*'():/".getBytes( ENCODING ); - for ( int i = 0; i < bytes.length; i++ ) + for ( byte aByte : bytes ) { - UNRESERVED.set( bytes[i] ); + UNRESERVED.set( aByte ); } } catch ( UnsupportedEncodingException e ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java index 228dd33..97da38b 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ByteBuffer.java @@ -65,7 +65,7 @@ public class ByteBuffer public void append( Integer integer ) { - toHex( integer.intValue() ); + toHex( integer ); } /** http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/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 d4d782e..1b4757b 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 @@ -39,7 +39,7 @@ public class DefaultDirectoryScannerTest { // use target as people can configure ide to compile in an other place than maven File baseDir = new File( new File( "target" ).getCanonicalPath() ); - List include = new ArrayList(); + List<String> include = new ArrayList<String>(); include.add( "**/*ZT*A.java" ); List exclude = new ArrayList(); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/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 7f40a50..3c011d1 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 @@ -42,9 +42,9 @@ public class RunOrderCalculatorTest } - private List getClassesToRun() + private List<Class> getClassesToRun() { - List classesToRun = new ArrayList(); + List<Class> classesToRun = new ArrayList<Class>(); classesToRun.add( B.class ); classesToRun.add( A.class ); return classesToRun; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java index a35ffbe..7c6628a 100644 --- a/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java +++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/ScanResultTest.java @@ -34,7 +34,7 @@ public class ScanResultTest public void testWriteTo() throws Exception { - List files = Arrays.asList( new String[]{ "abc", "cde" } ); + List<String> files = Arrays.asList( "abc", "cde" ); DefaultScanResult scanResult = new DefaultScanResult( files ); Properties serialized = new Properties(); scanResult.writeTo( serialized ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java index 3c1bd87..a9d7df0 100644 --- a/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java +++ b/surefire-api/src/test/java/org/apache/maven/surefire/util/UrlUtilsTest.java @@ -68,7 +68,7 @@ public class UrlUtilsTest // use reflection to do "File urlFile = new File( uri )" if JDK 1.4+ Constructor newFile = File.class.getConstructor( new Class[]{ uri.getClass() } ); - File urlFile = (File) newFile.newInstance( new Object[]{ uri } ); + File urlFile = (File) newFile.newInstance( uri ); assertEquals( f, urlFile ); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/3a2014fd/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java ---------------------------------------------------------------------- diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java index 76287d1..286752d 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java @@ -170,12 +170,11 @@ public class Classpath public String getLogMessage( String descriptor ) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); result.append( descriptor ).append( " classpath:" ); - int size = elements.size(); - for ( int i = 0; i < size; i++ ) + for ( String element : elements ) { - result.append( " " ).append( (String) elements.get( i ) ); + result.append( " " ).append( element ); } return result.toString(); }
