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 2012/06/02 07:26:02 UTC
svn commit: r1345442 - in
/maven/plugin-testing/trunk/maven-plugin-testing-tools/src:
main/java/org/apache/maven/shared/test/plugin/
test/java/org/apache/maven/shared/test/plugin/
Author: hboutemy
Date: Sat Jun 2 05:26:01 2012
New Revision: 1345442
URL: http://svn.apache.org/viewvc?rev=1345442&view=rev
Log:
more generics and Java 5 constructs
Modified:
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/BuildTool.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java
Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/BuildTool.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/BuildTool.java?rev=1345442&r1=1345441&r2=1345442&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/BuildTool.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/BuildTool.java Sat Jun 2 05:26:01 2012
@@ -45,7 +45,7 @@ import org.codehaus.plexus.util.cli.Comm
* @author jdcasey
* @version $Id$
*/
-@Component(role=BuildTool.class)
+@Component( role = BuildTool.class )
public class BuildTool
implements Initializable, Disposable
{
@@ -68,7 +68,7 @@ public class BuildTool
* resulting from the Maven invocation.
* @throws TestToolsException if any
*/
- public InvocationResult executeMaven( File pom, Properties properties, List goals, File buildLogFile )
+ public InvocationResult executeMaven( File pom, Properties properties, List<String> goals, File buildLogFile )
throws TestToolsException
{
InvocationRequest request = createBasicInvocationRequest( pom, properties, goals, buildLogFile );
@@ -132,7 +132,7 @@ public class BuildTool
}
/**
- * If we're logging output to a logfile using standard output handlers, make sure these are
+ * If we're logging output to a log file using standard output handlers, make sure these are
* closed.
*
* @param request
@@ -169,7 +169,7 @@ public class BuildTool
* @return The standardized InvocationRequest for the test build, ready for any necessary
* customizations.
*/
- public InvocationRequest createBasicInvocationRequest( File pom, Properties properties, List goals,
+ public InvocationRequest createBasicInvocationRequest( File pom, Properties properties, List<String> goals,
File buildLogFile )
{
InvocationRequest request = new DefaultInvocationRequest();
Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java?rev=1345442&r1=1345441&r2=1345442&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java Sat Jun 2 05:26:01 2012
@@ -225,7 +225,7 @@ public class ProjectTool
Properties properties = new Properties();
- List goals = new ArrayList();
+ List<String> goals = new ArrayList<String>();
goals.add( "package" );
File buildLog = logFile == null ? pomInfo.getBuildLogFile() : logFile;
@@ -390,12 +390,10 @@ public class ProjectTool
if ( skipUnitTests )
{
- List plugins = build.getPlugins();
+ List<Plugin> plugins = build.getPlugins();
Plugin plugin = null;
- for ( Iterator iter = plugins.iterator(); iter.hasNext(); )
+ for ( Plugin plug : plugins )
{
- Plugin plug = (Plugin) iter.next();
-
if ( "maven-surefire-plugin".equals( plug.getArtifactId() ) )
{
plugin = plug;
Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java?rev=1345442&r1=1345441&r2=1345442&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java Sat Jun 2 05:26:01 2012
@@ -96,14 +96,12 @@ public class ProjectToolTest
assertEquals( "maven-plugin", artifact.getType() );
assertTrue( "Missing " + artifact.getFile(), artifact.getFile().exists() );
- Collection metadata = artifact.getMetadataList();
+ Collection<ArtifactMetadata> metadata = artifact.getMetadataList();
boolean foundPomMetadata = false;
- for ( Iterator it = metadata.iterator(); it.hasNext(); )
+ for ( ArtifactMetadata metadataItem : metadata )
{
- ArtifactMetadata metadataItem = (ArtifactMetadata) it.next();
-
if ( metadataItem instanceof ProjectArtifactMetadata )
{
foundPomMetadata = true;