You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/04/11 21:11:18 UTC
[1/2] git commit: More generics
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 <kr...@apache.org>
Authored: Thu Apr 11 21:04:03 2013 +0200
Committer: Kristian Rosenvold <kr...@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();
}
[2/2] git commit: More java5
Posted by kr...@apache.org.
More java5
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9b609fe7
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9b609fe7
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9b609fe7
Branch: refs/heads/master
Commit: 9b609fe7a435f2e5990406ee594c352e193457ca
Parents: 3a2014f
Author: Kristian Rosenvold <kr...@apache.org>
Authored: Thu Apr 11 21:11:11 2013 +0200
Committer: Kristian Rosenvold <kr...@apache.org>
Committed: Thu Apr 11 21:11:11 2013 +0200
----------------------------------------------------------------------
.../surefire/group/match/AndGroupMatcher.java | 6 +-----
.../surefire/group/match/InverseGroupMatcher.java | 4 ++--
.../maven/surefire/group/match/OrGroupMatcher.java | 6 +-----
.../surefire/common/junit3/JUnit3Reflector.java | 2 +-
.../maven/surefire/junit/JUnit3Provider.java | 3 +--
.../apache/maven/surefire/junit/PojoTestSet.java | 14 ++++++--------
.../junit/TestListenerInvocationHandler.java | 2 +-
.../maven/surefire/junit/JUnitTestSetTest.java | 2 +-
8 files changed, 14 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b609fe7/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
index 474dbae..9fbfcf2 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
@@ -113,11 +113,7 @@ public class AndGroupMatcher
return false;
}
AndGroupMatcher other = (AndGroupMatcher) obj;
- if ( !getMatchers().equals( other.getMatchers() ) )
- {
- return false;
- }
- return true;
+ return getMatchers().equals( other.getMatchers() );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b609fe7/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
index 24f57db..567c328 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
@@ -32,12 +32,12 @@ public class InverseGroupMatcher
public boolean enabled( Class<?>... cats )
{
- return cats == null ? true : !matcher.enabled( cats );
+ return cats == null || !matcher.enabled( cats );
}
public boolean enabled( String... cats )
{
- return cats == null ? true : !matcher.enabled( cats );
+ return cats == null || !matcher.enabled( cats );
}
@Override
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b609fe7/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
index 9bfce9a..6073b04 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
@@ -113,10 +113,6 @@ public class OrGroupMatcher
return false;
}
AndGroupMatcher other = (AndGroupMatcher) obj;
- if ( !getMatchers().equals( other.getMatchers() ) )
- {
- return false;
- }
- return true;
+ return getMatchers().equals( other.getMatchers() );
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b609fe7/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java b/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
index 1dd5b64..3ffec88 100644
--- a/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
+++ b/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
@@ -137,7 +137,7 @@ public final class JUnit3Reflector
}
else
{
- testObject = testConstructor.newInstance( new Object[]{ testClass.getName() } );
+ testObject = testConstructor.newInstance( testClass.getName() );
}
}
return testObject;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b609fe7/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
index 448ba5a..22e7069 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnit3Provider.java
@@ -102,9 +102,8 @@ public class JUnit3Provider
System.setSecurityManager( securityManager );
}
- for ( Iterator iter = testsToRun.iterator(); iter.hasNext(); )
+ for ( Class clazz : testsToRun )
{
- Class clazz = (Class) iter.next();
SurefireTestSet surefireTestSet = createTestSet( clazz );
executeTestSet( surefireTestSet, reporter, testClassLoader );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b609fe7/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
index 464b857..1fe381a 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
@@ -40,7 +40,7 @@ public class PojoTestSet
private final Object testObject;
- private List testMethods;
+ private List<Method> testMethods;
private Method setUpMethod;
@@ -99,7 +99,7 @@ public class PojoTestSet
for ( int i = 0; i < testMethods.size() && !abort; ++i )
{
- abort = executeTestMethod( (Method) testMethods.get( i ), EMPTY_OBJECT_ARRAY, reportManager );
+ abort = executeTestMethod( testMethods.get( i ), EMPTY_OBJECT_ARRAY, reportManager );
}
}
@@ -224,7 +224,7 @@ public class PojoTestSet
{
if ( setUpMethod != null )
{
- setUpMethod.invoke( testObject, new Object[0] );
+ setUpMethod.invoke( testObject );
}
}
@@ -233,7 +233,7 @@ public class PojoTestSet
{
if ( tearDownMethod != null )
{
- tearDownMethod.invoke( testObject, new Object[0] );
+ tearDownMethod.invoke( testObject );
}
}
@@ -241,14 +241,12 @@ public class PojoTestSet
{
if ( testMethods == null )
{
- testMethods = new ArrayList();
+ testMethods = new ArrayList<Method>();
Method[] methods = getTestClass().getMethods();
- for ( int i = 0; i < methods.length; ++i )
+ for ( Method m : methods )
{
- Method m = methods[i];
-
if ( isValidTestMethod( m ) )
{
String simpleName = m.getName();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b609fe7/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
index dc19b1e..01e564b 100644
--- a/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
+++ b/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
@@ -41,7 +41,7 @@ public class TestListenerInvocationHandler
private static final String END_TEST = "endTest";
- private final Set failedTestsSet = new HashSet();
+ private final Set<FailedTest> failedTestsSet = new HashSet<FailedTest>();
private RunListener reporter;
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9b609fe7/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
index 229ea8b..aac3655 100644
--- a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
+++ b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
@@ -61,7 +61,7 @@ public class JUnitTestSetTest
implements RunListener
{
- private List succeededTests = new ArrayList();
+ private List<ReportEntry> succeededTests = new ArrayList<ReportEntry>();
public void testSetStarting( ReportEntry report )
{