You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/12/30 16:51:56 UTC
svn commit: r1225853 - in /maven/surefire/trunk/maven-surefire-common/src:
main/java/org/apache/maven/plugin/surefire/
main/java/org/apache/maven/plugin/surefire/booter/
main/java/org/apache/maven/plugin/surefire/booterclient/
test/java/org/apache/mave...
Author: hboutemy
Date: Fri Dec 30 15:51:56 2011
New Revision: 1225853
URL: http://svn.apache.org/viewvc?rev=1225853&view=rev
Log:
more generics
Removed:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booter/
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booter/
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java
maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java Fri Dec 30 15:51:56 2011
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -339,7 +338,7 @@ public abstract class AbstractSurefireMo
return ForkConfiguration.FORK_NEVER.equals( getForkMode() );
}
- private java.util.List getRunOrders()
+ private List<RunOrder> getRunOrders()
{
String runOrderString = getRunOrder();
RunOrder[] runOrder = runOrderString == null ? RunOrder.DEFAULT : RunOrder.valueOfMulti( runOrderString );
@@ -348,7 +347,7 @@ public abstract class AbstractSurefireMo
private boolean requiresRunHistory()
{
- final List runOrders = getRunOrders();
+ final List<RunOrder> runOrders = getRunOrders();
return runOrders.contains( RunOrder.BALANCED ) || runOrders.contains( RunOrder.FAILEDFIRST );
}
@@ -372,7 +371,7 @@ public abstract class AbstractSurefireMo
final boolean isTestNg = testNgArtifact != null;
TestArtifactInfo testNg =
isTestNg ? new TestArtifactInfo( testNgArtifact.getVersion(), testNgArtifact.getClassifier() ) : null;
- List testXml = getSuiteXmlFiles() != null ? Arrays.asList( getSuiteXmlFiles() ) : null;
+ List<File> testXml = getSuiteXmlFiles() != null ? Arrays.asList( getSuiteXmlFiles() ) : null;
TestRequest testSuiteDefinition =
new TestRequest( testXml, getTestSourceDirectory(), getTest(), getTestMethod() );
final boolean failIfNoTests;
@@ -394,8 +393,8 @@ public abstract class AbstractSurefireMo
failIfNoTests = getFailIfNoTests() != null && getFailIfNoTests();
- List includes = getIncludeList();
- List excludes = getExcludeList();
+ List<String> includes = getIncludeList();
+ List<String> excludes = getExcludeList();
directoryScannerParameters = new DirectoryScannerParameters( getTestClassesDirectory(), includes, excludes,
failIfNoTests,
getRunOrder() );
@@ -721,7 +720,7 @@ public abstract class AbstractSurefireMo
if ( getArgLine() != null )
{
- List args = Arrays.asList( getArgLine().split( " " ) );
+ List<String> args = Arrays.asList( getArgLine().split( " " ) );
if ( args.contains( "-da" ) || args.contains( "-disableassertions" ) )
{
setEnableAssertions( false );
@@ -871,6 +870,7 @@ public abstract class AbstractSurefireMo
classpath.add( getClassesDirectory().getAbsolutePath() );
+ @SuppressWarnings( "unchecked" )
Set<Artifact> classpathArtifacts = getProject().getArtifacts();
if ( getClasspathDependencyScopeExclude() != null && !getClasspathDependencyScopeExclude().equals( "" ) )
@@ -900,9 +900,8 @@ public abstract class AbstractSurefireMo
// Add additional configured elements to the classpath
if ( getAdditionalClasspathElements() != null )
{
- for ( Iterator iter = getAdditionalClasspathElements().iterator(); iter.hasNext(); )
+ for ( String classpathElement : getAdditionalClasspathElements() )
{
- String classpathElement = (String) iter.next();
if ( classpathElement != null )
{
classpath.add( classpathElement );
@@ -926,8 +925,7 @@ public abstract class AbstractSurefireMo
Artifact getTestNgUtilsArtifact()
throws ArtifactResolutionException, ArtifactNotFoundException
{
- Artifact surefireArtifact =
- (Artifact) getPluginArtifactMap().get( "org.apache.maven.surefire:surefire-booter" );
+ Artifact surefireArtifact = getPluginArtifactMap().get( "org.apache.maven.surefire:surefire-booter" );
String surefireVersion = surefireArtifact.getBaseVersion();
Artifact testNgUtils =
getArtifactFactory().createArtifact( "org.apache.maven.surefire", "surefire-testng-utils", surefireVersion,
@@ -959,7 +957,7 @@ public abstract class AbstractSurefireMo
return filteredArtifacts;
}
- private void showMap( Map map, String setting )
+ private void showMap( Map<?,?> map, String setting )
{
for ( Object o : map.keySet() )
{
@@ -1042,7 +1040,7 @@ public abstract class AbstractSurefireMo
}
}
- Enumeration keys = props.propertyNames();
+ Enumeration<?> keys = props.propertyNames();
//loop through all properties
while ( keys.hasMoreElements() )
{
@@ -1359,8 +1357,8 @@ public abstract class AbstractSurefireMo
public Classpath getProviderClasspath()
throws ArtifactResolutionException, ArtifactNotFoundException
{
- final Map pluginArtifactMap = getPluginArtifactMap();
- Artifact plugin = (Artifact) pluginArtifactMap.get( "org.apache.maven.plugins:maven-surefire-plugin" );
+ final Map<String,Artifact> pluginArtifactMap = getPluginArtifactMap();
+ Artifact plugin = pluginArtifactMap.get( "org.apache.maven.plugins:maven-surefire-plugin" );
return dependencyResolver.addProviderToClasspath( pluginArtifactMap, plugin );
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/CommonReflector.java Fri Dec 30 15:51:56 2011
@@ -31,7 +31,7 @@ import org.apache.maven.surefire.util.Su
*/
public class CommonReflector
{
- private final Class startupReportConfiguration;
+ private final Class<?> startupReportConfiguration;
private final ClassLoader surefireClassLoader;
@@ -51,7 +51,7 @@ public class CommonReflector
public Object createReportingReporterFactory( StartupReportConfiguration startupReportConfiguration )
{
- Class[] args = new Class[]{ this.startupReportConfiguration };
+ Class<?>[] args = new Class[]{ this.startupReportConfiguration };
Object src = createStartupReportConfiguration( startupReportConfiguration );
Object[] params = new Object[]{ src };
return ReflectionUtils.instantiateObject( FileReporterFactory.class.getName(), args, params,
@@ -61,7 +61,7 @@ public class CommonReflector
Object createStartupReportConfiguration( StartupReportConfiguration reporterConfiguration )
{
- Constructor constructor = ReflectionUtils.getConstructor( this.startupReportConfiguration,
+ Constructor<?> constructor = ReflectionUtils.getConstructor( this.startupReportConfiguration,
new Class[]{ boolean.class, boolean.class,
String.class, boolean.class, boolean.class,
File.class, boolean.class, String.class,
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java Fri Dec 30 15:51:56 2011
@@ -58,14 +58,14 @@ public class SurefireDependencyResolver
private final ArtifactRepository localRepository;
- private final List remoteRepositories;
+ private final List<ArtifactRepository> remoteRepositories;
private final ArtifactMetadataSource artifactMetadataSource;
private final String pluginName;
protected SurefireDependencyResolver( ArtifactResolver artifactResolver, ArtifactFactory artifactFactory, Log log,
- ArtifactRepository localRepository, List remoteRepositories,
+ ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource artifactMetadataSource, String pluginName )
{
this.artifactResolver = artifactResolver;
@@ -146,16 +146,15 @@ public class SurefireDependencyResolver
return new Classpath( files );
}
- public Classpath addProviderToClasspath( Map pluginArtifactMap, Artifact surefireArtifact )
+ public Classpath addProviderToClasspath( Map<String,Artifact> pluginArtifactMap, Artifact surefireArtifact )
throws ArtifactResolutionException, ArtifactNotFoundException
{
List<String> files = new ArrayList<String>();
if ( surefireArtifact != null )
{
final ArtifactResolutionResult artifactResolutionResult = resolveArtifact( null, surefireArtifact );
- for ( Object o : pluginArtifactMap.values() )
+ for ( Artifact artifact : pluginArtifactMap.values() )
{
- Artifact artifact = (Artifact) o;
if ( !artifactResolutionResult.getArtifacts().contains( artifact ) )
{
files.add( artifact.getFile().getAbsolutePath() );
@@ -165,9 +164,8 @@ public class SurefireDependencyResolver
else
{
// Bit of a brute force strategy if not found. Should probably be improved
- for ( Object o : pluginArtifactMap.values() )
+ for ( Artifact artifact : pluginArtifactMap.values() )
{
- Artifact artifact = (Artifact) o;
files.add( artifact.getFile().getPath() );
}
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java Fri Dec 30 15:51:56 2011
@@ -231,9 +231,9 @@ public interface SurefireExecutionParame
void setArtifactFactory( ArtifactFactory artifactFactory );
- List getRemoteRepositories();
+ List<ArtifactRepository> getRemoteRepositories();
- void setRemoteRepositories( List remoteRepositories );
+ void setRemoteRepositories( List<ArtifactRepository> remoteRepositories );
ArtifactMetadataSource getMetadataSource();
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java Fri Dec 30 15:51:56 2011
@@ -135,7 +135,7 @@ class BooterSerializer
String valueToUse;
if ( value instanceof Class )
{
- valueToUse = ( (Class) value ).getName();
+ valueToUse = ( (Class<?>) value ).getName();
}
else
{
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ChecksumCalculator.java Fri Dec 30 15:51:56 2011
@@ -31,7 +31,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
/**
* @author Kristian Rosenvold
*/
@@ -56,7 +55,7 @@ public class ChecksumCalculator
checksumItems.add( value );
}
- public void add( Map map )
+ public void add( Map<?,?> map )
{
if ( map != null )
{
@@ -79,14 +78,12 @@ public class ChecksumCalculator
appendObject( localRepository );
}
- public void add( List items )
+ public void add( List<?> items )
{
if ( items != null )
{
- Object item;
- for ( Object item1 : items )
+ for ( Object item : items )
{
- item = item1;
appendObject( item );
}
}
@@ -101,10 +98,9 @@ public class ChecksumCalculator
{
if ( fileList != null )
{
- int size = fileList.length;
- for ( int i = 0; i < size; i++ )
+ for ( File file : fileList )
{
- appendObject( fileList[i] );
+ appendObject( file );
}
}
else
@@ -129,12 +125,9 @@ public class ChecksumCalculator
{
return null;
}
- int size = bytes.length;
- final StringBuilder result = new StringBuilder( 2 * size );
- byte b;
- for ( int i = 0; i < size; i++ )
+ final StringBuilder result = new StringBuilder( 2 * bytes.length );
+ for ( byte b : bytes )
{
- b = bytes[i];
result.append( HEX.charAt( ( b & 0xF0 ) >> 4 ) ).append( HEX.charAt( ( b & 0x0F ) ) );
}
return result.toString();
@@ -143,11 +136,9 @@ public class ChecksumCalculator
private String getConfig()
{
StringBuilder result = new StringBuilder();
- Object item;
for ( Object checksumItem : checksumItems )
{
- item = checksumItem;
- result.append( item != null ? item.toString() : "null" );
+ result.append( checksumItem != null ? checksumItem.toString() : "null" );
}
return result.toString();
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java Fri Dec 30 15:51:56 2011
@@ -170,14 +170,14 @@ public class ForkConfiguration
* @throws org.apache.maven.surefire.booter.SurefireBooterForkException
* when unable to perform the fork
*/
- public Commandline createCommandLine( List classPath, ClassLoaderConfiguration classpathConfiguration,
+ public Commandline createCommandLine( List<String> classPath, ClassLoaderConfiguration classpathConfiguration,
boolean shadefire )
throws SurefireBooterForkException
{
return createCommandLine( classPath, classpathConfiguration.isManifestOnlyJarRequestedAndUsable(), shadefire );
}
- public Commandline createCommandLine( List classPath, boolean useJar, boolean shadefire )
+ public Commandline createCommandLine( List<String> classPath, boolean useJar, boolean shadefire )
throws SurefireBooterForkException
{
Commandline cli = new Commandline();
@@ -246,7 +246,7 @@ public class ForkConfiguration
* @return The file pointint to the jar
* @throws java.io.IOException When a file operation fails.
*/
- public File createJar( List classPath )
+ public File createJar( List<String> classPath )
throws IOException
{
File file = File.createTempFile( "surefirebooter", ".jar", tempDirectory );
@@ -265,9 +265,8 @@ public class ForkConfiguration
// we can't use StringUtils.join here since we need to add a '/' to
// the end of directory entries - otherwise the jvm will ignore them.
String cp = "";
- for ( Iterator it = classPath.iterator(); it.hasNext(); )
+ for ( String el : classPath )
{
- String el = (String) it.next();
// NOTE: if File points to a directory, this entry MUST end in '/'.
cp += UrlUtils.getURL( new File( el ) ).toExternalForm() + " ";
}
Modified: maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ProviderDetector.java Fri Dec 30 15:51:56 2011
@@ -37,7 +37,7 @@ import java.util.Set;
public class ProviderDetector
{
- public static Set<String> getServiceNames( Class clazz, ClassLoader classLoader )
+ public static Set<String> getServiceNames( Class<?> clazz, ClassLoader classLoader )
throws IOException
{
final String resourceName = "META-INF/services/" + clazz.getName();
@@ -46,7 +46,7 @@ public class ProviderDetector
{
return Collections.emptySet();
}
- final Enumeration urlEnumeration = classLoader.getResources( resourceName );
+ final Enumeration<URL> urlEnumeration = classLoader.getResources( resourceName );
return getNames( urlEnumeration );
}
@@ -59,14 +59,14 @@ public class ProviderDetector
* @throws IOException When reading the streams fails
* @return The set of service provider names
*/
- private static Set<String> getNames( final Enumeration urlEnumeration )
+ private static Set<String> getNames( final Enumeration<URL> urlEnumeration )
throws IOException
{
final Set<String> names = new HashSet<String>();
nextUrl:
while ( urlEnumeration.hasMoreElements() )
{
- final URL url = (URL) urlEnumeration.nextElement();
+ final URL url = urlEnumeration.nextElement();
final BufferedReader reader = getReader( url );
try
{
@@ -117,7 +117,6 @@ public class ProviderDetector
return names;
}
-
private static BufferedReader getReader( URL url )
throws IOException
{
@@ -125,6 +124,4 @@ public class ProviderDetector
final InputStreamReader inputStreamReader = new InputStreamReader( inputStream );
return new BufferedReader( inputStreamReader );
}
-
-
}
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java Fri Dec 30 15:51:56 2011
@@ -67,8 +67,8 @@ public class BooterDeserializerProviderC
{
File aDir = new File( "." );
- List includes = new ArrayList();
- List excludes = new ArrayList();
+ List<String> includes = new ArrayList<String>();
+ List<String> excludes = new ArrayList<String>();
includes.add( "abc" );
includes.add( "cde" );
excludes.add( "xx1" );
@@ -117,7 +117,7 @@ public class BooterDeserializerProviderC
ProviderConfiguration reloaded = getReloadedProviderConfiguration();
TestRequest testSuiteDefinition = reloaded.getTestSuiteDefinition();
- List suiteXmlFiles = testSuiteDefinition.getSuiteXmlFiles();
+ List<?> suiteXmlFiles = testSuiteDefinition.getSuiteXmlFiles();
File[] expected = getSuiteXmlFiles();
Assert.assertEquals( expected[0], suiteXmlFiles.get( 0 ) );
Assert.assertEquals( expected[1], suiteXmlFiles.get( 1 ) );
@@ -154,8 +154,8 @@ public class BooterDeserializerProviderC
private DirectoryScannerParameters getDirectoryScannerParameters()
{
File aDir = new File( "." );
- List includes = new ArrayList();
- List excludes = new ArrayList();
+ List<String> includes = new ArrayList<String>();
+ List<String> excludes = new ArrayList<String>();
includes.add( "abc" );
includes.add( "cde" );
excludes.add( "xx1" );
@@ -213,8 +213,8 @@ public class BooterDeserializerProviderC
return new File[]{ new File( "A1" ), new File( "A2" ) };
}
- private List getSuiteXmlFileStrings()
+ private List<String> getSuiteXmlFileStrings()
{
- return Arrays.asList( new Object[]{ "A1", "A2" } );
+ return Arrays.asList( new String[]{ "A1", "A2" } );
}
}
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java Fri Dec 30 15:51:56 2011
@@ -142,7 +142,8 @@ public class BooterDeserializerStartupCo
File cwd = new File( "." );
DirectoryScannerParameters directoryScannerParameters =
- new DirectoryScannerParameters( cwd, new ArrayList(), new ArrayList(), Boolean.TRUE, "hourly" );
+ new DirectoryScannerParameters( cwd, new ArrayList<String>(), new ArrayList<String>(), Boolean.TRUE,
+ "hourly" );
ReporterConfiguration reporterConfiguration = new ReporterConfiguration( cwd, Boolean.TRUE );
String aUserRequestedTest = "aUserRequestedTest";
String aUserRequestedTestMethod = "aUserRequestedTestMethod";
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkingRunListenerTest.java Fri Dec 30 15:51:56 2011
@@ -242,7 +242,7 @@ public class ForkingRunListenerTest
forkStreamClient.consumeMultiLineContent( content.toString( "utf-8" ) );
final MockReporter reporter = (MockReporter) forkStreamClient.getReporter( defaultChannel );
- final List events = reporter.getEvents();
+ final List<String> events = reporter.getEvents();
assertEquals( MockReporter.SET_STARTING, events.get( 0 ) );
assertEquals( MockReporter.TEST_STARTING, events.get( 1 ) );
assertEquals( MockReporter.TEST_SUCCEEDED, events.get( 2 ) );
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java Fri Dec 30 15:51:56 2011
@@ -39,8 +39,8 @@ public class RunEntryStatisticsMapTest
throws IOException
{
final RunEntryStatisticsMap runEntryStatisticsMap = RunEntryStatisticsMap.fromReader( getStatisticsFile() );
- final List list = Arrays.asList( new Class[]{ A.class, B.class, C.class } );
- final List prioritizedTestsClassRunTime = runEntryStatisticsMap.getPrioritizedTestsClassRunTime( list, 2 );
+ final List<?> list = Arrays.asList( new Class[]{ A.class, B.class, C.class } );
+ final List<?> prioritizedTestsClassRunTime = runEntryStatisticsMap.getPrioritizedTestsClassRunTime( list, 2 );
assertEquals( C.class, prioritizedTestsClassRunTime.get( 0 ) );
assertEquals( B.class, prioritizedTestsClassRunTime.get( 1 ) );
assertEquals( A.class, prioritizedTestsClassRunTime.get( 2 ) );
@@ -50,8 +50,8 @@ public class RunEntryStatisticsMapTest
throws IOException
{
final RunEntryStatisticsMap runEntryStatisticsMap = RunEntryStatisticsMap.fromReader( getStatisticsFile() );
- final List list = Arrays.asList( new Class[]{ A.class, B.class, C.class } );
- final List prioritizedTestsClassRunTime = runEntryStatisticsMap.getPrioritizedTestsByFailureFirst( list);
+ final List<?> list = Arrays.asList( new Class[]{ A.class, B.class, C.class } );
+ final List<?> prioritizedTestsClassRunTime = runEntryStatisticsMap.getPrioritizedTestsByFailureFirst( list);
assertEquals( A.class, prioritizedTestsClassRunTime.get( 0 ) );
assertEquals( C.class, prioritizedTestsClassRunTime.get( 1 ) );
assertEquals( B.class, prioritizedTestsClassRunTime.get( 2 ) );
@@ -92,18 +92,16 @@ public class RunEntryStatisticsMapTest
newResults.serialize( data );
}
+ class A
+ {
+ }
+ class B
+ {
+ }
- class A
- {
- }
-
- class B
- {
- }
-
- class C
- {
- }
+ class C
+ {
+ }
}
Modified: maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java?rev=1225853&r1=1225852&r2=1225853&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java (original)
+++ maven/surefire/trunk/maven-surefire-common/src/test/java/org/apache/maven/surefire/util/internal/TwoThreadBlockingQueueTest.java Fri Dec 30 15:51:56 2011
@@ -1,4 +1,5 @@
package org.apache.maven.surefire.util.internal;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +19,9 @@ package org.apache.maven.surefire.util.i
* under the License.
*/
-
import java.util.ArrayList;
import java.util.LinkedList;
+import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.FutureTask;
import java.util.concurrent.LinkedBlockingQueue;
@@ -42,12 +43,12 @@ public class TwoThreadBlockingQueueTest
BlockingQueue twoThreadBlockingQueue = new TwoThreadBlockingQueue();
String[] items = generate( num );
- long start = System.currentTimeMillis();
- for ( int i = 0; i < num; i++ )
+ //long start = System.currentTimeMillis();
+ for ( String item : items )
{
- twoThreadBlockingQueue.add( items[i] );
+ twoThreadBlockingQueue.add( item );
}
- long elapsed = System.currentTimeMillis() - start;
+ //long elapsed = System.currentTimeMillis() - start;
//System.out.println( "TwoThreadBlockingQueue insert " + num + " elements in = " + elapsed );
System.gc();
}
@@ -58,12 +59,12 @@ public class TwoThreadBlockingQueueTest
FunkyTwoThreadBlockingQueue twoThreadBlockingQueue = new FunkyTwoThreadBlockingQueue();
String[] items = generate( num );
- long start = System.currentTimeMillis();
- for ( int i = 0; i < num; i++ )
+ //long start = System.currentTimeMillis();
+ for ( String item : items )
{
- twoThreadBlockingQueue.put( items[i] );
+ twoThreadBlockingQueue.put( item );
}
- long elapsed = System.currentTimeMillis() - start;
+ //long elapsed = System.currentTimeMillis() - start;
//System.out.println( "FunkyTwoThreadBlockingQueue insert " + num + " elements in = " + elapsed );
System.gc();
}
@@ -74,37 +75,38 @@ public class TwoThreadBlockingQueueTest
{
final FunkyTwoThreadBlockingQueue twoThreadBlockingQueue = new FunkyTwoThreadBlockingQueue();
- Callable consumer = new Callable()
+ Callable<String> consumer = new Callable<String>()
{
- public Object call()
+ public String call()
throws Exception
{
int num = 0;
- Object taken;
+ String taken;
do
{
taken = twoThreadBlockingQueue.take();
- if (taken != TwoThreadBlockingQueue.poison) {
+ if ( taken != TwoThreadBlockingQueue.poison )
+ {
Assert.assertEquals( "item" + num++, taken );
}
}
- while ( taken != TwoThreadBlockingQueue.poison);
+ while ( taken != TwoThreadBlockingQueue.poison );
return taken;
}
};
- FutureTask futureTask = new FutureTask( consumer );
+ FutureTask<String> futureTask = new FutureTask<String>( consumer );
Thread thread = new Thread( futureTask );
thread.start();
String[] items = generate( num );
- long start = System.currentTimeMillis();
- for ( int i = 0; i < num; i++ )
+ //long start = System.currentTimeMillis();
+ for ( String item : items )
{
- twoThreadBlockingQueue.put( items[i] );
+ twoThreadBlockingQueue.put( item );
}
twoThreadBlockingQueue.put( TwoThreadBlockingQueue.poison );
- long elapsed = System.currentTimeMillis() - start;
+ //long elapsed = System.currentTimeMillis() - start;
futureTask.get();
@@ -115,15 +117,15 @@ public class TwoThreadBlockingQueueTest
public void testLBQPut()
throws Exception
{
- LinkedBlockingQueue twoThreadBlockingQueue = new LinkedBlockingQueue();
+ LinkedBlockingQueue<String> twoThreadBlockingQueue = new LinkedBlockingQueue<String>();
String[] items = generate( num );
- long start = System.currentTimeMillis();
- for ( int i = 0; i < num; i++ )
+ //long start = System.currentTimeMillis();
+ for ( String item : items )
{
- twoThreadBlockingQueue.put( items[i] );
+ twoThreadBlockingQueue.put( item );
}
- long elapsed = System.currentTimeMillis() - start;
+ //long elapsed = System.currentTimeMillis() - start;
//System.out.println( "LinkedBlockingQueue insert " + num + " elements in = " + elapsed );
System.gc();
}
@@ -131,15 +133,15 @@ public class TwoThreadBlockingQueueTest
public void testArrayList()
throws Exception
{
- ArrayList twoThreadBlockingQueue = new ArrayList( num);
+ List<String> twoThreadBlockingQueue = new ArrayList<String>( num );
String[] items = generate( num );
- long start = System.currentTimeMillis();
- for ( int i = 0; i < num; i++ )
+ //long start = System.currentTimeMillis();
+ for ( String item : items )
{
- twoThreadBlockingQueue.add( items[i] );
+ twoThreadBlockingQueue.add( item );
}
- long elapsed = System.currentTimeMillis() - start;
+ //long elapsed = System.currentTimeMillis() - start;
//System.out.println( "ArrayList insert " + num + " elements in = " + elapsed );
System.gc();
}
@@ -147,24 +149,22 @@ public class TwoThreadBlockingQueueTest
public void testLinkedList()
throws Exception
{
- LinkedList twoThreadBlockingQueue = new LinkedList( );
+ LinkedList<String> twoThreadBlockingQueue = new LinkedList<String>();
String[] items = generate( num );
- long start = System.currentTimeMillis();
- for ( int i = 0; i < num; i++ )
+ //long start = System.currentTimeMillis();
+ for ( String item : items )
{
- twoThreadBlockingQueue.add( items[i] );
+ twoThreadBlockingQueue.add( item );
}
- long elapsed = System.currentTimeMillis() - start;
+ //long elapsed = System.currentTimeMillis() - start;
//System.out.println( "LinkedList insert " + num + " elements in = " + elapsed );
System.gc();
}
-
public void testTake()
throws Exception
{
-
}
String[] generate( int num )