You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/01/08 15:04:08 UTC
svn commit: r1228849 - in
/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear:
AbstractEarTest.java it/AbstractEarPluginIT.java
util/ArtifactTypeMappingServiceTest.java util/EarMavenArchiverTest.java
Author: rfscholte
Date: Sun Jan 8 14:04:07 2012
New Revision: 1228849
URL: http://svn.apache.org/viewvc?rev=1228849&view=rev
Log:
Generics for tests too
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java
maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java?rev=1228849&r1=1228848&r2=1228849&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/AbstractEarTest.java Sun Jan 8 14:04:07 2012
@@ -43,24 +43,24 @@ public abstract class AbstractEarTest
}
- protected Set createArtifacts( String[] artifactsId )
+ protected Set<Artifact> createArtifacts( String[] artifactsId )
{
return createArtifacts( artifactsId, null );
}
- protected Set createArtifacts( String[] artifactsId, String[] types )
+ protected Set<Artifact> createArtifacts( String[] artifactsId, String[] types )
{
return createArtifacts( artifactsId, types, null );
}
- protected Set createArtifacts( String[] artifactsId, String[] types, String[] groupsId )
+ protected Set<Artifact> createArtifacts( String[] artifactsId, String[] types, String[] groupsId )
{
return createArtifacts( artifactsId, types, groupsId, null );
}
- protected Set createArtifacts( String[] artifactsId, String[] types, String[] groupsId, String[] classifiers )
+ protected Set<Artifact> createArtifacts( String[] artifactsId, String[] types, String[] groupsId, String[] classifiers )
{
- Set result = new TreeSet();
+ Set<Artifact> result = new TreeSet<Artifact>();
if ( artifactsId == null || artifactsId.length == 0 )
{
return result;
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java?rev=1228849&r1=1228848&r2=1228849&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/it/AbstractEarPluginIT.java Sun Jan 8 14:04:07 2012
@@ -76,6 +76,7 @@ public abstract class AbstractEarPluginI
* @return the base directory of the project
* @throws Exception if an error occurred
*/
+ @SuppressWarnings( "unchecked" )
protected File executeMojo( final String projectName, final Properties properties, boolean expectNoError )
throws Exception
{
@@ -245,7 +246,7 @@ public abstract class AbstractEarPluginI
File dir = getEarDirectory( baseDir, projectName );
// Let's build the expected directories sort list
- final List expectedDirectories = new ArrayList();
+ final List<File> expectedDirectories = new ArrayList<File>();
for ( int i = 0; i < artifactsDirectory.length; i++ )
{
if ( artifactsDirectory[i] )
@@ -254,7 +255,7 @@ public abstract class AbstractEarPluginI
}
}
- final List actualFiles = buildArchiveContentFiles( dir, expectedDirectories );
+ final List<File> actualFiles = buildArchiveContentFiles( dir, expectedDirectories );
assertEquals( "Artifacts mismatch " + actualFiles, artifactNames.length, actualFiles.size() );
for ( int i = 0; i < artifactNames.length; i++ )
{
@@ -270,15 +271,15 @@ public abstract class AbstractEarPluginI
}
}
- protected List buildArchiveContentFiles( final File baseDir, final List expectedDirectories )
+ protected List<File> buildArchiveContentFiles( final File baseDir, final List<File> expectedDirectories )
{
- final List result = new ArrayList();
+ final List<File> result = new ArrayList<File>();
addFiles( baseDir, result, expectedDirectories );
return result;
}
- private void addFiles( final File directory, final List files, final List expectedDirectories )
+ private void addFiles( final File directory, final List<File> files, final List<File> expectedDirectories )
{
File[] result = directory.listFiles( new FilenameFilter()
{
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java?rev=1228849&r1=1228848&r2=1228849&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/ArtifactTypeMappingServiceTest.java Sun Jan 8 14:04:07 2012
@@ -26,8 +26,6 @@ import org.apache.maven.plugin.ear.Unkno
import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import java.util.Iterator;
-
/**
* Tests for the {@link ArtifactTypeMappingService}
*
@@ -41,10 +39,8 @@ public class ArtifactTypeMappingServiceT
public void testDefaultConfiguration()
{
ArtifactTypeMappingService service = getDefaultService();
- final Iterator it = EarModuleFactory.getStandardArtifactTypes().iterator();
- while ( it.hasNext() )
+ for ( String type : EarModuleFactory.getStandardArtifactTypes() )
{
- String type = (String) it.next();
assertTrue( "Standard type could not be found", service.isMappedToType( type, type ) );
}
}
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java?rev=1228849&r1=1228848&r2=1228849&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/java/org/apache/maven/plugin/ear/util/EarMavenArchiverTest.java Sun Jan 8 14:04:07 2012
@@ -36,7 +36,7 @@ public class EarMavenArchiverTest
public void testSimpleEjbModule()
{
- final List modules = new ArrayList();
+ final List<EarModule> modules = new ArrayList<EarModule>();
final EarModule module = new EjbModule( createArtifact( "foo", "ejb" ) );
setUri( module, "foo-1.0.jar" );
modules.add( module );
@@ -48,7 +48,7 @@ public class EarMavenArchiverTest
public void testSimpleJarModuleWithCustomBundleDir()
{
- final List modules = new ArrayList();
+ final List<EarModule> modules = new ArrayList<EarModule>();
final EarModule module = new EjbModule( createArtifact( "foo", "jar" ) );
setUri( module, "libs/foo-1.0.jar" );
modules.add( module );
@@ -60,7 +60,7 @@ public class EarMavenArchiverTest
public void testTwoModules()
{
- final List modules = new ArrayList();
+ final List<EarModule> modules = new ArrayList<EarModule>();
final EarModule module = new EjbModule( createArtifact( "foo", "ejb" ) );
setUri( module, "foo-1.0.jar" );
modules.add( module );
@@ -74,4 +74,4 @@ public class EarMavenArchiverTest
}
-}
+}
\ No newline at end of file