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 2012/01/24 15:56:19 UTC
svn commit: r1235289 -
/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
Author: krosenvold
Date: Tue Jan 24 14:56:19 2012
New Revision: 1235289
URL: http://svn.apache.org/viewvc?rev=1235289&view=rev
Log:
o Updated test case to use generics
Modified:
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
Modified: maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java?rev=1235289&r1=1235288&r2=1235289&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java (original)
+++ maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java Tue Jan 24 14:56:19 2012
@@ -40,30 +40,21 @@ import org.codehaus.plexus.util.StringUt
import java.io.File;
import java.net.URI;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
+@SuppressWarnings("ResultOfMethodCallIgnored")
public class MavenArchiverTest
extends TestCase
{
static class ArtifactComparator
- implements Comparator
+ implements Comparator<Artifact>
{
- public int compare( Object o1, Object o2 )
+ public int compare( Artifact o1, Artifact o2 )
{
- return ( (Artifact) o1 ).getArtifactId().compareTo( ( (Artifact) o2 ).getArtifactId() );
+ return o1.getArtifactId().compareTo( o2.getArtifactId() );
}
public boolean equals( Object o )
@@ -84,7 +75,7 @@ public class MavenArchiverTest
MavenProject project = new MavenProject( model );
// we need to sort the artifacts for test purposes
- Set artifacts = new TreeSet( new ArtifactComparator() );
+ Set<Artifact> artifacts = new TreeSet<Artifact>( new ArtifactComparator() );
project.setArtifacts( artifacts );
// there should be a mock or a setter for this field.
@@ -107,7 +98,7 @@ public class MavenArchiverTest
}
- assertEquals( null, manifest.getMainAttributes().getValue( "Extension-List" ) );
+ assertEquals( null, manifest.getMainAttributes().getValue("Extension-List") );
MockArtifact artifact1 = new MockArtifact();
artifact1.setGroupId( "org.apache.dummy" );
@@ -120,7 +111,7 @@ public class MavenArchiverTest
manifest = archiver.getManifest( session, project, config );
- assertEquals( null, manifest.getMainAttributes().getValue( "Extension-List" ) );
+ assertEquals( null, manifest.getMainAttributes().getValue("Extension-List") );
MockArtifact artifact2 = new MockArtifact();
artifact2.setGroupId( "org.apache.dummy" );
@@ -133,7 +124,7 @@ public class MavenArchiverTest
manifest = archiver.getManifest( session, project, config );
- assertEquals( "dummy2", manifest.getMainAttributes().getValue( "Extension-List" ) );
+ assertEquals( "dummy2", manifest.getMainAttributes().getValue("Extension-List") );
MockArtifact artifact3 = new MockArtifact();
artifact3.setGroupId( "org.apache.dummy" );
@@ -146,7 +137,7 @@ public class MavenArchiverTest
manifest = archiver.getManifest( session, project, config );
- assertEquals( "dummy2", manifest.getMainAttributes().getValue( "Extension-List" ) );
+ assertEquals( "dummy2", manifest.getMainAttributes().getValue("Extension-List") );
MockArtifact artifact4 = new MockArtifact();
artifact4.setGroupId( "org.apache.dummy" );
@@ -159,7 +150,7 @@ public class MavenArchiverTest
manifest = archiver.getManifest( session, project, config );
- assertEquals( "dummy2 dummy4", manifest.getMainAttributes().getValue( "Extension-List" ) );
+ assertEquals( "dummy2 dummy4", manifest.getMainAttributes().getValue("Extension-List") );
}
public void testMultiClassPath()
@@ -200,12 +191,13 @@ public class MavenArchiverTest
Manifest manifest = archiver.getManifest( session, project, archiveConfiguration );
String classPath = manifest.getMainAttributes().getValue( "Class-Path" );
assertTrue( "User specified Class-Path entry was not added to manifest",
- classPath.indexOf( "help/" ) != -1 );
+ classPath.contains("help/"));
assertTrue( "Class-Path generated by addClasspath was not added to manifest",
- classPath.indexOf( tempFile.getName() ) != -1 );
+ classPath.contains(tempFile.getName()));
}
finally
{
+ //noinspection ResultOfMethodCallIgnored
tempFile.delete();
}
}
@@ -214,8 +206,7 @@ public class MavenArchiverTest
throws Exception
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -236,10 +227,9 @@ public class MavenArchiverTest
long time = jarFile.lastModified();
List files = FileUtils.getFiles( new File( "target/maven-archiver" ), "**/**", null, true );
- for ( Iterator i = files.iterator(); i.hasNext(); )
- {
- File f = (File) i.next();
- f.setLastModified( time );
+ for (Object file : files) {
+ File f = (File) file;
+ f.setLastModified(time);
}
archiver.createArchive( session, project, config );
@@ -257,8 +247,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -296,8 +285,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -341,8 +329,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -390,8 +377,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -405,6 +391,7 @@ public class MavenArchiverTest
config.getManifest().setAddDefaultImplementationEntries( true );
config.getManifest().setAddDefaultSpecificationEntries( true );
+ //noinspection deprecation
archiver.createArchive( project, config );
assertTrue( jarFile.exists() );
jar = new JarFile( jarFile );
@@ -442,8 +429,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -458,7 +444,7 @@ public class MavenArchiverTest
config.getManifest().setAddDefaultImplementationEntries( true );
config.getManifest().setAddDefaultSpecificationEntries( true );
- Map manifestEntries = new HashMap();
+ Map<String, String> manifestEntries = new HashMap<String, String>();
manifestEntries.put( "foo", "bar" );
manifestEntries.put( "first-name", "olivier" );
manifestEntries.put( "keyWithEmptyValue", null );
@@ -467,7 +453,7 @@ public class MavenArchiverTest
ManifestSection manifestSection = new ManifestSection();
manifestSection.setName( "UserSection" );
manifestSection.addManifestEntry( "key", "value" );
- List manifestSections = new ArrayList();
+ List<ManifestSection> manifestSections = new ArrayList<ManifestSection>();
manifestSections.add( manifestSection );
config.setManifestSections( manifestSections );
config.getManifest().setMainClass( "org.apache.maven.Foo" );
@@ -520,8 +506,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -553,7 +538,7 @@ public class MavenArchiverTest
}
}
- /**
+ /*
* Test to make sure that manifest sections are present in the manifest prior to the archive has been created.
*/
public void testManifestSections()
@@ -569,7 +554,7 @@ public class MavenArchiverTest
ManifestSection manifestSection = new ManifestSection();
manifestSection.setName( "SectionOne" );
manifestSection.addManifestEntry( "key", "value" );
- List manifestSections = new ArrayList();
+ List<ManifestSection> manifestSections = new ArrayList<ManifestSection>();
manifestSections.add( manifestSection );
config.setManifestSections( manifestSections );
@@ -583,6 +568,7 @@ public class MavenArchiverTest
assertEquals( "The value of the attribute is wrong.", "value", attribute );
}
+ @SuppressWarnings("ResultOfMethodCallIgnored")
public void testDefaultClassPathValue()
throws Exception
{
@@ -592,8 +578,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -628,6 +613,13 @@ public class MavenArchiverTest
}
}
+ @SuppressWarnings("ResultOfMethodCallIgnored")
+ private void deleteAndAssertNotPresent(File jarFile) {
+ jarFile.delete();
+ assertFalse( jarFile.exists() );
+ }
+
+ @SuppressWarnings("ResultOfMethodCallIgnored")
public void testDefaultClassPathValue_WithSnapshot()
throws Exception
{
@@ -637,8 +629,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -682,8 +673,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -704,7 +694,7 @@ public class MavenArchiverTest
Manifest manifest = archiver.getManifest( session, project, config );
String[] classPathEntries =
- StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ),
+ StringUtils.split( new String( manifest.getMainAttributes().getValue("Class-Path").getBytes() ),
" " );
assertEquals( "org/apache/dummy/dummy1/1.0/dummy1-1.0.jar", classPathEntries[0] );
assertEquals( "org/apache/dummy/foo/dummy2/1.5/dummy2-1.5.jar", classPathEntries[1] );
@@ -736,8 +726,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -758,7 +747,7 @@ public class MavenArchiverTest
Manifest manifest = archiver.getManifest( session, project, config );
String[] classPathEntries =
- StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ),
+ StringUtils.split( new String( manifest.getMainAttributes().getValue("Class-Path").getBytes() ),
" " );
assertEquals( "org/apache/dummy/dummy1/1.1-SNAPSHOT/dummy1-1.1-20081022.112233-1.jar",
classPathEntries[0] );
@@ -792,8 +781,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -816,7 +804,7 @@ public class MavenArchiverTest
Manifest manifest = archiver.getManifest( session, project, config );
String[] classPathEntries =
- StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ),
+ StringUtils.split( new String( manifest.getMainAttributes().getValue("Class-Path").getBytes() ),
" " );
assertEquals( "org/apache/dummy/dummy1/1.0/TEST-dummy1-1.0.jar", classPathEntries[0] );
assertEquals( "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar", classPathEntries[1] );
@@ -848,8 +836,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -872,7 +859,7 @@ public class MavenArchiverTest
Manifest manifest = archiver.getManifest( session, project, config );
String[] classPathEntries =
- StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ),
+ StringUtils.split( new String( manifest.getMainAttributes().getValue("Class-Path").getBytes() ),
" " );
assertEquals( "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-20081022.112233-1.jar",
classPathEntries[0] );
@@ -906,8 +893,7 @@ public class MavenArchiverTest
try
{
File jarFile = new File( "target/test/dummy.jar" );
- jarFile.delete();
- assertFalse( jarFile.exists() );
+ deleteAndAssertNotPresent(jarFile);
JarArchiver jarArchiver = new JarArchiver();
jarArchiver.setDestFile( jarFile );
@@ -930,7 +916,7 @@ public class MavenArchiverTest
Manifest manifest = archiver.getManifest( session, project, config );
String[] classPathEntries =
- StringUtils.split( new String( manifest.getMainAttributes().getValue( "Class-Path" ).getBytes() ),
+ StringUtils.split( new String( manifest.getMainAttributes().getValue("Class-Path").getBytes() ),
" " );
assertEquals( "org/apache/dummy/dummy1/1.1-SNAPSHOT/TEST-dummy1-1.1-SNAPSHOT.jar", classPathEntries[0] );
assertEquals( "org/apache/dummy/foo/dummy2/1.5/TEST-dummy2-1.5.jar", classPathEntries[1] );
@@ -1030,7 +1016,7 @@ public class MavenArchiverTest
};
- Set artifacts = new TreeSet( new ArtifactComparator() );
+ Set<Artifact> artifacts = new TreeSet<Artifact>( new ArtifactComparator() );
MockArtifact artifact1 = new MockArtifact();
artifact1.setGroupId( "org.apache.dummy" );
@@ -1143,7 +1129,7 @@ public class MavenArchiverTest
};
- Set artifacts = new TreeSet( new ArtifactComparator() );
+ Set<Artifact> artifacts = new TreeSet<Artifact>( new ArtifactComparator() );
MockArtifact artifact1 = new MockArtifact();
artifact1.setGroupId( "org.apache.dummy" );
@@ -1192,9 +1178,8 @@ public class MavenArchiverTest
}
URI uri = new File( resource.getPath() ).toURI().normalize();
- File result = new File( uri.getPath().replaceAll( "%20", " " ) );
- return result;
+ return new File( uri.getPath().replaceAll( "%20", " " ) );
}
private MavenSession getDummySession()
@@ -1220,11 +1205,9 @@ public class MavenArchiverTest
List goals = null;
String executionRootDir = null;
Date startTime = new Date();
- MavenSession session =
- new MavenSession( container, settings, localRepo, eventDispatcher, reactorManager, goals, executionRootDir,
- executionProperties, startTime );
- return session;
+ return new MavenSession( container, settings, localRepo, eventDispatcher, reactorManager, goals, executionRootDir,
+ executionProperties, startTime );
}
}