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 [7/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/archive/task/AddDependencySetsTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java Tue Sep 21 20:34:50 2010
@@ -25,7 +25,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock;
import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForArtifact;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.DependencySet;
import org.apache.maven.plugin.assembly.testutils.MockManager;
@@ -46,75 +45,72 @@ public class AddDependencySetsTaskTest
extends TestCase
{
- private MockManager mockManager = new MockManager();
+ private final MockManager mockManager = new MockManager();
public void testAddDependencySet_ShouldInterpolateDefaultOutputFileNameMapping()
- throws AssemblyFormattingException, ArchiveCreationException,
- InvalidAssemblerConfigurationException, IOException
+ throws AssemblyFormattingException, ArchiveCreationException, InvalidAssemblerConfigurationException,
+ IOException
{
- String outDir = "tmp/";
- String mainAid = "main";
- String mainGid = "org.maingrp";
- String mainVer = "9";
- String depAid = "dep";
- String depGid = "org.depgrp";
- String depVer = "1";
- String depExt = "war";
+ final String outDir = "tmp/";
+ final String mainAid = "main";
+ final String mainGid = "org.maingrp";
+ final String mainVer = "9";
+ final String depAid = "dep";
+ final String depGid = "org.depgrp";
+ final String depVer = "1";
+ final String depExt = "war";
- DependencySet ds = new DependencySet();
+ final DependencySet ds = new DependencySet();
ds.setOutputDirectory( outDir );
ds.setDirectoryMode( Integer.toString( 10, 8 ) );
ds.setFileMode( Integer.toString( 10, 8 ) );
- Model mainModel = new Model();
+ final Model mainModel = new Model();
mainModel.setArtifactId( mainAid );
mainModel.setGroupId( mainGid );
mainModel.setVersion( mainVer );
- MavenProject mainProject = new MavenProject( mainModel );
+ final MavenProject mainProject = new MavenProject( mainModel );
- ArtifactMock mainArtifactMock = new ArtifactMock( mockManager, mainGid, mainAid, mainVer,
- "jar", false );
+ final ArtifactMock mainArtifactMock = new ArtifactMock( mockManager, mainGid, mainAid, mainVer, "jar", false );
mainProject.setArtifact( mainArtifactMock.getArtifact() );
- Model depModel = new Model();
+ final Model depModel = new Model();
depModel.setArtifactId( depAid );
depModel.setGroupId( depGid );
depModel.setVersion( depVer );
depModel.setPackaging( depExt );
- MavenProject depProject = new MavenProject( depModel );
+ final MavenProject depProject = new MavenProject( depModel );
- ArtifactMock depArtifactMock = new ArtifactMock( mockManager, depGid, depAid, depVer,
- depExt, false );
+ final ArtifactMock depArtifactMock = new ArtifactMock( mockManager, depGid, depAid, depVer, depExt, false );
- File newFile = depArtifactMock.setNewFile();
+ final File newFile = depArtifactMock.setNewFile();
depProject.setArtifact( depArtifactMock.getArtifact() );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask(
- mockManager,
- mainProject );
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mockManager, mainProject );
macTask.expectBuildFromRepository( depProject );
macTask.expectCSGetFinalName( mainAid + "-" + mainVer );
macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( Collections.singleton( depArtifactMock.getArtifact() ) );
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectAddFile( newFile, outDir + depAid + "-" + depVer + "." + depExt, 10 );
macTask.expectGetSession( null );
-
+
mockManager.replayAll();
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( ds ),
- depProject, Collections.EMPTY_MAP, macTask.projectBuilder,
- macTask.dependencyResolver, logger );
+ final AddDependencySetsTask task =
+ new AddDependencySetsTask( Collections.singletonList( ds ),
+ Collections.singleton( depArtifactMock.getArtifact() ), depProject,
+ macTask.projectBuilder, logger );
task.addDependencySet( ds, macTask.archiver, macTask.configSource );
@@ -122,27 +118,21 @@ public class AddDependencySetsTaskTest
}
public void testAddDependencySet_ShouldNotAddDependenciesWhenProjectHasNone()
- throws AssemblyFormattingException, ArchiveCreationException,
- InvalidAssemblerConfigurationException
+ throws AssemblyFormattingException, ArchiveCreationException, InvalidAssemblerConfigurationException
{
- MavenProject project = new MavenProject( new Model() );
+ final MavenProject project = new MavenProject( new Model() );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask(
- mockManager );
-
- macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( Collections.EMPTY_SET );
+ final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager );
- DependencySet ds = new DependencySet();
+ final DependencySet ds = new DependencySet();
ds.setOutputDirectory( "/out" );
mockManager.replayAll();
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( ds ),
- project, Collections.EMPTY_MAP, macTask.projectBuilder,
- macTask.dependencyResolver, logger );
+ final AddDependencySetsTask task =
+ new AddDependencySetsTask( Collections.singletonList( ds ), null, project, macTask.projectBuilder, logger );
task.addDependencySet( ds, null, macTask.configSource );
@@ -151,50 +141,47 @@ public class AddDependencySetsTaskTest
// TODO: Find a better way of testing the project-stubbing behavior when a ProjectBuildingException takes place.
public void testAddDependencySet_ShouldNotAddDependenciesWhenProjectIsStubbed()
- throws AssemblyFormattingException, ArchiveCreationException,
- InvalidAssemblerConfigurationException, IOException
+ throws AssemblyFormattingException, ArchiveCreationException, InvalidAssemblerConfigurationException,
+ IOException
{
- MavenProject project = new MavenProject( new Model() );
+ final MavenProject project = new MavenProject( new Model() );
- ProjectBuildingException pbe = new ProjectBuildingException( "test", "Test error." );
+ final ProjectBuildingException pbe = new ProjectBuildingException( "test", "Test error." );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask(
- mockManager,
- new MavenProject(
- new Model() ) );
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mockManager, new MavenProject( new Model() ) );
- String gid = "org.test";
- String aid = "test-dep";
- String version = "2.0-SNAPSHOT";
- String type = "jar";
+ final String gid = "org.test";
+ final String aid = "test-dep";
+ final String version = "2.0-SNAPSHOT";
+ final String type = "jar";
- File file = new File( "dep-artifact.jar" );
+ final File file = new File( "dep-artifact.jar" );
- ArtifactMock depMock = new ArtifactMock( mockManager, gid, aid, version, type, true );
+ final ArtifactMock depMock = new ArtifactMock( mockManager, gid, aid, version, type, true );
depMock.setBaseVersion( version );
depMock.setFile( file );
- File destFile = new File( "assembly-dep-set.zip" );
+ final File destFile = new File( "assembly-dep-set.zip" );
macTask.expectGetDestFile( destFile );
macTask.expectBuildFromRepository( pbe );
macTask.expectCSGetRepositories( null, null );
macTask.expectCSGetFinalName( "final-name" );
- macTask.expectResolveDependencies( Collections.singleton( depMock.getArtifact() ) );
macTask.expectAddFile( file, "out/" + aid + "-" + version + "." + type );
-
+
macTask.expectGetSession( null );
- DependencySet ds = new DependencySet();
+ final DependencySet ds = new DependencySet();
ds.setOutputDirectory( "/out" );
mockManager.replayAll();
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( ds ),
- project, Collections.EMPTY_MAP, macTask.projectBuilder,
- macTask.dependencyResolver, logger );
+ final AddDependencySetsTask task =
+ new AddDependencySetsTask( Collections.singletonList( ds ), Collections.singleton( depMock.getArtifact() ),
+ project, macTask.projectBuilder, logger );
task.addDependencySet( ds, macTask.archiver, macTask.configSource );
@@ -215,14 +202,13 @@ public class AddDependencySetsTaskTest
verifyOneDependencyAdded( "out", true );
}
- private void verifyOneDependencyAdded( String outputLocation,
- boolean unpack )
+ private void verifyOneDependencyAdded( final String outputLocation, final boolean unpack )
throws AssemblyFormattingException, ArchiveCreationException, IOException,
InvalidAssemblerConfigurationException
{
- MavenProject project = new MavenProject( new Model() );
+ final MavenProject project = new MavenProject( new Model() );
- DependencySet ds = new DependencySet();
+ final DependencySet ds = new DependencySet();
ds.setOutputDirectory( outputLocation );
ds.setOutputFileNameMapping( "artifact" );
ds.setUnpack( unpack );
@@ -231,22 +217,16 @@ public class AddDependencySetsTaskTest
ds.setDirectoryMode( Integer.toString( 10, 8 ) );
ds.setFileMode( Integer.toString( 10, 8 ) );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask(
- mockManager, new MavenProject( new Model() ) );
-
- ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version",
- "jar", false );
- File artifactFile = artifactMock.setNewFile();
+ final MockAndControlForAddDependencySetsTask macTask =
+ new MockAndControlForAddDependencySetsTask( mockManager, new MavenProject( new Model() ) );
- macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( Collections.singleton( artifactMock.getArtifact() ) );
+ final ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
+ final File artifactFile = artifactMock.setNewFile();
if ( unpack )
{
- macTask.expectAddArchivedFileSet( artifactFile,
- outputLocation + "/",
- AddArtifactTask.DEFAULT_INCLUDES_ARRAY,
- null );
+ macTask.expectAddArchivedFileSet( artifactFile, outputLocation + "/",
+ AddArtifactTask.DEFAULT_INCLUDES_ARRAY, null );
macTask.expectModeChange( -1, -1, 10, 10, 2 );
}
else
@@ -256,18 +236,20 @@ public class AddDependencySetsTaskTest
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectCSGetFinalName( "final-name" );
-
+ macTask.expectCSGetRepositories( null, null );
+
macTask.expectGetSession( null );
- MavenProject depProject = new MavenProject( new Model() );
+ final MavenProject depProject = new MavenProject( new Model() );
macTask.expectBuildFromRepository( depProject );
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- AddDependencySetsTask task = new AddDependencySetsTask( Collections.singletonList( ds ),
- project, Collections.EMPTY_MAP, macTask.projectBuilder,
- macTask.dependencyResolver, logger );
+ final AddDependencySetsTask task =
+ new AddDependencySetsTask( Collections.singletonList( ds ),
+ Collections.singleton( artifactMock.getArtifact() ), project,
+ macTask.projectBuilder, logger );
mockManager.replayAll();
@@ -279,35 +261,31 @@ public class AddDependencySetsTaskTest
public void testGetDependencyArtifacts_ShouldGetOneDependencyArtifact()
throws ArchiveCreationException, InvalidAssemblerConfigurationException
{
- MavenProject project = new MavenProject( new Model() );
-
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask(
- mockManager );
+ final MavenProject project = new MavenProject( new Model() );
- ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version",
- "jar", false );
+ final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mockManager );
- macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( Collections.singleton( artifactMock.getArtifact() ) );
+ final ArtifactMock artifactMock = new ArtifactMock( mockManager, "group", "artifact", "version", "jar", false );
project.setArtifacts( Collections.singleton( artifactMock.getArtifact() ) );
- DependencySet dependencySet = new DependencySet();
+ final DependencySet dependencySet = new DependencySet();
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
mockManager.replayAll();
- AddDependencySetsTask task = new AddDependencySetsTask(
- Collections.singletonList( dependencySet ),
- project, Collections.EMPTY_MAP, macTask.projectBuilder,
- macTask.dependencyResolver, logger );
+ final AddDependencySetsTask task =
+ new AddDependencySetsTask( Collections.singletonList( dependencySet ),
+ Collections.singleton( artifactMock.getArtifact() ), project,
+ macTask.projectBuilder, logger );
- Set result = task.resolveDependencyArtifacts( dependencySet, macTask.configSource );
+ final Set<Artifact> result = task.resolveDependencyArtifacts( dependencySet );
assertNotNull( result );
assertEquals( 1, result.size() );
- assertSame( artifactMock.getArtifact(), result.iterator().next() );
+ assertSame( artifactMock.getArtifact(), result.iterator()
+ .next() );
mockManager.verifyAll();
}
@@ -315,54 +293,36 @@ public class AddDependencySetsTaskTest
public void testGetDependencyArtifacts_ShouldFilterOneDependencyArtifactViaInclude()
throws ArchiveCreationException, InvalidAssemblerConfigurationException
{
- MavenProject project = new MavenProject( new Model() );
-
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask(
- mockManager );
-
- Set artifacts = new HashSet();
+ final MavenProject project = new MavenProject( new Model() );
- MockAndControlForArtifact mac = new MockAndControlForArtifact( mockManager );
+ final Set<Artifact> artifacts = new HashSet<Artifact>();
- mac.expectGetGroupId( "group" );
- mac.expectGetArtifactId( "artifact" );
- mac.expectGetDependencyConflictId( "group:artifact:jar" );
- mac.expectGetId( "group:artifact:1.0" );
+ final ArtifactMock am = new ArtifactMock( mockManager, "group", "artifact", "1.0", "jar", false );
+ am.setDependencyTrail( Collections.singletonList( project.getId() ) );
+ artifacts.add( am.getArtifact() );
- artifacts.add( mac.artifact );
+ final ArtifactMock am2 = new ArtifactMock( mockManager, "group2", "artifact2", "1.0", "jar", false );
+ am2.setDependencyTrail( Collections.singletonList( project.getId() ) );
+ artifacts.add( am2.getArtifact() );
- MockAndControlForArtifact mac2 = new MockAndControlForArtifact( mockManager );
-
- mac2.expectGetGroupId( "group2" );
- mac2.expectGetArtifactId( "artifact2" );
- mac2.expectGetDependencyConflictId( "group2:artifact2:jar" );
- mac2.expectGetDependencyTrail( Collections.EMPTY_LIST );
- mac2.expectGetId( "group2:artifact2:1.0" );
-
- artifacts.add( mac2.artifact );
-
- macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( artifacts );
-
- DependencySet dependencySet = new DependencySet();
+ final DependencySet dependencySet = new DependencySet();
dependencySet.addInclude( "group:artifact" );
dependencySet.setUseTransitiveFiltering( true );
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
mockManager.replayAll();
- AddDependencySetsTask task = new AddDependencySetsTask(
- Collections.singletonList( dependencySet ),
- project, Collections.EMPTY_MAP, null,
- macTask.dependencyResolver, logger );
+ final AddDependencySetsTask task =
+ new AddDependencySetsTask( Collections.singletonList( dependencySet ), artifacts, project, null, logger );
- Set result = task.resolveDependencyArtifacts( dependencySet, macTask.configSource );
+ final Set<Artifact> result = task.resolveDependencyArtifacts( dependencySet );
assertNotNull( result );
assertEquals( 1, result.size() );
- assertSame( mac.artifact, result.iterator().next() );
+ assertSame( am.getArtifact(), result.iterator()
+ .next() );
mockManager.verifyAll();
}
@@ -370,53 +330,34 @@ public class AddDependencySetsTaskTest
public void testGetDependencyArtifacts_ShouldIgnoreTransitivePathFilteringWhenIncludeNotTransitive()
throws ArchiveCreationException, InvalidAssemblerConfigurationException
{
- MavenProject project = new MavenProject( new Model() );
-
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask(
- mockManager );
+ final MavenProject project = new MavenProject( new Model() );
- Set artifacts = new HashSet();
+ final Set<Artifact> artifacts = new HashSet<Artifact>();
- MockAndControlForArtifact mac = new MockAndControlForArtifact( mockManager );
+ final ArtifactMock am = new ArtifactMock( mockManager, "group", "artifact", "1.0", "jar", false );
+ artifacts.add( am.getArtifact() );
- mac.expectGetGroupId( "group" );
- mac.expectGetArtifactId( "artifact" );
- mac.expectGetDependencyConflictId( "group:artifact:jar" );
- mac.expectGetId( "group:artifact:1.0" );
-
- artifacts.add( mac.artifact );
-
- MockAndControlForArtifact mac2 = new MockAndControlForArtifact( mockManager );
-
- mac2.expectGetGroupId( "group2" );
- mac2.expectGetArtifactId( "artifact2" );
- mac2.expectGetDependencyConflictId( "group2:artifact2:jar" );
- mac2.expectGetId( "group2:artifact2:1.0" );
-
- artifacts.add( mac2.artifact );
-
- macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( artifacts );
+ final ArtifactMock am2 = new ArtifactMock( mockManager, "group2", "artifact2", "1.0", "jar", false );
+ artifacts.add( am2.getArtifact() );
- DependencySet dependencySet = new DependencySet();
+ final DependencySet dependencySet = new DependencySet();
dependencySet.addInclude( "group:artifact" );
dependencySet.setUseTransitiveFiltering( false );
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
mockManager.replayAll();
- AddDependencySetsTask task = new AddDependencySetsTask(
- Collections.singletonList( dependencySet ),
- project, Collections.EMPTY_MAP, null,
- macTask.dependencyResolver, logger );
+ final AddDependencySetsTask task =
+ new AddDependencySetsTask( Collections.singletonList( dependencySet ), artifacts, project, null, logger );
- Set result = task.resolveDependencyArtifacts( dependencySet, macTask.configSource );
+ final Set<Artifact> result = task.resolveDependencyArtifacts( dependencySet );
assertNotNull( result );
assertEquals( 1, result.size() );
- assertSame( mac.artifact, result.iterator().next() );
+ assertSame( am.getArtifact(), result.iterator()
+ .next() );
mockManager.verifyAll();
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTaskTest.java Tue Sep 21 20:34:50 2010
@@ -32,7 +32,7 @@ import org.codehaus.plexus.logging.conso
import java.io.File;
import java.io.IOException;
-import java.util.Collections;
+import java.util.ArrayList;
import junit.framework.TestCase;
@@ -46,6 +46,7 @@ public class AddFileSetsTaskTest
private MockAndControlForAddFileSetsTask macTask;
+ @Override
public void setUp()
{
mockManager = new MockManager();
@@ -55,8 +56,8 @@ public class AddFileSetsTaskTest
macTask = new MockAndControlForAddFileSetsTask( mockManager, fileManager );
}
- public void tearDown()
- throws IOException
+ @Override
+ public void tearDown() throws IOException
{
fileManager.cleanUp();
}
@@ -64,13 +65,13 @@ public class AddFileSetsTaskTest
public void testGetFileSetDirectory_ShouldReturnAbsoluteSourceDir()
throws ArchiveCreationException, AssemblyFormattingException
{
- File dir = fileManager.createTempDir();
+ final File dir = fileManager.createTempDir();
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
fs.setDirectory( dir.getAbsolutePath() );
- File result = new AddFileSetsTask( Collections.EMPTY_LIST ).getFileSetDirectory( fs, null, null );
+ final File result = new AddFileSetsTask( new ArrayList<FileSet>() ).getFileSetDirectory( fs, null, null );
assertEquals( dir.getAbsolutePath(), result.getAbsolutePath() );
}
@@ -78,11 +79,11 @@ public class AddFileSetsTaskTest
public void testGetFileSetDirectory_ShouldReturnBasedir()
throws ArchiveCreationException, AssemblyFormattingException
{
- File dir = fileManager.createTempDir();
+ final File dir = fileManager.createTempDir();
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
- File result = new AddFileSetsTask( Collections.EMPTY_LIST ).getFileSetDirectory( fs, dir, null );
+ final File result = new AddFileSetsTask( new ArrayList<FileSet>() ).getFileSetDirectory( fs, dir, null );
assertEquals( dir.getAbsolutePath(), result.getAbsolutePath() );
}
@@ -90,17 +91,17 @@ public class AddFileSetsTaskTest
public void testGetFileSetDirectory_ShouldReturnDirFromBasedirAndSourceDir()
throws ArchiveCreationException, AssemblyFormattingException
{
- File dir = fileManager.createTempDir();
+ final File dir = fileManager.createTempDir();
- String srcPath = "source";
+ final String srcPath = "source";
- File srcDir = new File( dir, srcPath );
+ final File srcDir = new File( dir, srcPath );
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
fs.setDirectory( srcPath );
- File result = new AddFileSetsTask( Collections.EMPTY_LIST ).getFileSetDirectory( fs, dir, null );
+ final File result = new AddFileSetsTask( new ArrayList<FileSet>() ).getFileSetDirectory( fs, dir, null );
assertEquals( srcDir.getAbsolutePath(), result.getAbsolutePath() );
}
@@ -108,46 +109,45 @@ public class AddFileSetsTaskTest
public void testGetFileSetDirectory_ShouldReturnDirFromArchiveBasedirAndSourceDir()
throws ArchiveCreationException, AssemblyFormattingException
{
- File dir = fileManager.createTempDir();
+ final File dir = fileManager.createTempDir();
- String srcPath = "source";
+ final String srcPath = "source";
- File srcDir = new File( dir, srcPath );
+ final File srcDir = new File( dir, srcPath );
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
fs.setDirectory( srcPath );
- File result = new AddFileSetsTask( Collections.EMPTY_LIST ).getFileSetDirectory( fs, null, dir );
+ final File result = new AddFileSetsTask( new ArrayList<FileSet>() ).getFileSetDirectory( fs, null, dir );
assertEquals( srcDir.getAbsolutePath(), result.getAbsolutePath() );
}
- public void testAddFileSet_ShouldAddDirectory()
- throws ArchiveCreationException, AssemblyFormattingException
+ public void testAddFileSet_ShouldAddDirectory() throws ArchiveCreationException, AssemblyFormattingException
{
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
- String dirname = "dir";
+ final String dirname = "dir";
fs.setDirectory( dirname );
fs.setOutputDirectory( "dir2" );
// ensure this exists, so the directory addition will proceed.
- File srcDir = new File( macTask.archiveBaseDir, dirname );
+ final File srcDir = new File( macTask.archiveBaseDir, dirname );
srcDir.mkdirs();
- int[] modes = { -1, -1, -1, -1 };
+ final int[] modes = { -1, -1, -1, -1 };
macTask.expectAdditionOfSingleFileSet( null, null, null, true, modes, 1, true, false );
macTask.expectGetProject( null );
- MavenProject project = new MavenProject( new Model() );
+ final MavenProject project = new MavenProject( new Model() );
mockManager.replayAll();
- AddFileSetsTask task = new AddFileSetsTask( Collections.EMPTY_LIST );
+ final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
task.setProject( project );
@@ -160,29 +160,29 @@ public class AddFileSetsTaskTest
public void testAddFileSet_ShouldAddDirectoryUsingSourceDirNameForDestDir()
throws ArchiveCreationException, AssemblyFormattingException
{
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
- String dirname = "dir";
+ final String dirname = "dir";
fs.setDirectory( dirname );
- File archiveBaseDir = fileManager.createTempDir();
+ final File archiveBaseDir = fileManager.createTempDir();
// ensure this exists, so the directory addition will proceed.
- File srcDir = new File( archiveBaseDir, dirname );
+ final File srcDir = new File( archiveBaseDir, dirname );
srcDir.mkdirs();
- int[] modes = { -1, -1, -1, -1 };
+ final int[] modes = { -1, -1, -1, -1 };
macTask.expectAdditionOfSingleFileSet( null, null, null, true, modes, 1, true, false );
macTask.expectGetProject( null );
- MavenProject project = new MavenProject( new Model() );
+ final MavenProject project = new MavenProject( new Model() );
mockManager.replayAll();
- AddFileSetsTask task = new AddFileSetsTask( Collections.EMPTY_LIST );
+ final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
task.setProject( project );
@@ -195,13 +195,13 @@ public class AddFileSetsTaskTest
public void testAddFileSet_ShouldNotAddDirectoryWhenSourceDirNonExistent()
throws ArchiveCreationException, AssemblyFormattingException
{
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
- String dirname = "dir";
+ final String dirname = "dir";
fs.setDirectory( dirname );
- File archiveBaseDir = fileManager.createTempDir();
+ final File archiveBaseDir = fileManager.createTempDir();
macTask.expectGetFinalName( "finalName" );
@@ -212,11 +212,11 @@ public class AddFileSetsTaskTest
macTask.archiver.getOverrideFileMode();
macTask.archiverCtl.setReturnValue( -1 );
- MavenProject project = new MavenProject( new Model() );
+ final MavenProject project = new MavenProject( new Model() );
mockManager.replayAll();
- AddFileSetsTask task = new AddFileSetsTask( Collections.EMPTY_LIST );
+ final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
task.setProject( project );
@@ -235,7 +235,7 @@ public class AddFileSetsTaskTest
mockManager.replayAll();
- AddFileSetsTask task = new AddFileSetsTask( Collections.EMPTY_LIST );
+ final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
try
{
@@ -243,7 +243,7 @@ public class AddFileSetsTaskTest
fail( "Should throw exception due to non-existent archiveBasedir location that was provided." );
}
- catch ( ArchiveCreationException e )
+ catch ( final ArchiveCreationException e )
{
// should do this, because it cannot use the provide archiveBasedir.
}
@@ -254,14 +254,14 @@ public class AddFileSetsTaskTest
public void testExecute_ShouldThrowExceptionIfArchiveBasedirProvidedIsNotADirectory()
throws AssemblyFormattingException, IOException
{
- File archiveBaseDir = fileManager.createTempFile();
+ final File archiveBaseDir = fileManager.createTempFile();
macTask.archiveBaseDir = archiveBaseDir;
macTask.expectGetArchiveBaseDirectory();
mockManager.replayAll();
- AddFileSetsTask task = new AddFileSetsTask( Collections.EMPTY_LIST );
+ final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
try
{
@@ -269,7 +269,7 @@ public class AddFileSetsTaskTest
fail( "Should throw exception due to non-directory archiveBasedir location that was provided." );
}
- catch ( ArchiveCreationException e )
+ catch ( final ArchiveCreationException e )
{
// should do this, because it cannot use the provide archiveBasedir.
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java Tue Sep 21 20:34:50 2010
@@ -32,39 +32,63 @@ public class ArtifactMock
{
private final MockControl artifactCtl;
+
private final Artifact artifact;
private final MockControl handlerCtl;
+
private final ArtifactHandler handler;
+
private String groupId;
+
private String artifactId;
+
private String baseVersion;
+
private File file;
- private String scope;
+
private Boolean isSnapshot;
+
private String version;
- private List dependencyTrail;
+
+ private List<String> dependencyTrail;
+
private String id;
+
private String dependencyConflictId;
+
private String typeAndExt;
- private String classifier;
- public ArtifactMock( MockManager mockManager, String groupId, String artifactId, String version, String type, boolean isSnapshot )
+ private final String classifier;
+
+ public ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId,
+ final String version, final String type, final boolean isSnapshot )
{
- this( mockManager, groupId, artifactId, version, type, null, isSnapshot, null );
+ this( mockManager, groupId, artifactId, version, type, null, isSnapshot, null, null );
}
- public ArtifactMock( MockManager mockManager, String groupId, String artifactId, String version, String type, boolean isSnapshot, String baseVersion )
+ public ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId,
+ final String version, final String type, final boolean isSnapshot, final String baseVersion )
{
- this( mockManager, groupId, artifactId, version, type, null, isSnapshot, baseVersion );
+ this( mockManager, groupId, artifactId, version, type, null, isSnapshot, baseVersion, null );
}
- public ArtifactMock( MockManager mockManager, String groupId, String artifactId, String version, String type, String classifier, boolean isSnapshot )
+ public ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId,
+ final String version, final String type, final String classifier, final boolean isSnapshot )
{
- this( mockManager, groupId, artifactId, version, type, classifier, isSnapshot, null );
+ this( mockManager, groupId, artifactId, version, type, classifier, isSnapshot, null, null );
}
- public ArtifactMock( MockManager mockManager, String groupId, String artifactId, String version, String type, String classifier, boolean isSnapshot, String baseVersion )
+ public ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId,
+ final String version, final String type, final String classifier, final boolean isSnapshot,
+ final String baseVersion )
+ {
+ this( mockManager, groupId, artifactId, version, type, classifier, isSnapshot, baseVersion, null );
+ }
+
+ public ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId,
+ final String version, final String type, final String classifier, final boolean isSnapshot,
+ final String baseVersion, String scope )
{
artifactCtl = MockControl.createControl( Artifact.class );
@@ -72,6 +96,14 @@ public class ArtifactMock
artifact = (Artifact) artifactCtl.getMock();
+ if ( scope == null )
+ {
+ scope = Artifact.SCOPE_COMPILE;
+ }
+
+ artifact.getScope();
+ artifactCtl.setReturnValue( scope, MockControl.ZERO_OR_MORE );
+
handlerCtl = MockControl.createControl( ArtifactHandler.class );
mockManager.add( handlerCtl );
@@ -96,7 +128,7 @@ public class ArtifactMock
setDependencyConflictId();
}
- public void setExtension( String extension )
+ public void setExtension( final String extension )
{
setTypeAndExt( extension );
}
@@ -111,7 +143,7 @@ public class ArtifactMock
return artifact;
}
- public void setArtifactId( String artifactId )
+ public void setArtifactId( final String artifactId )
{
if ( ( artifactId != null ) && ( this.artifactId == null ) )
{
@@ -122,7 +154,7 @@ public class ArtifactMock
}
}
- public void setBaseVersion( String baseVersion )
+ public void setBaseVersion( final String baseVersion )
{
if ( ( baseVersion != null ) && ( this.baseVersion == null ) )
{
@@ -133,7 +165,7 @@ public class ArtifactMock
}
}
- public void setFile( File destination )
+ public void setFile( final File destination )
{
if ( ( destination != null ) && ( file == null ) )
{
@@ -144,7 +176,7 @@ public class ArtifactMock
}
}
- public void setGroupId( String groupId )
+ public void setGroupId( final String groupId )
{
if ( ( groupId != null ) && ( this.groupId == null ) )
{
@@ -155,18 +187,7 @@ public class ArtifactMock
}
}
- public void setScope( String scope )
- {
- if ( ( scope != null ) && ( this.scope == null ) )
- {
- artifact.getScope();
- artifactCtl.setReturnValue( scope, MockControl.ZERO_OR_MORE );
-
- this.scope = scope;
- }
- }
-
- public void setVersion( String version )
+ public void setVersion( final String version )
{
if ( ( version != null ) && ( this.version == null ) )
{
@@ -183,7 +204,7 @@ public class ArtifactMock
}
}
- public void setDependencyTrail( List dependencyTrail )
+ public void setDependencyTrail( final List<String> dependencyTrail )
{
if ( ( dependencyTrail != null ) && ( this.dependencyTrail == null ) )
{
@@ -194,7 +215,7 @@ public class ArtifactMock
}
}
- public void setId( String id )
+ public void setId( final String id )
{
if ( ( id != null ) && ( this.id == null ) )
{
@@ -205,7 +226,7 @@ public class ArtifactMock
}
}
- public void setDependencyConflictId( String id )
+ public void setDependencyConflictId( final String id )
{
if ( ( id != null ) && ( dependencyConflictId == null ) )
{
@@ -216,7 +237,7 @@ public class ArtifactMock
}
}
- public void setSnapshot( boolean snapshot )
+ public void setSnapshot( final boolean snapshot )
{
if ( isSnapshot == null )
{
@@ -232,11 +253,11 @@ public class ArtifactMock
{
if ( file == null )
{
- File newFile = File.createTempFile( "ArtifactMock.test.", "" );
+ final File newFile = File.createTempFile( "ArtifactMock.test.", "" );
newFile.deleteOnExit();
artifact.getFile();
- artifactCtl.setReturnValue( newFile, MockControl.ZERO_OR_MORE );
+ artifactCtl.setReturnValue( newFile, MockControl.ZERO_OR_MORE );
file = newFile;
}
@@ -244,12 +265,12 @@ public class ArtifactMock
return file;
}
- public void setType( String type )
+ public void setType( final String type )
{
setTypeAndExt( type );
}
- private void setTypeAndExt( String type )
+ private void setTypeAndExt( final String type )
{
if ( ( type != null ) && ( typeAndExt == null ) )
{
@@ -267,7 +288,8 @@ public class ArtifactMock
{
if ( ( groupId != null ) && ( artifactId != null ) && ( typeAndExt != null ) )
{
- String id = groupId + ":" + artifactId + ":" + typeAndExt + ( classifier == null ? "" : ":" + classifier );
+ final String id =
+ groupId + ":" + artifactId + ":" + typeAndExt + ( classifier == null ? "" : ":" + classifier );
setDependencyConflictId( id );
}
}
@@ -276,7 +298,9 @@ public class ArtifactMock
{
if ( ( groupId != null ) && ( artifactId != null ) && ( typeAndExt != null ) && ( version != null ) )
{
- String id = groupId + ":" + artifactId + ":" + version + ":" + typeAndExt + ( classifier == null ? "" : ":" + classifier );
+ final String id =
+ groupId + ":" + artifactId + ":" + version + ":" + typeAndExt
+ + ( classifier == null ? "" : ":" + classifier );
setId( id );
}
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java Tue Sep 21 20:34:50 2010
@@ -45,12 +45,12 @@ public class MockAndControlForAddArtifac
private MavenProject project = null;
- public MockAndControlForAddArtifactTask( MockManager mockManager )
+ public MockAndControlForAddArtifactTask( final MockManager mockManager )
{
this( mockManager, null );
}
- public MockAndControlForAddArtifactTask( MockManager mockManager, MavenProject project )
+ public MockAndControlForAddArtifactTask( final MockManager mockManager, final MavenProject project )
{
this.project = project;
@@ -71,24 +71,25 @@ public class MockAndControlForAddArtifac
{
configSource.getProject();
configSourceCtl.setReturnValue( project, MockControl.ZERO_OR_MORE );
-
+
configSource.getMavenSession();
configSourceCtl.setReturnValue( null, MockControl.ZERO_OR_MORE );
}
- public void expectGetFinalName( String finalName )
+ public void expectGetFinalName( final String finalName )
{
configSource.getFinalName();
configSourceCtl.setReturnValue( finalName, MockControl.ONE_OR_MORE );
}
- public void expectGetDestFile( File destFile )
+ public void expectGetDestFile( final File destFile )
{
archiver.getDestFile();
archiverCtl.setReturnValue( destFile, MockControl.ZERO_OR_MORE );
}
- public void expectAddArchivedFileSet( File artifactFile, String outputLocation, String[] includes, String[] excludes )
+ public void expectAddArchivedFileSet( final File artifactFile, final String outputLocation,
+ final String[] includes, final String[] excludes )
{
try
{
@@ -101,14 +102,14 @@ public class MockAndControlForAddArtifac
archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE );
}
- catch ( ArchiverException e )
+ catch ( final ArchiverException e )
{
Assert.fail( "Should never happen." );
}
}
- public void expectModeChange( int originalDirMode, int originalFileMode, int dirMode, int fileMode,
- int numberOfChanges )
+ public void expectModeChange( final int originalDirMode, final int originalFileMode, final int dirMode,
+ final int fileMode, final int numberOfChanges )
{
archiver.getOverrideDirectoryMode();
archiverCtl.setReturnValue( originalDirMode );
@@ -119,13 +120,13 @@ public class MockAndControlForAddArtifac
// one of the changes will occur below, when we restore the original mode.
if ( numberOfChanges > 1 )
{
- for( int i = 1; i< numberOfChanges; i++ )
+ for ( int i = 1; i < numberOfChanges; i++ )
{
if ( dirMode > -1 )
{
archiver.setDirectoryMode( dirMode );
}
-
+
if ( fileMode > -1 )
{
archiver.setFileMode( fileMode );
@@ -137,46 +138,46 @@ public class MockAndControlForAddArtifac
{
archiver.setDirectoryMode( originalDirMode );
}
-
+
if ( fileMode > -1 )
{
archiver.setFileMode( originalFileMode );
}
}
- public void expectAddFile( File file, String outputLocation, int fileMode )
+ public void expectAddFile( final File file, final String outputLocation, final int fileMode )
{
try
{
archiver.addFile( file, outputLocation, fileMode );
archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE );
}
- catch ( ArchiverException e )
+ catch ( final ArchiverException e )
{
Assert.fail( "Should never happen." );
}
}
- public void expectAddFile( File file, String outputLocation )
+ public void expectAddFile( final File file, final String outputLocation )
{
try
{
archiver.addFile( file, outputLocation );
archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE );
}
- catch ( ArchiverException e )
+ catch ( final ArchiverException e )
{
Assert.fail( "Should never happen." );
}
}
- public void expectGetReactorProjects( List projects )
+ public void expectGetReactorProjects( final List<MavenProject> projects )
{
configSource.getReactorProjects();
configSourceCtl.setReturnValue( projects, MockControl.ONE_OR_MORE );
}
-
- public void expectGetSession( MavenSession session )
+
+ public void expectGetSession( final MavenSession session )
{
configSource.getMavenSession();
configSourceCtl.setReturnValue( session, MockControl.ONE_OR_MORE );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java Tue Sep 21 20:34:50 2010
@@ -20,23 +20,18 @@ package org.apache.maven.plugin.assembly
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
import org.apache.maven.plugin.assembly.testutils.MockManager;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.easymock.MockControl;
import java.io.File;
import java.util.List;
-import java.util.Set;
import junit.framework.Assert;
@@ -51,22 +46,20 @@ public class MockAndControlForAddDepende
public MockControl configSourceCtl;
- public DependencyResolver dependencyResolver;
-
public MockControl dependencyResolverCtl;
public MavenProjectBuilder projectBuilder;
public MockControl projectBuilderCtl;
- private MavenProject project;
+ private final MavenProject project;
- public MockAndControlForAddDependencySetsTask( MockManager mockManager )
+ public MockAndControlForAddDependencySetsTask( final MockManager mockManager )
{
this( mockManager, null );
}
- public MockAndControlForAddDependencySetsTask( MockManager mockManager, MavenProject project )
+ public MockAndControlForAddDependencySetsTask( final MockManager mockManager, final MavenProject project )
{
this.project = project;
@@ -80,15 +73,10 @@ public class MockAndControlForAddDepende
configSource = (AssemblerConfigurationSource) configSourceCtl.getMock();
- dependencyResolverCtl = MockControl.createControl( DependencyResolver.class );
- mockManager.add( dependencyResolverCtl );
-
- dependencyResolver = ( DependencyResolver ) dependencyResolverCtl.getMock();
-
projectBuilderCtl = MockControl.createControl( MavenProjectBuilder.class );
mockManager.add( projectBuilderCtl );
- projectBuilder = ( MavenProjectBuilder ) projectBuilderCtl.getMock();
+ projectBuilder = (MavenProjectBuilder) projectBuilderCtl.getMock();
enableDefaultExpectations();
}
@@ -99,7 +87,8 @@ public class MockAndControlForAddDepende
configSourceCtl.setReturnValue( project, MockControl.ZERO_OR_MORE );
}
- public void expectAddArchivedFileSet( File file, String outputLocation, String[] includes, String[] excludes )
+ public void expectAddArchivedFileSet( final File file, final String outputLocation, final String[] includes,
+ final String[] excludes )
{
try
{
@@ -112,14 +101,14 @@ public class MockAndControlForAddDepende
archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE );
}
- catch ( ArchiverException e )
+ catch ( final ArchiverException e )
{
Assert.fail( "Should never happen." );
}
}
- public void expectModeChange( int originalDirMode, int originalFileMode, int dirMode, int fileMode,
- int numberOfChanges )
+ public void expectModeChange( final int originalDirMode, final int originalFileMode, final int dirMode,
+ final int fileMode, final int numberOfChanges )
{
archiver.getOverrideDirectoryMode();
archiverCtl.setReturnValue( originalDirMode );
@@ -130,7 +119,7 @@ public class MockAndControlForAddDepende
// one of the changes will occur below, when we restore the original mode.
if ( numberOfChanges > 1 )
{
- for( int i = 1; i< numberOfChanges; i++ )
+ for ( int i = 1; i < numberOfChanges; i++ )
{
archiver.setDirectoryMode( dirMode );
archiver.setFileMode( fileMode );
@@ -141,49 +130,49 @@ public class MockAndControlForAddDepende
archiver.setFileMode( originalFileMode );
}
- public void expectAddFile( File file, String outputLocation )
+ public void expectAddFile( final File file, final String outputLocation )
{
try
{
archiver.addFile( file, outputLocation );
}
- catch ( ArchiverException e )
+ catch ( final ArchiverException e )
{
Assert.fail( "Should never happen." );
}
}
- public void expectAddFile( File file, String outputLocation, int fileMode )
+ public void expectAddFile( final File file, final String outputLocation, final int fileMode )
{
try
{
archiver.addFile( file, outputLocation, fileMode );
}
- catch ( ArchiverException e )
+ catch ( final ArchiverException e )
{
Assert.fail( "Should never happen." );
}
}
- public void expectGetReactorProjects( List projects )
+ public void expectGetReactorProjects( final List<MavenProject> projects )
{
configSource.getReactorProjects();
configSourceCtl.setReturnValue( projects, MockControl.ONE_OR_MORE );
}
- public void expectCSGetFinalName( String finalName )
+ public void expectCSGetFinalName( final String finalName )
{
configSource.getFinalName();
configSourceCtl.setReturnValue( finalName, MockControl.ONE_OR_MORE );
}
- public void expectGetDestFile( File destFile )
+ public void expectGetDestFile( final File destFile )
{
archiver.getDestFile();
archiverCtl.setReturnValue( destFile, MockControl.ZERO_OR_MORE );
}
- public void expectCSGetRepositories( ArtifactRepository localRepo, List remoteRepos )
+ public void expectCSGetRepositories( final ArtifactRepository localRepo, final List<ArtifactRepository> remoteRepos )
{
configSource.getLocalRepository();
configSourceCtl.setReturnValue( localRepo, MockControl.ONE_OR_MORE );
@@ -192,7 +181,7 @@ public class MockAndControlForAddDepende
configSourceCtl.setReturnValue( remoteRepos, MockControl.ONE_OR_MORE );
}
- public void expectBuildFromRepository( ProjectBuildingException error )
+ public void expectBuildFromRepository( final ProjectBuildingException error )
{
try
{
@@ -200,13 +189,13 @@ public class MockAndControlForAddDepende
projectBuilderCtl.setMatcher( MockControl.ALWAYS_MATCHER );
projectBuilderCtl.setThrowable( error, MockControl.ONE_OR_MORE );
}
- catch ( ProjectBuildingException e )
+ catch ( final ProjectBuildingException e )
{
Assert.fail( "should never happen" );
}
}
- public void expectBuildFromRepository( MavenProject project )
+ public void expectBuildFromRepository( final MavenProject project )
{
try
{
@@ -214,36 +203,13 @@ public class MockAndControlForAddDepende
projectBuilderCtl.setMatcher( MockControl.ALWAYS_MATCHER );
projectBuilderCtl.setReturnValue( project, MockControl.ONE_OR_MORE );
}
- catch ( ProjectBuildingException e )
+ catch ( final ProjectBuildingException e )
{
Assert.fail( "should never happen" );
}
}
- public void expectResolveDependencies( Set resolvedArtifacts )
- {
- try
- {
- dependencyResolver.resolveDependencies( null, null, null, null, null, true );
- }
- catch ( ArtifactResolutionException e )
- {
- Assert.fail( "should never happen!" );
- }
- catch ( ArtifactNotFoundException e )
- {
- Assert.fail( "should never happen!" );
- }
- catch ( InvalidDependencyVersionException e )
- {
- Assert.fail( "should never happen!" );
- }
-
- dependencyResolverCtl.setMatcher( MockControl.ALWAYS_MATCHER );
- dependencyResolverCtl.setReturnValue( resolvedArtifacts, MockControl.ONE_OR_MORE );
- }
-
- public void expectGetSession( MavenSession session )
+ public void expectGetSession( final MavenSession session )
{
configSource.getMavenSession();
configSourceCtl.setReturnValue( session, MockControl.ZERO_OR_MORE );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java Tue Sep 21 20:34:50 2010
@@ -2,15 +2,15 @@ package org.apache.maven.plugin.assembly
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.DependencySet;
import org.apache.maven.plugin.assembly.model.ModuleBinaries;
import org.apache.maven.plugin.assembly.model.ModuleSet;
@@ -22,16 +22,16 @@ import org.codehaus.plexus.logging.Logge
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.MockControl;
+import edu.emory.mathcs.backport.java.util.Collections;
+
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
public class DefaultDependencyResolverTest
-extends PlexusTestCase
+ extends PlexusTestCase
{
private ArtifactFactory factory;
@@ -40,83 +40,111 @@ extends PlexusTestCase
private ArtifactRepositoryLayout layout;
- // private ArtifactCollector collector;
+ private ArtifactResolver resolver;
+
+ private ArtifactMetadataSource metadataSource;
+
+ private ArtifactCollector collector;
+ private ConsoleLogger logger;
+
+ @Override
public void setUp()
- throws Exception
+ throws Exception
{
super.setUp();
+ resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
+ metadataSource = (ArtifactMetadataSource) lookup( ArtifactMetadataSource.ROLE );
factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
repoFactory = (ArtifactRepositoryFactory) lookup( ArtifactRepositoryFactory.ROLE );
layout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
-
- // collector = (ArtifactCollector) lookup( ArtifactCollector.class.getName() );
+ collector = (ArtifactCollector) lookup( ArtifactCollector.class.getName() );
+ logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
}
public void test_getDependencySetResolutionRequirements()
+ throws DependencyResolutionException
{
- List depSets = new ArrayList();
+ final List<DependencySet> depSets = new ArrayList<DependencySet>();
- DependencySet ds1 = new DependencySet();
+ final DependencySet ds1 = new DependencySet();
ds1.setScope( Artifact.SCOPE_COMPILE );
ds1.setUseTransitiveDependencies( false );
depSets.add( ds1 );
- DependencySet ds2 = new DependencySet();
+ final DependencySet ds2 = new DependencySet();
ds2.setScope( Artifact.SCOPE_SYSTEM );
ds2.setUseTransitiveDependencies( false );
depSets.add( ds2 );
- ResolutionManagementInfo info = new ResolutionManagementInfo( new MavenProject( new Model() ) );
+ final MavenProject project = createMavenProject( "main-group", "main-artifact", "1", null );
+
+ final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
- new DefaultDependencyResolver().getDependencySetResolutionRequirements( depSets, info );
+ new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).getDependencySetResolutionRequirements( new Assembly(),
+ depSets,
+ info,
+ project );
assertTrue( info.isResolutionRequired() );
assertFalse( info.isResolvedTransitively() );
- assertTrue( info.getScopeFilter().isIncludeCompileScope() );
- assertTrue( info.getScopeFilter().isIncludeSystemScope() );
-
- assertTrue( info.getScopeFilter().isIncludeProvidedScope() );
-
- assertFalse( info.getScopeFilter().isIncludeRuntimeScope() );
- assertFalse( info.getScopeFilter().isIncludeTestScope() );
+ assertTrue( info.getScopeFilter()
+ .isIncludeCompileScope() );
+ assertTrue( info.getScopeFilter()
+ .isIncludeSystemScope() );
+
+ assertTrue( info.getScopeFilter()
+ .isIncludeProvidedScope() );
+
+ assertFalse( info.getScopeFilter()
+ .isIncludeRuntimeScope() );
+ assertFalse( info.getScopeFilter()
+ .isIncludeTestScope() );
}
public void test_getModuleSetResolutionRequirements()
- throws ArchiveCreationException
+ throws DependencyResolutionException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class );
+ final MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class );
mm.add( csControl );
- AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csControl.getMock();
-
- File rootDir = new File( "root" );
- MavenProject project = createMavenProject( "main-group", "main-artifact", "1", rootDir );
-
- File module1Dir = new File( rootDir, "module-1" );
- MavenProject module1 = createMavenProject( "main-group", "module-1", "1", module1Dir );
- MavenProject module1a = createMavenProject( "group1", "module-1a", "1", new File( module1Dir, "module-1a" ) );
- MavenProject module1b = createMavenProject( "group1.b", "module-1b", "1", new File( module1Dir, "module-1b" ) );
-
- module1.getModel().addModule( module1a.getArtifactId() );
- module1.getModel().addModule( module1b.getArtifactId() );
-
- File module2Dir = new File( rootDir, "module-2" );
- MavenProject module2 = createMavenProject( "main-group", "module-2", "1", module2Dir );
- MavenProject module2a = createMavenProject( "main-group", "module-2a", "1", new File( module2Dir, "module-2a" ) );
+ final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csControl.getMock();
- module2.getModel().addModule( module2a.getArtifactId() );
+ final File rootDir = new File( "root" );
+ final MavenProject project = createMavenProject( "main-group", "main-artifact", "1", rootDir );
- project.getModel().addModule( module1.getArtifactId() );
- project.getModel().addModule( module2.getArtifactId() );
+ final File module1Dir = new File( rootDir, "module-1" );
+ final MavenProject module1 = createMavenProject( "main-group", "module-1", "1", module1Dir );
+ final MavenProject module1a =
+ createMavenProject( "group1", "module-1a", "1", new File( module1Dir, "module-1a" ) );
+ final MavenProject module1b =
+ createMavenProject( "group1.b", "module-1b", "1", new File( module1Dir, "module-1b" ) );
+
+ module1.getModel()
+ .addModule( module1a.getArtifactId() );
+ module1.getModel()
+ .addModule( module1b.getArtifactId() );
+
+ final File module2Dir = new File( rootDir, "module-2" );
+ final MavenProject module2 = createMavenProject( "main-group", "module-2", "1", module2Dir );
+ final MavenProject module2a =
+ createMavenProject( "main-group", "module-2a", "1", new File( module2Dir, "module-2a" ) );
+
+ module2.getModel()
+ .addModule( module2a.getArtifactId() );
+
+ project.getModel()
+ .addModule( module1.getArtifactId() );
+ project.getModel()
+ .addModule( module2.getArtifactId() );
- List allProjects = new ArrayList();
+ final List<MavenProject> allProjects = new ArrayList<MavenProject>();
allProjects.add( project );
allProjects.add( module1 );
allProjects.add( module1a );
@@ -130,18 +158,18 @@ extends PlexusTestCase
cs.getProject();
csControl.setReturnValue( project, MockControl.ZERO_OR_MORE );
- ResolutionManagementInfo info = new ResolutionManagementInfo( project );
+ final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
- List moduleSets = new ArrayList();
+ final List<ModuleSet> moduleSets = new ArrayList<ModuleSet>();
{
- ModuleSet ms = new ModuleSet();
+ final ModuleSet ms = new ModuleSet();
ms.addInclude( "*module1*" );
ms.setIncludeSubModules( false );
- ModuleBinaries mb = new ModuleBinaries();
+ final ModuleBinaries mb = new ModuleBinaries();
- DependencySet ds = new DependencySet();
+ final DependencySet ds = new DependencySet();
ds.setScope( Artifact.SCOPE_COMPILE );
mb.addDependencySet( ds );
@@ -150,13 +178,13 @@ extends PlexusTestCase
}
{
- ModuleSet ms = new ModuleSet();
+ final ModuleSet ms = new ModuleSet();
ms.addInclude( "main-group:*" );
ms.setIncludeSubModules( true );
- ModuleBinaries mb = new ModuleBinaries();
+ final ModuleBinaries mb = new ModuleBinaries();
- DependencySet ds = new DependencySet();
+ final DependencySet ds = new DependencySet();
ds.setScope( Artifact.SCOPE_TEST );
mb.addDependencySet( ds );
@@ -166,14 +194,18 @@ extends PlexusTestCase
mm.replayAll();
- DefaultDependencyResolver resolver = new DefaultDependencyResolver();
+ final DefaultDependencyResolver resolver =
+ new DefaultDependencyResolver( this.resolver, metadataSource, factory, collector, logger );
resolver.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- resolver.getModuleSetResolutionRequirements( moduleSets, info, cs );
+ final Assembly assembly = new Assembly();
+ assembly.setModuleSets( moduleSets );
+
+ resolver.getModuleSetResolutionRequirements( assembly, info, cs );
assertTrue( info.isResolutionRequired() );
- Set enabledProjects = info.getEnabledProjects();
+ final Set<MavenProject> enabledProjects = info.getEnabledProjects();
assertTrue( enabledProjects.contains( project ) );
assertTrue( enabledProjects.contains( module1 ) );
@@ -186,110 +218,92 @@ extends PlexusTestCase
assertTrue( enabledProjects.contains( module2a ) );
// these are the two we directly set above.
- assertTrue( info.getScopeFilter().isIncludeTestScope() );
- assertTrue( info.getScopeFilter().isIncludeCompileScope() );
+ assertTrue( info.getScopeFilter()
+ .isIncludeTestScope() );
+ assertTrue( info.getScopeFilter()
+ .isIncludeCompileScope() );
// this combination should be implied by the two direct scopes set above.
- assertTrue( info.getScopeFilter().isIncludeRuntimeScope() );
- assertTrue( info.getScopeFilter().isIncludeProvidedScope() );
- assertTrue( info.getScopeFilter().isIncludeSystemScope() );
+ assertTrue( info.getScopeFilter()
+ .isIncludeRuntimeScope() );
+ assertTrue( info.getScopeFilter()
+ .isIncludeProvidedScope() );
+ assertTrue( info.getScopeFilter()
+ .isIncludeSystemScope() );
mm.verifyAll();
}
public void test_getRepositoryResolutionRequirements()
{
- List repositories = new ArrayList();
+ final List<Repository> repositories = new ArrayList<Repository>();
{
- Repository r = new Repository();
+ final Repository r = new Repository();
r.setScope( Artifact.SCOPE_COMPILE );
repositories.add( r );
}
{
- Repository r = new Repository();
+ final Repository r = new Repository();
r.setScope( Artifact.SCOPE_SYSTEM );
repositories.add( r );
}
- ResolutionManagementInfo info = new ResolutionManagementInfo( new MavenProject( new Model() ) );
-
- new DefaultDependencyResolver().getRepositoryResolutionRequirements( repositories, info );
+ final MavenProject project = createMavenProject( "group", "artifact", "1.0", null );
+ final Assembly assembly = new Assembly();
+ assembly.setRepositories( repositories );
+
+ final ResolutionManagementInfo info = new ResolutionManagementInfo( project );
+ new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).getRepositoryResolutionRequirements( assembly,
+ info,
+ project );
assertTrue( info.isResolutionRequired() );
- assertTrue( info.getScopeFilter().isIncludeCompileScope() );
- assertTrue( info.getScopeFilter().isIncludeSystemScope() );
-
- assertTrue( info.getScopeFilter().isIncludeProvidedScope() );
-
- assertFalse( info.getScopeFilter().isIncludeRuntimeScope() );
- assertFalse( info.getScopeFilter().isIncludeTestScope() );
- }
-
- public void test_getManagedVersionMap()
- throws InvalidVersionSpecificationException
- {
- MavenProject project = createMavenProject( "group", "artifact", "1", new File( "base" ) );
-
- DependencyManagement dm = new DependencyManagement();
- project.getModel().setDependencyManagement( dm );
-
- Dependency d1 = new Dependency();
- d1.setGroupId( "group" );
- d1.setArtifactId( "dep1" );
- d1.setVersion( "2" );
- d1.setScope( Artifact.SCOPE_PROVIDED );
-
- dm.addDependency( d1 );
-
- Dependency d2 = new Dependency();
- d2.setGroupId( "group" );
- d2.setArtifactId( "dep2" );
- d2.setVersion( "2.1" );
-
- dm.addDependency( d2 );
-
- DefaultDependencyResolver resolver = new DefaultDependencyResolver();
- resolver.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- resolver.setArtifactFactory( factory );
-
- Map managedVersionMap = resolver.getManagedVersionMap( project );
-
- Artifact a1 = (Artifact) managedVersionMap.get( d1.getManagementKey() );
- assertNotNull( a1 );
- assertEquals( d1.getVersion(), a1.getVersion() );
- assertEquals( d1.getScope(), a1.getScope() );
-
- Artifact a2 = (Artifact) managedVersionMap.get( d2.getManagementKey() );
- assertNotNull( a2 );
- assertEquals( d2.getVersion(), a2.getVersion() );
- assertNull( a2.getScope() );
+ assertTrue( info.getScopeFilter()
+ .isIncludeCompileScope() );
+ assertTrue( info.getScopeFilter()
+ .isIncludeSystemScope() );
+
+ assertTrue( info.getScopeFilter()
+ .isIncludeProvidedScope() );
+
+ assertFalse( info.getScopeFilter()
+ .isIncludeRuntimeScope() );
+ assertFalse( info.getScopeFilter()
+ .isIncludeTestScope() );
}
public void test_aggregateRemoteArtifactRepositories()
{
- List externalRepos = new ArrayList();
+ final List<ArtifactRepository> externalRepos = new ArrayList<ArtifactRepository>();
- ArtifactRepository er1 = repoFactory.createArtifactRepository( "test.1", "http://test.com/path", layout, null, null );
+ final ArtifactRepository er1 =
+ repoFactory.createArtifactRepository( "test.1", "http://test.com/path", layout, null, null );
externalRepos.add( er1 );
- ArtifactRepository er2 = repoFactory.createArtifactRepository( "test.2", "http://test2.com/path", layout, null, null );
+ final ArtifactRepository er2 =
+ repoFactory.createArtifactRepository( "test.2", "http://test2.com/path", layout, null, null );
externalRepos.add( er2 );
- List projectRepos = new ArrayList();
+ final List<ArtifactRepository> projectRepos = new ArrayList<ArtifactRepository>();
- ArtifactRepository pr1 = repoFactory.createArtifactRepository( "project.1", "http://test.com/project", layout, null, null );
+ final ArtifactRepository pr1 =
+ repoFactory.createArtifactRepository( "project.1", "http://test.com/project", layout, null, null );
projectRepos.add( pr1 );
- ArtifactRepository pr2 = repoFactory.createArtifactRepository( "project.2", "http://test2.com/path", layout, null, null );
+ final ArtifactRepository pr2 =
+ repoFactory.createArtifactRepository( "project.2", "http://test2.com/path", layout, null, null );
projectRepos.add( pr2 );
- MavenProject project = createMavenProject( "group", "artifact", "1", new File( "base" ) );
+ final MavenProject project = createMavenProject( "group", "artifact", "1", new File( "base" ) );
project.setRemoteArtifactRepositories( projectRepos );
- List aggregated = new DefaultDependencyResolver().aggregateRemoteArtifactRepositories( externalRepos, project );
+ @SuppressWarnings( "unchecked" )
+ final List<ArtifactRepository> aggregated =
+ new DefaultDependencyResolver( resolver, metadataSource, factory, collector, logger ).aggregateRemoteArtifactRepositories( externalRepos,
+ Collections.singleton( project ) );
assertRepositoryWithId( er1.getId(), aggregated, true );
assertRepositoryWithId( er2.getId(), aggregated, true );
@@ -297,33 +311,32 @@ extends PlexusTestCase
assertRepositoryWithId( pr2.getId(), aggregated, false );
}
- public void test_manageArtifact()
- {
- Artifact managed = factory.createArtifact( "group", "artifact", "1", Artifact.SCOPE_PROVIDED, "jar" );
-
- Artifact target =
- factory.createArtifact( managed.getGroupId(), managed.getArtifactId(), "2", Artifact.SCOPE_COMPILE,
- managed.getType() );
-
- Artifact target2 =
- factory.createArtifact( "other-group", managed.getArtifactId(), "2", Artifact.SCOPE_COMPILE,
- managed.getType() );
-
- Map managedVersions = Collections.singletonMap( managed.getDependencyConflictId(), managed );
-
- DefaultDependencyResolver resolver =
- new DefaultDependencyResolver().setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
-
- resolver.manageArtifact( target, managedVersions );
- resolver.manageArtifact( target2, managedVersions );
-
- assertEquals( managed.getVersion(), target.getVersion() );
- assertEquals( managed.getScope(), target.getScope() );
-
- assertEquals( "2", target2.getVersion() );
- assertEquals( Artifact.SCOPE_COMPILE, target2.getScope() );
- }
-
+ // public void test_manageArtifact()
+ // {
+ // Artifact managed = factory.createArtifact( "group", "artifact", "1", Artifact.SCOPE_PROVIDED, "jar" );
+ //
+ // Artifact target =
+ // factory.createArtifact( managed.getGroupId(), managed.getArtifactId(), "2", Artifact.SCOPE_COMPILE,
+ // managed.getType() );
+ //
+ // Artifact target2 =
+ // factory.createArtifact( "other-group", managed.getArtifactId(), "2", Artifact.SCOPE_COMPILE,
+ // managed.getType() );
+ //
+ // Map managedVersions = Collections.singletonMap( managed.getDependencyConflictId(), managed );
+ //
+ // DefaultDependencyResolver resolver =
+ // new DefaultDependencyResolver().setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ //
+ // resolver.manageArtifact( target, managedVersions );
+ // resolver.manageArtifact( target2, managedVersions );
+ //
+ // assertEquals( managed.getVersion(), target.getVersion() );
+ // assertEquals( managed.getScope(), target.getScope() );
+ //
+ // assertEquals( "2", target2.getVersion() );
+ // assertEquals( Artifact.SCOPE_COMPILE, target2.getScope() );
+ // }
// public void test_buildManagedVersionMap_NonTransitiveResolution()
// throws ArtifactResolutionException, ArchiveCreationException, InvalidVersionSpecificationException,
@@ -571,7 +584,8 @@ extends PlexusTestCase
// mm.verifyAll();
// }
- private void assertRepositoryWithId( String repoId, List repos, boolean shouldExist )
+ private void assertRepositoryWithId( final String repoId, final List<ArtifactRepository> repos,
+ final boolean shouldExist )
{
if ( ( repos == null || repos.isEmpty() ) )
{
@@ -583,9 +597,9 @@ extends PlexusTestCase
else
{
boolean found = false;
- for ( Iterator it = repos.iterator(); it.hasNext(); )
+ for ( final Iterator<ArtifactRepository> it = repos.iterator(); it.hasNext(); )
{
- ArtifactRepository repo = (ArtifactRepository) it.next();
+ final ArtifactRepository repo = it.next();
if ( repoId.equals( repo.getId() ) )
{
found = true;
@@ -604,18 +618,19 @@ extends PlexusTestCase
}
}
- private MavenProject createMavenProject( String groupId, String artifactId, String version, File basedir )
+ private MavenProject createMavenProject( final String groupId, final String artifactId, final String version,
+ final File basedir )
{
- Model model = new Model();
+ final Model model = new Model();
model.setGroupId( groupId );
model.setArtifactId( artifactId );
model.setVersion( version );
model.setPackaging( "pom" );
- MavenProject project = new MavenProject( model );
+ final MavenProject project = new MavenProject( model );
- Artifact pomArtifact = factory.createProjectArtifact( groupId, artifactId, version );
+ final Artifact pomArtifact = factory.createProjectArtifact( groupId, artifactId, version );
project.setArtifact( pomArtifact );
project.setFile( new File( basedir, "pom.xml" ) );