You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2010/09/21 22:34:53 UTC
svn commit: r999612 [10/10] - in /maven/plugins/trunk/maven-assembly-plugin:
./ src/main/java/org/apache/maven/plugin/assembly/
src/main/java/org/apache/maven/plugin/assembly/archive/
src/main/java/org/apache/maven/plugin/assembly/archive/archiver/ src...
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/ProjectUtilsTest.java Tue Sep 21 20:34:50 2010
@@ -19,6 +19,11 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
+import org.apache.maven.model.Model;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -29,59 +34,55 @@ import java.util.Set;
import junit.framework.TestCase;
-import org.apache.maven.model.Model;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
-
public class ProjectUtilsTest
extends TestCase
{
- private MavenProject createTestProject( String artifactId, String groupId, String version )
+ private MavenProject createTestProject( final String artifactId, final String groupId, final String version )
{
- Model model = new Model();
+ final Model model = new Model();
model.setArtifactId( artifactId );
model.setGroupId( groupId );
model.setVersion( version );
- MavenProject project = new MavenProject( model );
+ final MavenProject project = new MavenProject( model );
return project;
}
- public void testGetProjectModules_ShouldIncludeDirectModuleOfMasterProject()
- throws IOException
+ public void testGetProjectModules_ShouldIncludeDirectModuleOfMasterProject() throws IOException
{
- MavenProject master = createTestProject( "test", "testGroup", "1.0" );
+ final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
master.setFile( new File( "pom.xml" ) );
- master.getModel().addModule( "module" );
+ master.getModel()
+ .addModule( "module" );
- MavenProject module = createTestProject( "module", "testGroup", "1.0" );
+ final MavenProject module = createTestProject( "module", "testGroup", "1.0" );
module.setFile( new File( "module/pom.xml" ) );
- List projects = new ArrayList( 2 );
+ final List<MavenProject> projects = new ArrayList<MavenProject>( 2 );
projects.add( master );
projects.add( module );
- Set result =
+ final Set<MavenProject> result =
ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
assertNotNull( result );
assertEquals( 1, result.size() );
- assertEquals( module.getId(), ( ( MavenProject ) result.iterator().next() ).getId() );
+ assertEquals( module.getId(), result.iterator()
+ .next()
+ .getId() );
}
- public void testGetProjectModules_ShouldNotIncludeMasterProject()
- throws IOException
+ public void testGetProjectModules_ShouldNotIncludeMasterProject() throws IOException
{
- MavenProject master = createTestProject( "test", "testGroup", "1.0" );
+ final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
- Set result =
+ final Set<MavenProject> result =
ProjectUtils.getProjectModules( master, Collections.singletonList( master ), true,
new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
@@ -92,35 +93,37 @@ public class ProjectUtilsTest
public void testGetProjectModules_ShouldIncludeInDirectModuleOfMasterWhenIncludeSubModulesIsTrue()
throws IOException
{
- MavenProject master = createTestProject( "test", "testGroup", "1.0" );
+ final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
master.setFile( new File( "project/pom.xml" ) );
- master.getModel().addModule( "module" );
+ master.getModel()
+ .addModule( "module" );
- MavenProject module = createTestProject( "module", "testGroup", "1.0" );
+ final MavenProject module = createTestProject( "module", "testGroup", "1.0" );
- module.getModel().addModule( "submodule" );
+ module.getModel()
+ .addModule( "submodule" );
module.setFile( new File( "project/module/pom.xml" ) );
- MavenProject subModule = createTestProject( "sub-module", "testGroup", "1.0" );
+ final MavenProject subModule = createTestProject( "sub-module", "testGroup", "1.0" );
subModule.setFile( new File( "project/module/submodule/pom.xml" ) );
- List projects = new ArrayList( 3 );
+ final List<MavenProject> projects = new ArrayList<MavenProject>( 3 );
projects.add( master );
projects.add( module );
projects.add( subModule );
- Set result =
+ final Set<MavenProject> result =
ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
assertNotNull( result );
assertEquals( 2, result.size() );
- List verify = new ArrayList( projects );
+ final List<MavenProject> verify = new ArrayList<MavenProject>( projects );
verify.remove( master );
verifyProjectsPresent( verify, result );
@@ -129,81 +132,83 @@ public class ProjectUtilsTest
public void testGetProjectModules_ShouldExcludeInDirectModuleOfMasterWhenIncludeSubModulesIsFalse()
throws IOException
{
- MavenProject master = createTestProject( "test", "testGroup", "1.0" );
+ final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
master.setFile( new File( "project/pom.xml" ) );
- master.getModel().addModule( "module" );
+ master.getModel()
+ .addModule( "module" );
- MavenProject module = createTestProject( "module", "testGroup", "1.0" );
+ final MavenProject module = createTestProject( "module", "testGroup", "1.0" );
- module.getModel().addModule( "submodule" );
+ module.getModel()
+ .addModule( "submodule" );
module.setFile( new File( "project/module/pom.xml" ) );
- MavenProject subModule = createTestProject( "sub-module", "testGroup", "1.0" );
+ final MavenProject subModule = createTestProject( "sub-module", "testGroup", "1.0" );
subModule.setFile( new File( "project/module/submodule/pom.xml" ) );
- List projects = new ArrayList( 3 );
+ final List<MavenProject> projects = new ArrayList<MavenProject>( 3 );
projects.add( master );
projects.add( module );
projects.add( subModule );
- Set result =
+ final Set<MavenProject> result =
ProjectUtils.getProjectModules( master, projects, false, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
assertNotNull( result );
assertEquals( 1, result.size() );
- List verify = new ArrayList( projects );
+ final List<MavenProject> verify = new ArrayList<MavenProject>( projects );
verify.remove( master );
verify.remove( subModule );
verifyProjectsPresent( verify, result );
}
- public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject()
- throws IOException
+ public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject() throws IOException
{
- MavenProject master = createTestProject( "test", "testGroup", "1.0" );
+ final MavenProject master = createTestProject( "test", "testGroup", "1.0" );
master.setFile( new File( "project/pom.xml" ) );
- MavenProject other = createTestProject( "other", "testGroup", "1.0" );
+ final MavenProject other = createTestProject( "other", "testGroup", "1.0" );
other.setFile( new File( "other/pom.xml" ) );
- List projects = new ArrayList( 3 );
+ final List<MavenProject> projects = new ArrayList<MavenProject>( 3 );
projects.add( master );
projects.add( other );
- Set result =
+ final Set<MavenProject> result =
ProjectUtils.getProjectModules( master, projects, true, new ConsoleLogger( Logger.LEVEL_INFO, "test" ) );
assertNotNull( result );
assertTrue( result.isEmpty() );
}
- private void verifyProjectsPresent( List verify, Set result )
+ private void verifyProjectsPresent( final List<MavenProject> verify, final Set<MavenProject> result )
{
- List verifyCopy = new ArrayList( verify );
+ final List<MavenProject> verifyCopy = new ArrayList<MavenProject>( verify );
- List unexpected = new ArrayList();
+ final List<MavenProject> unexpected = new ArrayList<MavenProject>();
- for ( Iterator it = result.iterator(); it.hasNext(); )
+ for ( final Iterator<MavenProject> it = result.iterator(); it.hasNext(); )
{
- MavenProject project = ( MavenProject ) it.next();
+ final MavenProject project = it.next();
boolean removed = false;
- for ( Iterator verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); )
+ for ( final Iterator<MavenProject> verifyIterator = verifyCopy.iterator(); verifyIterator.hasNext(); )
{
- MavenProject verification = ( MavenProject ) verifyIterator.next();
+ final MavenProject verification = verifyIterator.next();
- if ( verification.getId().equals( project.getId() ) )
+ if ( verification.getId()
+ .equals( project.getId() ) )
{
verifyIterator.remove();
removed = true;
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/TypeConversionUtilsTest.java Tue Sep 21 20:34:50 2010
@@ -22,11 +22,10 @@ package org.apache.maven.plugin.assembly
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.codehaus.plexus.util.StringOutputStream;
+import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -36,20 +35,20 @@ public class TypeConversionUtilsTest
extends TestCase
{
- public void testModeToInt_InterpretAsOctalWithoutLeadingZero()
- throws AssemblyFormattingException
+ public void testModeToInt_InterpretAsOctalWithoutLeadingZero() throws AssemblyFormattingException
{
- int check = Integer.decode( "0777" ).intValue();
- int test = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final int check = Integer.decode( "0777" )
+ .intValue();
+ final int test = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
assertEquals( check, test );
}
- public void testModeToInt_InterpretValuesWithLeadingZeroAsOctal()
- throws AssemblyFormattingException
+ public void testModeToInt_InterpretValuesWithLeadingZeroAsOctal() throws AssemblyFormattingException
{
- int check = Integer.decode( "0777" ).intValue();
- int test = TypeConversionUtils.modeToInt( "0777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final int check = Integer.decode( "0777" )
+ .intValue();
+ final int test = TypeConversionUtils.modeToInt( "0777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
assertEquals( check, test );
}
@@ -62,7 +61,7 @@ public class TypeConversionUtilsTest
fail( "'493' is an invalid mode and should trigger an exception." );
}
- catch ( AssemblyFormattingException e )
+ catch ( final AssemblyFormattingException e )
{
// expected.
}
@@ -70,7 +69,7 @@ public class TypeConversionUtilsTest
public void testVerifyModeSanity_WarnOnNonsensicalOctalValue_002()
{
- List messages = new ArrayList( 2 );
+ final List<String> messages = new ArrayList<String>( 2 );
messages.add( "World has write access, but user does not." );
messages.add( "World has write access, but group does not." );
@@ -79,7 +78,7 @@ public class TypeConversionUtilsTest
public void testVerifyModeSanity_WarnOnNonsensicalOctalValue_020()
{
- List messages = new ArrayList( 1 );
+ final List<String> messages = new ArrayList<String>( 1 );
messages.add( "Group has write access, but user does not." );
checkFileModeSanity( "020", false, messages );
@@ -87,23 +86,26 @@ public class TypeConversionUtilsTest
public void testVerifyModeSanity_ReturnTrueForValidOctalValue_775()
{
- checkFileModeSanity( "775", true, Collections.EMPTY_LIST );
+ checkFileModeSanity( "775", true, null );
}
- private void checkFileModeSanity( String mode, boolean isSane, List messagesToCheckIfInsane )
+ private void checkFileModeSanity( final String mode, final boolean isSane,
+ final List<String> messagesToCheckIfInsane )
{
- StringOutputStream sos = new StringOutputStream();
- PrintStream ps = new PrintStream( sos );
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final PrintStream ps = new PrintStream( baos );
- PrintStream oldOut = System.out;
- PrintStream oldErr = System.err;
+ final PrintStream oldOut = System.out;
+ final PrintStream oldErr = System.err;
try
{
System.setOut( ps );
System.setErr( ps );
- assertEquals( "Mode sanity should be: " + isSane, isSane, TypeConversionUtils.verifyModeSanity( Integer.parseInt( mode, 8 ), new ConsoleLogger( Logger.LEVEL_WARN, "test" ) ) );
+ assertEquals( "Mode sanity should be: " + isSane, isSane,
+ TypeConversionUtils.verifyModeSanity( Integer.parseInt( mode, 8 ),
+ new ConsoleLogger( Logger.LEVEL_WARN, "test" ) ) );
}
finally
{
@@ -113,11 +115,11 @@ public class TypeConversionUtilsTest
if ( !isSane && messagesToCheckIfInsane != null && !messagesToCheckIfInsane.isEmpty() )
{
- String message = sos.toString();
+ final String message = new String( baos.toByteArray() );
- for ( Iterator it = messagesToCheckIfInsane.iterator(); it.hasNext(); )
+ for ( final Iterator<String> it = messagesToCheckIfInsane.iterator(); it.hasNext(); )
{
- String checkMessage = (String) it.next();
+ final String checkMessage = it.next();
assertTrue( "\'" + checkMessage + "\' is not present in output.", message.indexOf( checkMessage ) > -1 );
}