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 2010/08/13 23:57:11 UTC
svn commit: r985379 - in
/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype:
common/ common/util/ creator/ old/ source/ test/
Author: hboutemy
Date: Fri Aug 13 21:57:11 2010
New Revision: 985379
URL: http://svn.apache.org/viewvc?rev=985379&view=rev
Log:
o code simplification
o added generics
Modified:
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/TestDefaultArchetypeFilesResolver.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestListScanner.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/TestDefaultArchetypeFilesResolver.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/TestDefaultArchetypeFilesResolver.java?rev=985379&r1=985378&r2=985379&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/TestDefaultArchetypeFilesResolver.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/TestDefaultArchetypeFilesResolver.java Fri Aug 13 21:57:11 2010
@@ -41,7 +41,7 @@ public class TestDefaultArchetypeFilesRe
fileSet.setPackaged( true );
fileSet.setFiltered( true );
- List archetypeResources = new ArrayList();
+ List<String> archetypeResources = new ArrayList<String>();
archetypeResources.add( "pom.xml" );
archetypeResources.add( "App.java" );
@@ -61,7 +61,7 @@ public class TestDefaultArchetypeFilesRe
ArchetypeFilesResolver resolver = new DefaultArchetypeFilesResolver();
- List fileSetResources = resolver.filterFiles( "", fileSet, archetypeResources );
+ List<String> fileSetResources = resolver.filterFiles( "", fileSet, archetypeResources );
System.out.println( "Result:" + fileSetResources );
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestListScanner.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestListScanner.java?rev=985379&r1=985378&r2=985379&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestListScanner.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/common/util/TestListScanner.java Fri Aug 13 21:57:11 2010
@@ -30,7 +30,7 @@ public class TestListScanner
{
public void testUnixPaths()
{
- List archetypeResources = new ArrayList();
+ List<String> archetypeResources = new ArrayList<String>();
archetypeResources.add( "pom.xml" );
archetypeResources.add( "App.java" );
@@ -50,7 +50,7 @@ public class TestListScanner
scanner.setIncludes( "**/*.java" );
scanner.setCaseSensitive( true );
- List result = scanner.scan( archetypeResources );
+ List<String> result = scanner.scan( archetypeResources );
assertEquals( 2, result.size() );
assertTrue( result.contains( "src/main/java/App.java" ) );
@@ -59,7 +59,7 @@ public class TestListScanner
public void testWindowsPaths()
{
- List archetypeResources = new ArrayList();
+ List<String> archetypeResources = new ArrayList<String>();
archetypeResources.add( "pom.xml" );
archetypeResources.add( "App.java" );
@@ -79,7 +79,7 @@ public class TestListScanner
scanner.setIncludes( "**\\*.java" );
scanner.setCaseSensitive( true );
- List result = scanner.scan( archetypeResources );
+ List<String> result = scanner.scan( archetypeResources );
assertEquals( 2, result.size() );
assertTrue( result.contains( "src\\main\\java\\App.java" ) );
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java?rev=985379&r1=985378&r2=985379&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java Fri Aug 13 21:57:11 2010
@@ -22,7 +22,6 @@ package org.apache.maven.archetype.creat
import org.apache.maven.archetype.ArchetypeCreationRequest;
import org.apache.maven.archetype.ArchetypeCreationResult;
import org.apache.maven.archetype.common.Constants;
-import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
@@ -40,19 +39,17 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Properties;
public class DefaultArchetypeCreatorTest
extends AbstractMojoTestCase
{
- private List filtereds;
+ private List<String> filtereds;
- private List languages;
- private DefaultArtifactRepository localRepository;
+ private List<String> languages;
- private List repositories;
+ private DefaultArtifactRepository localRepository;
public void testCreateFilesetArchetype()
throws Exception
@@ -81,7 +78,6 @@ public class DefaultArchetypeCreatorTest
MavenProject mavenProject = null;
- try
{
Object result = builder.buildWithDependencies( projectFile, localRepository, null );
if ( result instanceof MavenProject )
@@ -97,22 +93,18 @@ public class DefaultArchetypeCreatorTest
fail( "Wrong result class" );
}
}
- catch ( Exception e )
- {
- e.printStackTrace();
- }
FilesetArchetypeCreator instance =
(FilesetArchetypeCreator) lookup( ArchetypeCreator.class.getName(), "fileset" );
- languages = new ArrayList();
+ languages = new ArrayList<String>();
languages.add( "java" );
languages.add( "aspectj" );
languages.add( "csharp" );
languages.add( "groovy" );
languages.add( "resources" );
- filtereds = new ArrayList();
+ filtereds = new ArrayList<String>();
filtereds.add( "java" );
filtereds.add( "xml" );
filtereds.add( "txt" );
@@ -335,17 +327,6 @@ public class DefaultArchetypeCreatorTest
localRepository = new DefaultArtifactRepository( "local",
new File( getBasedir(), "target/test-classes/repositories/local" ).toURI().toString(),
new DefaultRepositoryLayout() );
-
- repositories =
- Arrays.asList(
- new ArtifactRepository[]
- {
- new DefaultArtifactRepository( "central",
- new File( getBasedir(), "target/test-classes/repositories/central" ).toURI().toString(),
- new DefaultRepositoryLayout()
- )
- }
- );
}
private boolean assertContent( File template, String content )
@@ -378,18 +359,7 @@ public class DefaultArchetypeCreatorTest
private File getDescriptorFile( String project )
{
- return
- new File(
- getBasedir(),
- "target/test-classes/projects/" + project + "/target/generated-sources/archetype/"
- + "src/main/resources/"
- + "META-INF/maven/archetype.xml"
- );
- }
-
- private String getPath( String basedir, String child )
- {
- return new File( basedir, child ).getPath();
+ return getFile( project, "target/generated-sources/archetype/src/main/resources/META-INF/maven/archetype.xml" );
}
private File getFile( String project, String file )
@@ -399,45 +369,27 @@ public class DefaultArchetypeCreatorTest
private File getProjectFile( String project )
{
- return new File( getBasedir(), "target/test-classes/projects/" + project + "/pom.xml" );
+ return getFile( project, "pom.xml" );
}
private File getProjectSampleFile( String project )
{
- return
- new File(
- getBasedir(),
- "target/test-classes/projects/" + project + "/pom.xml.sample"
- );
+ return getFile( project, "pom.xml.sample" );
}
private File getPropertiesFile( String project )
{
- return
- new File(
- getBasedir(),
- "target/test-classes/projects/" + project + "/archetype.properties"
- );
+ return getFile( project, "archetype.properties" );
}
private File getPropertiesSampleFile( final String project )
{
- File propertyFileSample =
- new File(
- getBasedir(),
- "target/test-classes/projects/" + project + "/archetype.properties.sample"
- );
- return propertyFileSample;
+ return getFile( project, "archetype.properties.sample" );
}
private File getTemplateFile( String project, String template )
{
- return
- new File(
- getBasedir(),
- "target/test-classes/projects/" + project + "/target/generated-sources/archetype/"
- + "src/main/resources/"
- + "archetype-resources/" + template
- );
+ return getFile( project, "target/generated-sources/archetype/src/main/resources/archetype-resources/"
+ + template );
}
}
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java?rev=985379&r1=985378&r2=985379&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/old/ArchetypeTest.java Fri Aug 13 21:57:11 2010
@@ -44,7 +44,6 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -73,7 +72,7 @@ public class ArchetypeTest
ArtifactRepository localRepository = new DefaultArtifactRepository( "local", mavenRepoLocal, layout );
- List remoteRepositories = new ArrayList();
+ List<ArtifactRepository> remoteRepositories = new ArrayList<ArtifactRepository>();
String mavenRepoRemote = getTestFile( "src/test/repository" ).toURL().toString();
@@ -100,7 +99,7 @@ public class ArchetypeTest
// Set up the Velocity context
// ----------------------------------------------------------------------
- Map parameters = new HashMap();
+ Map<String, Object> parameters = new HashMap<String, Object>();
parameters.put( "basedir", request.getOutputDirectory() );
parameters.put( "package", request.getPackage() );
parameters.put( "packageName", request.getPackage() );
@@ -110,13 +109,9 @@ public class ArchetypeTest
Context context = new VelocityContext();
- for ( Iterator iterator = parameters.keySet().iterator(); iterator.hasNext(); )
+ for ( Map.Entry<String, Object> entry : parameters.entrySet() )
{
- String key = (String) iterator.next();
-
- Object value = parameters.get( key );
-
- context.put( key, value );
+ context.put( entry.getKey(), entry.getValue() );
}
// ----------------------------------------------------------------------
@@ -197,7 +192,7 @@ public class ArchetypeTest
// Gets the classloader for this artifact's file.
private ClassLoader getContextClassloader( Artifact archetypeArtifact, ArtifactRepository localRepository,
- List remoteRepositories )
+ List<ArtifactRepository> remoteRepositories )
throws Exception
{
ArtifactResolver artifactResolver = (ArtifactResolver) lookup( ArtifactResolver.class.getName() );
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java?rev=985379&r1=985378&r2=985379&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java Fri Aug 13 21:57:11 2010
@@ -49,7 +49,7 @@ public class CatalogArchetypeDataSinkTes
a0.setRepository( "http://magicbunny.com/maven2" );
- List archetypes = new ArrayList();
+ List<Archetype> archetypes = new ArrayList<Archetype>();
archetypes.add( a0 );
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java?rev=985379&r1=985378&r2=985379&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSource.java Fri Aug 13 21:57:11 2010
@@ -69,7 +69,7 @@ public class WikiArchetypeDataSource
return ac;
}
- public List getArchetypes( Properties properties )
+ public List<Archetype> getArchetypes( Properties properties )
throws ArchetypeDataSourceException
{
String url = properties.getProperty( "url" );
@@ -79,7 +79,7 @@ public class WikiArchetypeDataSource
url = DEFAULT_ARCHETYPE_INVENTORY_PAGE;
}
- List archetypes = new ArrayList();
+ List<Archetype> archetypes = new ArrayList<Archetype>();
String pageSource = "";
InputStream in = null;
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java?rev=985379&r1=985378&r2=985379&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogArchetypesVerification.java Fri Aug 13 21:57:11 2010
@@ -22,7 +22,6 @@ package org.apache.maven.archetype.test;
import java.io.File;
import java.io.StringWriter;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.archetype.ArchetypeManager;
import org.apache.maven.archetype.ArchetypeGenerationRequest;
@@ -58,13 +57,11 @@ public class InternalCatalogArchetypesVe
ArchetypeCatalog result = archetype.getInternalCatalog();
- List archetypesUsed = new ArrayList();
- List archetypesRemoved = new ArrayList();
- Iterator archetypes = result.getArchetypes().iterator();
+ List<Archetype> archetypesUsed = new ArrayList<Archetype>();
+ List<Archetype> archetypesRemoved = new ArrayList<Archetype>();
int count = 1;
- while ( archetypes.hasNext() )
+ for ( Archetype a : result.getArchetypes() )
{
- Archetype a = (Archetype) archetypes.next();
Archetype ar = new Archetype();
ar.setGroupId( a.getGroupId() );
Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java
URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java?rev=985379&r1=985378&r2=985379&view=diff
==============================================================================
--- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java (original)
+++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/InternalCatalogFromWiki.java Fri Aug 13 21:57:11 2010
@@ -40,7 +40,6 @@ import org.codehaus.plexus.util.WriterFa
import java.io.File;
import java.io.Writer;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
@@ -73,10 +72,8 @@ public class InternalCatalogFromWiki
// fetch and parse Wiki page content
ArchetypeCatalog ac = ads.getArchetypeCatalog( new Properties() );
- for ( Iterator archetypes = ac.getArchetypes().iterator(); archetypes.hasNext(); )
+ for ( Archetype archetype : ac.getArchetypes() )
{
- Archetype archetype = (Archetype) archetypes.next();
-
if ( "".equals( archetype.getRepository() )
|| ( archetype.getRepository() != null && archetype.getRepository().indexOf( CENTRAL.substring( 7 ) ) >= 0 ) )
{
@@ -86,9 +83,8 @@ public class InternalCatalogFromWiki
System.out.println( "found " + ac.getArchetypes().size() + " archetypes on http://docs.codehaus.org/display/MAVENUSER/Archetypes+List" );
- for ( Iterator archetypes = ac.getArchetypes().iterator(); archetypes.hasNext(); )
+ for ( Archetype archetype : ac.getArchetypes() )
{
- Archetype archetype = (Archetype) archetypes.next();
System.out.println( " " + archetype );
}
@@ -115,17 +111,15 @@ public class InternalCatalogFromWiki
arm.createRepository( archetype.getRepository(), archetype.getRepository() + "-repo" );
if ( aam.isFileSetArchetype( archetype.getGroupId(), archetype.getArtifactId(), archetype.getVersion(),
- repository, localRepository, new ArrayList( /* repositories */) ) )
+ repository, localRepository, new ArrayList<ArtifactRepository>() ) )
{
ArchetypeDescriptor descriptor =
aam.getFileSetArchetypeDescriptor( archetype.getGroupId(), archetype.getArtifactId(),
archetype.getVersion(), repository, localRepository,
- new ArrayList( /* repositories */) );
+ new ArrayList<ArtifactRepository>() );
- for ( Iterator required = descriptor.getRequiredProperties().iterator(); required.hasNext(); )
+ for ( RequiredProperty prop : descriptor.getRequiredProperties() )
{
- RequiredProperty prop = (RequiredProperty) required.next();
-
properties.setProperty( prop.getKey(), prop.getDefaultValue() != null
&& !"".equals( prop.getDefaultValue() ) ? prop.getDefaultValue() : "test-value" );
}
@@ -143,16 +137,15 @@ public class InternalCatalogFromWiki
System.out.println( "Testing archetypes to " + outputDirectory.getPath() );
- List validArchetypes = new ArrayList();
+ List<Archetype> validArchetypes = new ArrayList<Archetype>();
int count = 1;
- List errors = new ArrayList();
- List warnings = new ArrayList();
+ List<String> errors = new ArrayList<String>();
+ List<String> warnings = new ArrayList<String>();
- for ( Iterator archetypes = ac.getArchetypes().iterator(); archetypes.hasNext(); )
+ for ( Archetype a : ac.getArchetypes() )
{
- Archetype a = (Archetype) archetypes.next();
Archetype ar = new Archetype();
ar.setGroupId( a.getGroupId() );
@@ -235,9 +228,9 @@ public class InternalCatalogFromWiki
{
System.err.println();
System.err.println( "Warnings: " );
- for ( Iterator iterator = warnings.iterator(); iterator.hasNext(); )
+ for ( String warning : warnings )
{
- System.err.println( " " + iterator.next() );
+ System.err.println( " " + warning );
}
}
@@ -252,20 +245,19 @@ public class InternalCatalogFromWiki
System.err.println( "Removed " + ( ac.getArchetypes().size() - fac.getArchetypes().size() )
+ " archetype(s) from Wiki page:" );
- List removedArchetypes = new ArrayList( ac.getArchetypes() );
+ List<Archetype> removedArchetypes = new ArrayList<Archetype>( ac.getArchetypes() );
removedArchetypes.removeAll( validArchetypes );
- for ( Iterator archetypes = removedArchetypes.iterator(); archetypes.hasNext(); )
+ for ( Archetype archetype : removedArchetypes )
{
- Archetype archetype = (Archetype) archetypes.next();
System.err.println( " " + archetype );
}
System.err.println();
System.err.println( "Got " + errors.size() + " error message(s): " );
- for ( Iterator iterator = errors.iterator(); iterator.hasNext(); )
+ for ( String error : errors )
{
- System.err.println( " " + iterator.next() );
+ System.err.println( " " + error );
}
}
}