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 [6/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/phase/FileSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java Tue Sep 21 20:34:50 2010
@@ -20,6 +20,7 @@ package org.apache.maven.plugin.assembly
*/
import org.apache.maven.model.Model;
+import org.apache.maven.plugin.assembly.DefaultAssemblyContext;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
@@ -40,10 +41,11 @@ public class FileSetAssemblyPhaseTest
extends TestCase
{
- private MockManager mockManager = new MockManager();
+ private final MockManager mockManager = new MockManager();
- private TestFileManager fileManager = new TestFileManager( "file-set-assembly.test.", "" );
+ private final TestFileManager fileManager = new TestFileManager( "file-set-assembly.test.", "" );
+ @Override
public void tearDown()
throws IOException
{
@@ -53,16 +55,18 @@ public class FileSetAssemblyPhaseTest
public void testShouldNotFailWhenNoFileSetsSpecified()
throws ArchiveCreationException, AssemblyFormattingException
{
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
- MockAndControlForLogger macLogger = new MockAndControlForLogger();
- MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mockManager, fileManager );
+ final MockAndControlForLogger macLogger = new MockAndControlForLogger();
+ final MockAndControlForAddFileSetsTask macTask =
+ new MockAndControlForAddFileSetsTask( mockManager, fileManager );
mockManager.replayAll();
- createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource );
+ createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource,
+ new DefaultAssemblyContext() );
mockManager.verifyAll();
}
@@ -70,12 +74,12 @@ public class FileSetAssemblyPhaseTest
public void testShouldAddOneFileSet()
throws ArchiveCreationException, AssemblyFormattingException
{
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
assembly.setIncludeBaseDirectory( false );
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
fs.setOutputDirectory( "/out" );
fs.setDirectory( "/input" );
fs.setFileMode( "777" );
@@ -83,34 +87,36 @@ public class FileSetAssemblyPhaseTest
assembly.addFileSet( fs );
- MockAndControlForLogger macLogger = new MockAndControlForLogger();
- MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mockManager, fileManager );
+ final MockAndControlForLogger macLogger = new MockAndControlForLogger();
+ final MockAndControlForAddFileSetsTask macTask =
+ new MockAndControlForAddFileSetsTask( mockManager, fileManager );
macTask.expectGetArchiveBaseDirectory();
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
- MavenProject project = new MavenProject( new Model() );
+ final MavenProject project = new MavenProject( new Model() );
macLogger.expectDebug( true, true );
- int dirMode = Integer.parseInt( "777", 8 );
- int fileMode = Integer.parseInt( "777", 8 );
+ final int dirMode = Integer.parseInt( "777", 8 );
+ final int fileMode = Integer.parseInt( "777", 8 );
- int[] modes = { -1, -1, dirMode, fileMode };
+ final int[] modes = { -1, -1, dirMode, fileMode };
macTask.expectAdditionOfSingleFileSet( project, basedir, "final-name", false, modes, 1, true );
mockManager.replayAll();
- createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource );
+ createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource,
+ new DefaultAssemblyContext() );
mockManager.verifyAll();
}
- private FileSetAssemblyPhase createPhase( MockAndControlForLogger macLogger )
+ private FileSetAssemblyPhase createPhase( final MockAndControlForLogger macLogger )
{
- FileSetAssemblyPhase phase = new FileSetAssemblyPhase();
+ final FileSetAssemblyPhase phase = new FileSetAssemblyPhase();
phase.enableLogging( macLogger.logger );
@@ -128,10 +134,10 @@ public class FileSetAssemblyPhaseTest
control = MockControl.createControl( Logger.class );
mockManager.add( control );
- logger = ( Logger ) control.getMock();
+ logger = (Logger) control.getMock();
}
- public void expectDebug( boolean debugCheck, boolean debugEnabled )
+ public void expectDebug( final boolean debugCheck, final boolean debugEnabled )
{
if ( debugCheck )
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Tue Sep 21 20:34:50 2010
@@ -27,8 +27,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddArtifactTask;
import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask;
-import org.apache.maven.plugin.assembly.archive.task.testutils.MockAndControlForArtifact;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.DependencySet;
@@ -61,10 +59,11 @@ public class ModuleSetAssemblyPhaseTest
extends TestCase
{
- private TestFileManager fileManager = new TestFileManager( "module-set-phase.test.", "" );
-
- private Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, "test" );
+ private final TestFileManager fileManager = new TestFileManager( "module-set-phase.test.", "" );
+ private final Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, "test" );
+
+ @Override
public void tearDown()
throws IOException
{
@@ -73,50 +72,50 @@ public class ModuleSetAssemblyPhaseTest
public void testIsDeprecatedModuleSourcesConfigPresent_ShouldCatchOutputDir()
{
- ModuleSources sources = new ModuleSources();
+ final ModuleSources sources = new ModuleSources();
sources.setOutputDirectory( "outdir" );
- ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+ final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
assertTrue( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
}
public void testIsDeprecatedModuleSourcesConfigPresent_ShouldCatchInclude()
{
- ModuleSources sources = new ModuleSources();
+ final ModuleSources sources = new ModuleSources();
sources.addInclude( "**/included.txt" );
- ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+ final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
assertTrue( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
}
public void testIsDeprecatedModuleSourcesConfigPresent_ShouldCatchExclude()
{
- ModuleSources sources = new ModuleSources();
+ final ModuleSources sources = new ModuleSources();
sources.addExclude( "**/excluded.txt" );
- ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+ final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
assertTrue( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
}
public void testIsDeprecatedModuleSourcesConfigPresent_ShouldNotCatchFileMode()
{
- ModuleSources sources = new ModuleSources();
+ final ModuleSources sources = new ModuleSources();
sources.setFileMode( "777" );
- ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+ final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
assertFalse( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
}
public void testIsDeprecatedModuleSourcesConfigPresent_ShouldNotCatchDirMode()
{
- ModuleSources sources = new ModuleSources();
+ final ModuleSources sources = new ModuleSources();
sources.setDirectoryMode( "777" );
- ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
+ final ModuleSetAssemblyPhase phase = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null );
assertFalse( phase.isDeprecatedModuleSourcesConfigPresent( sources ) );
}
@@ -124,38 +123,38 @@ public class ModuleSetAssemblyPhaseTest
public void testCreateFileSet_ShouldUseModuleDirOnlyWhenOutDirIsNull()
throws AssemblyFormattingException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- Model model = new Model();
+ final Model model = new Model();
model.setArtifactId( "artifact" );
- MavenProject project = new MavenProject( model );
+ final MavenProject project = new MavenProject( model );
- MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
+ final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
macTask.expectGetFinalName( null );
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
- ModuleSources sources = new ModuleSources();
+ final ModuleSources sources = new ModuleSources();
sources.setIncludeModuleDirectory( true );
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
+
+ final MavenProject artifactProject = new MavenProject( new Model() );
- MavenProject artifactProject = new MavenProject( new Model() );
-
artifactProject.setFile( new File( basedir, "pom.xml" ) );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
artifactProject.setArtifact( artifactMock.getArtifact() );
mm.replayAll();
- FileSet result = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs,
- sources,
- artifactProject,
- macTask.configSource );
+ final FileSet result =
+ createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources,
+ artifactProject,
+ macTask.configSource );
assertEquals( "artifact/", result.getOutputDirectory() );
@@ -165,39 +164,39 @@ public class ModuleSetAssemblyPhaseTest
public void testCreateFileSet_ShouldPrependModuleDirWhenOutDirIsProvided()
throws AssemblyFormattingException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- Model model = new Model();
+ final Model model = new Model();
model.setArtifactId( "artifact" );
- MavenProject project = new MavenProject( model );
+ final MavenProject project = new MavenProject( model );
- MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
+ final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
macTask.expectGetFinalName( null );
-
- FileSet fs = new FileSet();
+
+ final FileSet fs = new FileSet();
fs.setOutputDirectory( "out" );
- ModuleSources sources = new ModuleSources();
+ final ModuleSources sources = new ModuleSources();
sources.setIncludeModuleDirectory( true );
- MavenProject artifactProject = new MavenProject( new Model() );
+ final MavenProject artifactProject = new MavenProject( new Model() );
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
artifactProject.setFile( new File( basedir, "pom.xml" ) );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
artifactProject.setArtifact( artifactMock.getArtifact() );
mm.replayAll();
- FileSet result = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs,
- sources,
- artifactProject,
- macTask.configSource );
+ final FileSet result =
+ createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources,
+ artifactProject,
+ macTask.configSource );
assertEquals( "artifact/out/", result.getOutputDirectory() );
@@ -207,41 +206,42 @@ public class ModuleSetAssemblyPhaseTest
public void testCreateFileSet_ShouldAddExcludesForSubModulesWhenExcludeSubModDirsIsTrue()
throws AssemblyFormattingException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, null );
+ final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, null );
macTask.expectGetFinalName( null );
-
- FileSet fs = new FileSet();
- ModuleSources sources = new ModuleSources();
+ final FileSet fs = new FileSet();
+
+ final ModuleSources sources = new ModuleSources();
sources.setExcludeSubModuleDirectories( true );
- Model model = new Model();
+ final Model model = new Model();
model.setArtifactId( "artifact" );
model.addModule( "submodule" );
- MavenProject project = new MavenProject( model );
+ final MavenProject project = new MavenProject( model );
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
project.setFile( new File( basedir, "pom.xml" ) );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
project.setArtifact( artifactMock.getArtifact() );
mm.replayAll();
- FileSet result = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs,
- sources,
- project,
- macTask.configSource );
-
- assertEquals( 1, result.getExcludes().size() );
- assertEquals( "submodule/**", result.getExcludes().get( 0 ) );
+ final FileSet result =
+ createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources, project,
+ macTask.configSource );
+
+ assertEquals( 1, result.getExcludes()
+ .size() );
+ assertEquals( "submodule/**", result.getExcludes()
+ .get( 0 ) );
mm.verifyAll();
}
@@ -249,46 +249,46 @@ public class ModuleSetAssemblyPhaseTest
public void testExecute_ShouldSkipIfNoModuleSetsFound()
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
{
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setIncludeBaseDirectory( false );
- createPhase( null, null ).execute( assembly, null, null );
+ createPhase( null, null ).execute( assembly, null, null, new DefaultAssemblyContext() );
}
public void testExecute_ShouldAddOneModuleSetWithOneModuleInIt()
throws ArchiveCreationException, AssemblyFormattingException, IOException,
InvalidAssemblerConfigurationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
- MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
+ final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
- MavenProject module = createProject( "group", "module", "version", project );
+ final MavenProject module = createProject( "group", "module", "version", project );
- ArtifactMock moduleArtifactMock = new ArtifactMock( mm, "group", "module", "version", "jar", false );
- File moduleArtifactFile = moduleArtifactMock.setNewFile();
+ final ArtifactMock moduleArtifactMock = new ArtifactMock( mm, "group", "module", "version", "jar", false );
+ final File moduleArtifactFile = moduleArtifactMock.setNewFile();
module.setArtifact( moduleArtifactMock.getArtifact() );
- List projects = new ArrayList();
+ final List<MavenProject> projects = new ArrayList<MavenProject>();
projects.add( module );
macTask.expectGetReactorProjects( projects );
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
-
- int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+
+ final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
macTask.expectAddFile( moduleArtifactFile, "out/artifact", mode );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setIncludeBaseDirectory( false );
- ModuleSet ms = new ModuleSet();
+ final ModuleSet ms = new ModuleSet();
- ModuleBinaries bin = new ModuleBinaries();
+ final ModuleBinaries bin = new ModuleBinaries();
bin.setOutputFileNameMapping( "artifact" );
bin.setOutputDirectory( "out" );
@@ -300,11 +300,12 @@ public class ModuleSetAssemblyPhaseTest
assembly.addModuleSet( ms );
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
mm.replayAll();
- createPhase( logger, null ).execute( assembly, macTask.archiver, macTask.configSource );
+ createPhase( logger, null ).execute( assembly, macTask.archiver, macTask.configSource,
+ new DefaultAssemblyContext() );
mm.verifyAll();
}
@@ -312,35 +313,36 @@ public class ModuleSetAssemblyPhaseTest
public void testAddModuleBinaries_ShouldReturnImmediatelyWhenBinariesIsNull()
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
{
- createPhase( null, null ).addModuleBinaries( null, null, null, null, null );
+ createPhase( null, null ).addModuleBinaries( null, null, null, null, new DefaultAssemblyContext() );
}
public void testAddModuleBinaries_ShouldFilterPomModule()
throws ArchiveCreationException, AssemblyFormattingException, IOException,
InvalidAssemblerConfigurationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
+ final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
- ModuleBinaries binaries = new ModuleBinaries();
+ final ModuleBinaries binaries = new ModuleBinaries();
binaries.setUnpack( false );
binaries.setFileMode( "777" );
binaries.setOutputDirectory( "out" );
binaries.setOutputFileNameMapping( "artifact" );
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
project.setPackaging( "pom" );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "pom", false );
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "pom", false );
project.setArtifact( artifactMock.getArtifact() );
- Set projects = Collections.singleton( project );
+ final Set<MavenProject> projects = Collections.singleton( project );
mm.replayAll();
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( binaries, projects,
+ createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( binaries,
+ projects,
macTask.archiver,
macTask.configSource,
new DefaultAssemblyContext() );
@@ -352,18 +354,19 @@ public class ModuleSetAssemblyPhaseTest
throws ArchiveCreationException, AssemblyFormattingException, IOException,
InvalidAssemblerConfigurationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, null );
+ final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, null );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", "test", false );
- File artifactFile = artifactMock.setNewFile();
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", "test", false );
+ final File artifactFile = artifactMock.setNewFile();
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- ModuleBinaries binaries = new ModuleBinaries();
+ macTask.expectAddFile( artifactFile, "out/artifact",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+
+ final ModuleBinaries binaries = new ModuleBinaries();
binaries.setIncludeDependencies( false );
binaries.setUnpack( false );
@@ -372,14 +375,14 @@ public class ModuleSetAssemblyPhaseTest
binaries.setOutputFileNameMapping( "artifact" );
binaries.setAttachmentClassifier( "test" );
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
project.addAttachedArtifact( artifactMock.getArtifact() );
- Set projects = Collections.singleton( project );
+ final Set<MavenProject> projects = Collections.singleton( project );
mm.replayAll();
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
createPhase( logger, null ).addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource,
new DefaultAssemblyContext() );
@@ -390,14 +393,14 @@ public class ModuleSetAssemblyPhaseTest
public void testAddModuleBinaries_ShouldFailWhenOneModuleDoesntHaveAttachmentWithMatchingClassifier()
throws ArchiveCreationException, AssemblyFormattingException, IOException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
+ final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", "test", false );
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", "test", false );
artifactMock.setNewFile();
- ModuleBinaries binaries = new ModuleBinaries();
+ final ModuleBinaries binaries = new ModuleBinaries();
binaries.setUnpack( false );
binaries.setFileMode( "777" );
@@ -405,14 +408,14 @@ public class ModuleSetAssemblyPhaseTest
binaries.setOutputFileNameMapping( "artifact" );
binaries.setAttachmentClassifier( "test" );
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
project.setArtifact( artifactMock.getArtifact() );
- Set projects = Collections.singleton( project );
+ final Set<MavenProject> projects = Collections.singleton( project );
mm.replayAll();
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
try
{
@@ -421,7 +424,7 @@ public class ModuleSetAssemblyPhaseTest
fail( "Should throw an invalid configuration exception because of module with missing attachment." );
}
- catch ( InvalidAssemblerConfigurationException e )
+ catch ( final InvalidAssemblerConfigurationException e )
{
// should throw this because of missing attachment.
}
@@ -433,18 +436,19 @@ public class ModuleSetAssemblyPhaseTest
throws ArchiveCreationException, AssemblyFormattingException, IOException,
InvalidAssemblerConfigurationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
+ final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
- File artifactFile = artifactMock.setNewFile();
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
+ final File artifactFile = artifactMock.setNewFile();
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- ModuleBinaries binaries = new ModuleBinaries();
+ macTask.expectAddFile( artifactFile, "out/artifact",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+
+ final ModuleBinaries binaries = new ModuleBinaries();
binaries.setIncludeDependencies( false );
binaries.setUnpack( false );
@@ -452,14 +456,14 @@ public class ModuleSetAssemblyPhaseTest
binaries.setOutputDirectory( "out" );
binaries.setOutputFileNameMapping( "artifact" );
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
project.setArtifact( artifactMock.getArtifact() );
- Set projects = Collections.singleton( project );
+ final Set<MavenProject> projects = Collections.singleton( project );
mm.replayAll();
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
createPhase( logger, null ).addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource,
new DefaultAssemblyContext() );
@@ -471,26 +475,27 @@ public class ModuleSetAssemblyPhaseTest
throws ArchiveCreationException, AssemblyFormattingException, IOException,
InvalidAssemblerConfigurationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm );
+ final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
- File artifactFile = artifactMock.setNewFile();
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
+ final File artifactFile = artifactMock.setNewFile();
macTask.expectCSGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( artifactFile, "out/artifact",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
macTask.expectGetSession( null );
-
- ModuleBinaries binaries = new ModuleBinaries();
+
+ final ModuleBinaries binaries = new ModuleBinaries();
binaries.setUnpack( false );
binaries.setFileMode( "777" );
binaries.setOutputDirectory( "out" );
binaries.setOutputFileNameMapping( "artifact" );
- DependencySet ds = new DependencySet();
+ final DependencySet ds = new DependencySet();
ds.setUseProjectArtifact( false );
ds.setOutputDirectory( binaries.getOutputDirectory() );
ds.setOutputFileNameMapping( "${artifact.artifactId}" );
@@ -498,32 +503,34 @@ public class ModuleSetAssemblyPhaseTest
binaries.addDependencySet( ds );
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
project.setArtifact( artifactMock.getArtifact() );
- ArtifactMock depArtifactMock = new ArtifactMock( mm, "group", "dep", "1", "jar", false );
- File depArtifactFile = depArtifactMock.setNewFile();
+ final ArtifactMock depArtifactMock = new ArtifactMock( mm, "group", "dep", "1", "jar", false );
+ final File depArtifactFile = depArtifactMock.setNewFile();
- macTask.expectAddFile( depArtifactFile, "out/dep", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+ macTask.expectAddFile( depArtifactFile, "out/dep",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
- MavenProject depProject = createProject( "group", "dep", "version", null );
+ final MavenProject depProject = createProject( "group", "dep", "version", null );
depProject.setArtifact( depArtifactMock.getArtifact() );
macTask.expectBuildFromRepository( depProject );
macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( Collections.singleton( depArtifactMock.getArtifact() ) );
- Set projects = Collections.singleton( project );
+ final Set<MavenProject> projects = Collections.singleton( project );
mm.replayAll();
- Logger overrideLogger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger overrideLogger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macTask );
+ final ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macTask );
- phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource,
- new DefaultAssemblyContext() );
+ final DefaultAssemblyContext context = new DefaultAssemblyContext();
+ context.setResolvedArtifacts( Collections.singleton( depArtifactMock.getArtifact() ) );
+
+ phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource, context );
mm.verifyAll();
}
@@ -532,22 +539,22 @@ public class ModuleSetAssemblyPhaseTest
throws ArchiveCreationException, AssemblyFormattingException, IOException,
InvalidAssemblerConfigurationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm );
+ final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm );
- ArtifactMock moduleArtifactMock = new ArtifactMock( mm, "group", "artifact", "0", "jar", false );
- File moduleArtifactFile = moduleArtifactMock.setNewFile();
+ final ArtifactMock moduleArtifactMock = new ArtifactMock( mm, "group", "artifact", "0", "jar", false );
+ final File moduleArtifactFile = moduleArtifactMock.setNewFile();
macTask.expectCSGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
- int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
macTask.expectAddFile( moduleArtifactFile, "out/artifact", mode );
macTask.expectGetSession( null );
-
- ModuleBinaries binaries = new ModuleBinaries();
+
+ final ModuleBinaries binaries = new ModuleBinaries();
binaries.setUnpack( false );
binaries.setFileMode( "777" );
@@ -555,95 +562,97 @@ public class ModuleSetAssemblyPhaseTest
binaries.setOutputFileNameMapping( "${artifact.artifactId}" );
binaries.setIncludeDependencies( true );
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
project.setArtifact( moduleArtifactMock.getArtifact() );
- ArtifactMock depArtifactMock = new ArtifactMock( mm, "group", "dep", "1", "jar", false );
- File depArtifactFile = depArtifactMock.setNewFile();
+ final ArtifactMock depArtifactMock = new ArtifactMock( mm, "group", "dep", "1", "jar", false );
+ final File depArtifactFile = depArtifactMock.setNewFile();
macTask.expectAddFile( depArtifactFile, "out/dep", mode );
- MavenProject depProject = createProject( "group", "dep", "version", null );
+ final MavenProject depProject = createProject( "group", "dep", "version", null );
depProject.setArtifact( depArtifactMock.getArtifact() );
macTask.expectBuildFromRepository( depProject );
macTask.expectCSGetRepositories( null, null );
- macTask.expectResolveDependencies( Collections.singleton( depArtifactMock.getArtifact() ) );
- Set projects = Collections.singleton( project );
+ final Set<MavenProject> projects = Collections.singleton( project );
mm.replayAll();
- Logger overrideLogger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger overrideLogger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macTask );
+ final ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macTask );
- phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource,
- new DefaultAssemblyContext() );
+ final DefaultAssemblyContext context = new DefaultAssemblyContext();
+ context.setResolvedArtifacts( Collections.singleton( depArtifactMock.getArtifact() ) );
+
+ phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource, context );
mm.verifyAll();
}
- public void testCollectExcludesFromQueuedArtifacts_ShouldAddOneExclusion()
- {
- MockManager mm = new MockManager();
-
- List excludes = new ArrayList();
-
- // nothing up this sleeve...
- assertTrue( excludes.isEmpty() );
-
- mm.replayAll();
-
- Set artifactIds = Collections.singleton( "group:artifact:jar" );
-
- List result = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null )
- .collectExcludesFromQueuedArtifacts( artifactIds, excludes );
-
- assertEquals( 1, result.size() );
-
- assertEquals( "group:artifact:jar", result.get( 0 ) );
-
- mm.verifyAll();
- }
-
- public void testCollectExcludesFromQueuedArtifacts_ShouldHandleNullExcludesList()
- {
- MockManager mm = new MockManager();
-
- mm.replayAll();
-
- Set artifactIds = Collections.singleton( "group:artifact:jar" );
-
- List result = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null )
- .collectExcludesFromQueuedArtifacts( artifactIds, null );
-
- assertEquals( 1, result.size() );
-
- assertEquals( "group:artifact:jar", result.get( 0 ) );
-
- mm.verifyAll();
- }
+ // public void testCollectExcludesFromQueuedArtifacts_ShouldAddOneExclusion()
+ // {
+ // MockManager mm = new MockManager();
+ //
+ // List excludes = new ArrayList();
+ //
+ // // nothing up this sleeve...
+ // assertTrue( excludes.isEmpty() );
+ //
+ // mm.replayAll();
+ //
+ // Set artifactIds = Collections.singleton( "group:artifact:jar" );
+ //
+ // List result = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null )
+ // .collectExcludesFromQueuedArtifacts( artifactIds, excludes );
+ //
+ // assertEquals( 1, result.size() );
+ //
+ // assertEquals( "group:artifact:jar", result.get( 0 ) );
+ //
+ // mm.verifyAll();
+ // }
+ //
+ // public void testCollectExcludesFromQueuedArtifacts_ShouldHandleNullExcludesList()
+ // {
+ // MockManager mm = new MockManager();
+ //
+ // mm.replayAll();
+ //
+ // Set artifactIds = Collections.singleton( "group:artifact:jar" );
+ //
+ // List result = createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null )
+ // .collectExcludesFromQueuedArtifacts( artifactIds, null );
+ //
+ // assertEquals( 1, result.size() );
+ //
+ // assertEquals( "group:artifact:jar", result.get( 0 ) );
+ //
+ // mm.verifyAll();
+ // }
public void testAddModuleArtifact_ShouldThrowExceptionWhenArtifactFileIsNull()
throws AssemblyFormattingException, IOException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "type", false );
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "type", false );
artifactMock.setNullFile();
mm.replayAll();
try
{
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(), null,
- null, null, null );
+ createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(),
+ null, null, null,
+ null );
fail( "Expected ArchiveCreationException since artifact file is null." );
}
- catch ( ArchiveCreationException e )
+ catch ( final ArchiveCreationException e )
{
// expected
}
@@ -654,22 +663,23 @@ public class ModuleSetAssemblyPhaseTest
public void testAddModuleArtifact_ShouldAddOneArtifact()
throws AssemblyFormattingException, IOException, ArchiveCreationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
+ final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "type", false );
- File artifactFile = artifactMock.setNewFile();
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "type", false );
+ final File artifactFile = artifactMock.setNewFile();
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
project.setArtifact( artifactMock.getArtifact() );
macTask.expectGetFinalName( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectAddFile( artifactFile, "out/artifact", TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
-
- ModuleBinaries binaries = new ModuleBinaries();
+ macTask.expectAddFile( artifactFile, "out/artifact",
+ TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ) );
+
+ final ModuleBinaries binaries = new ModuleBinaries();
binaries.setOutputDirectory( "out" );
binaries.setOutputFileNameMapping( "artifact" );
binaries.setUnpack( false );
@@ -677,10 +687,11 @@ public class ModuleSetAssemblyPhaseTest
mm.replayAll();
- createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(), project,
- macTask.archiver,
- macTask.configSource,
- binaries );
+ createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleArtifact( artifactMock.getArtifact(),
+ project,
+ macTask.archiver,
+ macTask.configSource,
+ binaries );
mm.verifyAll();
}
@@ -688,7 +699,7 @@ public class ModuleSetAssemblyPhaseTest
public void testAddModuleSourceFileSets_ShouldReturnImmediatelyIfSourcesIsNull()
throws ArchiveCreationException, AssemblyFormattingException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
mm.replayAll();
@@ -701,23 +712,23 @@ public class ModuleSetAssemblyPhaseTest
public void testAddModuleSourceFileSets_ShouldAddOneSourceDirectory()
throws ArchiveCreationException, AssemblyFormattingException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mm, fileManager );
+ final MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mm, fileManager );
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
macTask.expectGetProject( project );
- ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
+ final ArtifactMock artifactMock = new ArtifactMock( mm, "group", "artifact", "version", "jar", false );
project.setArtifact( artifactMock.getArtifact() );
- Set projects = Collections.singleton( project );
+ final Set<MavenProject> projects = Collections.singleton( project );
- ModuleSources sources = new ModuleSources();
+ final ModuleSources sources = new ModuleSources();
- FileSet fs = new FileSet();
+ final FileSet fs = new FileSet();
fs.setDirectory( "/src" );
fs.setDirectoryMode( "777" );
fs.setFileMode( "777" );
@@ -726,15 +737,15 @@ public class ModuleSetAssemblyPhaseTest
macTask.expectGetArchiveBaseDirectory();
- int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- int[] modes = { -1, -1, mode, mode };
+ final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final int[] modes = { -1, -1, mode, mode };
macTask.expectAdditionOfSingleFileSet( project, project.getBasedir(), "final-name", false, modes, 1, true,
false );
mm.replayAll();
- Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
+ final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
createPhase( logger, null ).addModuleSourceFileSets( sources, projects, macTask.archiver, macTask.configSource );
@@ -744,22 +755,23 @@ public class ModuleSetAssemblyPhaseTest
public void testGetModuleProjects_ShouldReturnNothingWhenReactorContainsOnlyCurrentProject()
throws ArchiveCreationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
- List projects = Collections.singletonList( project );
+ final List<MavenProject> projects = Collections.singletonList( project );
macTask.expectGetReactorProjects( projects );
- ModuleSet moduleSet = new ModuleSet();
+ final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
mm.replayAll();
- Set moduleProjects = ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ final Set<MavenProject> moduleProjects =
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
assertTrue( moduleProjects.isEmpty() );
@@ -769,26 +781,27 @@ public class ModuleSetAssemblyPhaseTest
public void testGetModuleProjects_ShouldReturnNothingWhenReactorContainsTwoSiblingProjects()
throws ArchiveCreationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
- MavenProject project2 = createProject( "group", "artifact2", "version", null );
+ final MavenProject project2 = createProject( "group", "artifact2", "version", null );
- List projects = new ArrayList();
+ final List<MavenProject> projects = new ArrayList<MavenProject>();
projects.add( project );
projects.add( project2 );
macTask.expectGetReactorProjects( projects );
- ModuleSet moduleSet = new ModuleSet();
+ final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
mm.replayAll();
- Set moduleProjects = ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ final Set<MavenProject> moduleProjects =
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
assertTrue( moduleProjects.isEmpty() );
@@ -798,30 +811,32 @@ public class ModuleSetAssemblyPhaseTest
public void testGetModuleProjects_ShouldReturnModuleOfCurrentProject()
throws ArchiveCreationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
- MavenProject project2 = createProject( "group", "artifact2", "version", project );
+ final MavenProject project2 = createProject( "group", "artifact2", "version", project );
- List projects = new ArrayList();
+ final List<MavenProject> projects = new ArrayList<MavenProject>();
projects.add( project );
projects.add( project2 );
macTask.expectGetReactorProjects( projects );
- ModuleSet moduleSet = new ModuleSet();
+ final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
mm.replayAll();
- Set moduleProjects = ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ final Set<MavenProject> moduleProjects =
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
assertFalse( moduleProjects.isEmpty() );
- MavenProject result = (MavenProject) moduleProjects.iterator().next();
+ final MavenProject result = moduleProjects.iterator()
+ .next();
assertEquals( "artifact2", result.getArtifactId() );
@@ -831,32 +846,33 @@ public class ModuleSetAssemblyPhaseTest
public void testGetModuleProjects_ShouldReturnDescendentModulesOfCurrentProject()
throws ArchiveCreationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
- MavenProject project2 = createProject( "group", "artifact2", "version", project );
- MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
+ final MavenProject project2 = createProject( "group", "artifact2", "version", project );
+ final MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
- List projects = new ArrayList();
+ final List<MavenProject> projects = new ArrayList<MavenProject>();
projects.add( project );
projects.add( project2 );
projects.add( project3 );
macTask.expectGetReactorProjects( projects );
- ModuleSet moduleSet = new ModuleSet();
+ final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
mm.replayAll();
- Set moduleProjects = ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ final Set<MavenProject> moduleProjects =
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
assertEquals( 2, moduleProjects.size() );
- List check = new ArrayList();
+ final List<MavenProject> check = new ArrayList<MavenProject>();
check.add( project2 );
check.add( project3 );
@@ -868,65 +884,53 @@ public class ModuleSetAssemblyPhaseTest
public void testGetModuleProjects_ShouldExcludeModuleAndDescendentsTransitively()
throws ArchiveCreationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MavenProject project = createProject( "group", "artifact", "version", null );
+ final MavenProject project = createProject( "group", "artifact", "version", null );
- MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
+ final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, project );
- List macArtifacts = new ArrayList();
+ final List<ArtifactMock> macArtifacts = new ArrayList<ArtifactMock>();
macArtifacts.add( addArtifact( project, mm, false, false ) );
- MavenProject project2 = createProject( "group", "artifact2", "version", project );
+ final MavenProject project2 = createProject( "group", "artifact2", "version", project );
macArtifacts.add( addArtifact( project2, mm, true, false ) );
-
- ( (MockAndControlForArtifact) macArtifacts.get( 1 ) ).expectGetId( "group:artifact2:jar:version" );
-// ( (MockAndControlForArtifact) macArtifacts.get( 1 ) ).expectGetDependencyTrail( Collections
-// .singletonList( "group:artifact:jar:version" ) );
-
- MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
+ final MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
macArtifacts.add( addArtifact( project3, mm, true, true ) );
- ( (MockAndControlForArtifact) macArtifacts.get( 2 ) ).expectGetId( "group:artifact3:jar:version" );
-
- List projects = new ArrayList();
+ final List<MavenProject> projects = new ArrayList<MavenProject>();
projects.add( project );
projects.add( project2 );
projects.add( project3 );
macTask.expectGetReactorProjects( projects );
- ModuleSet moduleSet = new ModuleSet();
+ final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
moduleSet.addExclude( "group:artifact2" );
mm.replayAll();
- Set moduleProjects = ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ final Set<MavenProject> moduleProjects =
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
assertTrue( moduleProjects.isEmpty() );
mm.verifyAll();
}
- private MockAndControlForArtifact addArtifact( MavenProject project, MockManager mm, boolean expectIdentityChecks,
- boolean expectDepTrailCheck )
+ private ArtifactMock addArtifact( final MavenProject project, final MockManager mm,
+ final boolean expectIdentityChecks, final boolean expectDepTrailCheck )
{
- MockAndControlForArtifact macArtifact = new MockAndControlForArtifact( mm );
-
- if ( expectIdentityChecks )
- {
- macArtifact.expectGetArtifactId( project.getArtifactId() );
- macArtifact.expectGetGroupId( project.getGroupId() );
- macArtifact.expectGetDependencyConflictId( project.getGroupId(), project.getArtifactId(), project
- .getPackaging() );
- }
+ final ArtifactMock macArtifact =
+ new ArtifactMock( mm, project.getGroupId(), project.getArtifactId(), project.getVersion(),
+ project.getPackaging(), false );
if ( expectDepTrailCheck )
{
- LinkedList depTrail = new LinkedList();
+ final LinkedList<String> depTrail = new LinkedList<String>();
MavenProject parent = project.getParent();
while ( parent != null )
@@ -936,19 +940,19 @@ public class ModuleSetAssemblyPhaseTest
parent = parent.getParent();
}
- macArtifact.expectGetDependencyTrail( depTrail );
+ macArtifact.setDependencyTrail( depTrail );
}
- project.setArtifact( macArtifact.artifact );
+ project.setArtifact( macArtifact.getArtifact() );
return macArtifact;
}
- private void verifyResultIs( List check, Set moduleProjects )
+ private void verifyResultIs( final List<MavenProject> check, final Set<MavenProject> moduleProjects )
{
boolean failed = false;
- Set checkTooMany = new HashSet( moduleProjects );
+ final Set<MavenProject> checkTooMany = new HashSet<MavenProject>( moduleProjects );
checkTooMany.removeAll( check );
if ( !checkTooMany.isEmpty() )
@@ -957,15 +961,15 @@ public class ModuleSetAssemblyPhaseTest
System.out.println( "Unexpected projects in output: " );
- for ( Iterator iter = checkTooMany.iterator(); iter.hasNext(); )
+ for ( final Iterator<MavenProject> iter = checkTooMany.iterator(); iter.hasNext(); )
{
- MavenProject project = (MavenProject) iter.next();
+ final MavenProject project = iter.next();
System.out.println( project.getId() );
}
}
- Set checkTooFew = new HashSet( check );
+ final Set<MavenProject> checkTooFew = new HashSet<MavenProject>( check );
checkTooFew.removeAll( moduleProjects );
if ( !checkTooFew.isEmpty() )
@@ -974,9 +978,9 @@ public class ModuleSetAssemblyPhaseTest
System.out.println( "Expected projects missing from output: " );
- for ( Iterator iter = checkTooMany.iterator(); iter.hasNext(); )
+ for ( final Iterator<MavenProject> iter = checkTooMany.iterator(); iter.hasNext(); )
{
- MavenProject project = (MavenProject) iter.next();
+ final MavenProject project = iter.next();
System.out.println( project.getId() );
}
@@ -988,27 +992,29 @@ public class ModuleSetAssemblyPhaseTest
}
}
- private MavenProject createProject( String groupId, String artifactId, String version, MavenProject parentProject )
+ private MavenProject createProject( final String groupId, final String artifactId, final String version,
+ final MavenProject parentProject )
{
- 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 );
File pomFile;
if ( parentProject == null )
{
- File basedir = fileManager.createTempDir();
+ final File basedir = fileManager.createTempDir();
pomFile = new File( basedir, "pom.xml" );
}
else
{
- File parentBase = parentProject.getBasedir();
+ final File parentBase = parentProject.getBasedir();
pomFile = new File( parentBase, artifactId + "/pom.xml" );
- parentProject.getModel().addModule( artifactId );
+ parentProject.getModel()
+ .addModule( artifactId );
project.setParent( parentProject );
}
@@ -1017,18 +1023,17 @@ public class ModuleSetAssemblyPhaseTest
return project;
}
- private ModuleSetAssemblyPhase createPhase( Logger logger, MockAndControlForAddDependencySetsTask macTask )
+ private ModuleSetAssemblyPhase createPhase( final Logger logger,
+ final MockAndControlForAddDependencySetsTask macTask )
{
MavenProjectBuilder projectBuilder = null;
- DependencyResolver dependencyResolver = null;
if ( macTask != null )
{
projectBuilder = macTask.projectBuilder;
- dependencyResolver = macTask.dependencyResolver;
}
- ModuleSetAssemblyPhase phase = new ModuleSetAssemblyPhase( projectBuilder, dependencyResolver, logger );
+ final ModuleSetAssemblyPhase phase = new ModuleSetAssemblyPhase( projectBuilder, logger );
return phase;
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?rev=999612&r1=999611&r2=999612&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java Tue Sep 21 20:34:50 2010
@@ -19,19 +19,6 @@ package org.apache.maven.plugin.assembly
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-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.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.DefaultAssemblyContext;
@@ -39,7 +26,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoBuilderConfigSourceWrapper;
import org.apache.maven.plugin.assembly.archive.phase.wrappers.RepoInfoWrapper;
-import org.apache.maven.plugin.assembly.artifact.DependencyResolver;
import org.apache.maven.plugin.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.Repository;
@@ -47,7 +33,6 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.shared.repository.RepositoryAssembler;
import org.apache.maven.shared.repository.RepositoryAssemblyException;
import org.codehaus.plexus.archiver.Archiver;
@@ -60,12 +45,20 @@ import org.codehaus.plexus.util.StringUt
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
public class RepositoryAssemblyPhaseTest
extends TestCase
{
- private TestFileManager fileManager = new TestFileManager( "repository-phase.test.", "" );
+ private final TestFileManager fileManager = new TestFileManager( "repository-phase.test.", "" );
+ @Override
public void tearDown()
throws IOException
{
@@ -75,27 +68,26 @@ public class RepositoryAssemblyPhaseTest
public void testExecute_ShouldNotIncludeRepositoryIfNonSpecifiedInAssembly()
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForRepositoryAssembler macRepo = new MockAndControlForRepositoryAssembler( mm );
- MockAndControlForDependencyResolver macResolver = new MockAndControlForDependencyResolver( mm );
- MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
- MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+ final MockAndControlForRepositoryAssembler macRepo = new MockAndControlForRepositoryAssembler( mm );
+ final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+ final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
- File tempRoot = fileManager.createTempDir();
+ final File tempRoot = fileManager.createTempDir();
macCS.expectGetTemporaryRootDirectory( tempRoot );
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
mm.replayAll();
- createPhase( macRepo.repositoryAssembler, macResolver.dependencyResolver,
- new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly, macArchiver.archiver,
- macCS.configSource,
- new DefaultAssemblyContext() );
+ createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly,
+ macArchiver.archiver,
+ macCS.configSource,
+ new DefaultAssemblyContext() );
mm.verifyAll();
}
@@ -103,36 +95,31 @@ public class RepositoryAssemblyPhaseTest
public void testExecute_ShouldIncludeOneRepository()
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
{
- MockManager mm = new MockManager();
+ final MockManager mm = new MockManager();
- MockAndControlForRepositoryAssembler macRepo = new MockAndControlForRepositoryAssembler( mm );
- MockAndControlForDependencyResolver macResolver = new MockAndControlForDependencyResolver( mm );
- MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
- MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
+ final MockAndControlForRepositoryAssembler macRepo = new MockAndControlForRepositoryAssembler( mm );
+ final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
+ final MockAndControlForConfigSource macCS = new MockAndControlForConfigSource( mm );
- File tempRoot = fileManager.createTempDir();
+ final File tempRoot = fileManager.createTempDir();
macCS.expectGetTemporaryRootDirectory( tempRoot );
macCS.expectGetProject( new MavenProject( new Model() ) );
macCS.expectGetFinalName( "final-name" );
- macCS.expectGetLocalRepository();
- macCS.expectGetRemoteRepositories( Collections.EMPTY_LIST );
- macResolver.expectResolveDependencies( Collections.EMPTY_SET );
-
- Assembly assembly = new Assembly();
+ final Assembly assembly = new Assembly();
assembly.setId( "test" );
- Repository repo = new Repository();
+ final Repository repo = new Repository();
repo.setOutputDirectory( "out" );
repo.setDirectoryMode( "777" );
repo.setFileMode( "777" );
- int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
+ final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
- File outDir = new File( tempRoot, "out" );
+ final File outDir = new File( tempRoot, "out" );
macArchiver.expectModeChange( -1, -1, mode, mode, true );
macArchiver.expectAddDirectory( outDir, "out/", null, null );
@@ -143,18 +130,17 @@ public class RepositoryAssemblyPhaseTest
mm.replayAll();
- createPhase( macRepo.repositoryAssembler, macResolver.dependencyResolver,
- new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly, macArchiver.archiver,
- macCS.configSource,
- new DefaultAssemblyContext() );
+ createPhase( macRepo.repositoryAssembler, new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ).execute( assembly,
+ macArchiver.archiver,
+ macCS.configSource,
+ new DefaultAssemblyContext() );
mm.verifyAll();
}
- private RepositoryAssemblyPhase createPhase( RepositoryAssembler repositoryAssembler, DependencyResolver resolver,
- Logger logger )
+ private RepositoryAssemblyPhase createPhase( final RepositoryAssembler repositoryAssembler, final Logger logger )
{
- RepositoryAssemblyPhase phase = new RepositoryAssemblyPhase( repositoryAssembler, resolver );
+ final RepositoryAssemblyPhase phase = new RepositoryAssemblyPhase( repositoryAssembler );
phase.enableLogging( logger );
return phase;
@@ -166,7 +152,7 @@ public class RepositoryAssemblyPhaseTest
MockControl control;
- public MockAndControlForArchiver( MockManager mockManager )
+ public MockAndControlForArchiver( final MockManager mockManager )
{
control = MockControl.createControl( Archiver.class );
mockManager.add( control );
@@ -174,19 +160,20 @@ public class RepositoryAssemblyPhaseTest
archiver = (Archiver) control.getMock();
}
- public void expectAddDirectory( File outDir, String location, String[] includes, String[] excludes )
+ public void expectAddDirectory( final File outDir, final String location, final String[] includes,
+ final String[] excludes )
{
try
{
- DefaultFileSet fs = new DefaultFileSet();
+ final DefaultFileSet fs = new DefaultFileSet();
fs.setDirectory( outDir );
fs.setPrefix( location );
fs.setIncludes( includes );
fs.setExcludes( excludes );
-
+
archiver.addFileSet( fs );
}
- catch ( ArchiverException e )
+ catch ( final ArchiverException e )
{
Assert.fail( "Should never happen." );
}
@@ -194,60 +181,62 @@ public class RepositoryAssemblyPhaseTest
control.setMatcher( new AbstractMatcher()
{
- protected boolean argumentMatches( Object expected, Object actual )
+ @Override
+ protected boolean argumentMatches( final Object expected, final Object actual )
{
- FileSet e = (FileSet) expected;
- FileSet a = (FileSet) actual;
-
+ final FileSet e = (FileSet) expected;
+ final FileSet a = (FileSet) actual;
+
if ( !eq( e.getDirectory(), a.getDirectory() ) )
{
System.out.println( "FileSet directory expected: " + e.getDirectory() + "\nActual: "
- + a.getDirectory() );
-
+ + a.getDirectory() );
+
return false;
}
-
+
if ( !eq( e.getPrefix(), a.getPrefix() ) )
{
System.out.println( "FileSet prefix expected: " + e.getPrefix() + "\nActual: " + a.getPrefix() );
-
+
return false;
}
-
+
if ( !areq( e.getIncludes(), a.getIncludes() ) )
{
System.out.println( "FileSet includes expected: " + arToStr( e.getIncludes() ) + "\nActual: "
- + arToStr( a.getIncludes() ) );
-
+ + arToStr( a.getIncludes() ) );
+
return false;
}
-
+
if ( !areq( e.getExcludes(), a.getExcludes() ) )
{
System.out.println( "FileSet excludes expected: " + arToStr( e.getExcludes() ) + "\nActual: "
- + arToStr( a.getExcludes() ) );
-
- return false;
+ + arToStr( a.getExcludes() ) );
+
+ return false;
}
-
+
return true;
}
- protected String argumentToString( Object argument )
+ @Override
+ protected String argumentToString( final Object argument )
{
- FileSet a = (FileSet) argument;
-
+ final FileSet a = (FileSet) argument;
+
return argument == null ? "Null FileSet" : "FileSet:[dir=" + a.getDirectory() + ", prefix: "
- + a.getPrefix() + "\nincludes:\n" + arToStr( a.getIncludes() ) + "\nexcludes:\n"
- + arToStr( a.getExcludes() ) + "]";
+ + a.getPrefix() + "\nincludes:\n" + arToStr( a.getIncludes() ) + "\nexcludes:\n"
+ + arToStr( a.getExcludes() ) + "]";
}
-
- private String arToStr( String[] array )
+
+ private String arToStr( final String[] array )
{
return array == null ? "-EMPTY-" : StringUtils.join( array, "\n\t" );
}
- private boolean areq( String[] first, String[] second )
+ private boolean areq( final String[] first, final String[] second )
{
if ( ( first == null || first.length == 0 ) && ( second == null || second.length == 0 ) )
{
@@ -267,7 +256,7 @@ public class RepositoryAssemblyPhaseTest
}
}
- private boolean eq( Object first, Object second )
+ private boolean eq( final Object first, final Object second )
{
if ( first == null && second == null )
{
@@ -286,13 +275,14 @@ public class RepositoryAssemblyPhaseTest
return first.equals( second );
}
}
-
- });
-
+
+ } );
+
control.setVoidCallable( MockControl.ONE_OR_MORE );
}
- void expectModeChange( int defaultDirMode, int defaultFileMode, int dirMode, int fileMode, boolean expectTwoSets )
+ void expectModeChange( final int defaultDirMode, final int defaultFileMode, final int dirMode,
+ final int fileMode, final boolean expectTwoSets )
{
archiver.getOverrideDirectoryMode();
control.setReturnValue( defaultDirMode );
@@ -329,55 +319,30 @@ public class RepositoryAssemblyPhaseTest
MockControl control;
- ArtifactRepository localRepo;
-
- MockControl localRepoCtl;
-
- final MockManager mockManager;
-
- public MockAndControlForConfigSource( MockManager mockManager )
+ public MockAndControlForConfigSource( final MockManager mockManager )
{
- this.mockManager = mockManager;
-
control = MockControl.createControl( AssemblerConfigurationSource.class );
mockManager.add( control );
configSource = (AssemblerConfigurationSource) control.getMock();
-
+
configSource.getMavenSession();
control.setReturnValue( null, MockControl.ZERO_OR_MORE );
}
- public void expectGetRemoteRepositories( List remoteRepos )
- {
- configSource.getRemoteRepositories();
- control.setReturnValue( remoteRepos, MockControl.ONE_OR_MORE );
- }
-
- public void expectGetLocalRepository()
- {
- localRepoCtl = MockControl.createControl( ArtifactRepository.class );
- mockManager.add( localRepoCtl );
-
- localRepo = (ArtifactRepository) localRepoCtl.getMock();
-
- configSource.getLocalRepository();
- control.setReturnValue( localRepo, MockControl.ONE_OR_MORE );
- }
-
- public void expectGetProject( MavenProject project )
+ public void expectGetProject( final MavenProject project )
{
configSource.getProject();
control.setReturnValue( project, MockControl.ONE_OR_MORE );
}
- public void expectGetFinalName( String finalName )
+ public void expectGetFinalName( final String finalName )
{
configSource.getFinalName();
control.setReturnValue( finalName, MockControl.ONE_OR_MORE );
}
- public void expectGetTemporaryRootDirectory( File tempRoot )
+ public void expectGetTemporaryRootDirectory( final File tempRoot )
{
configSource.getTemporaryRootDirectory();
control.setReturnValue( tempRoot, MockControl.ONE_OR_MORE );
@@ -391,51 +356,13 @@ public class RepositoryAssemblyPhaseTest
// }
}
- private final class MockAndControlForDependencyResolver
- {
-
- MockControl dependencyResolverCtl;
-
- DependencyResolver dependencyResolver;
-
- public MockAndControlForDependencyResolver( MockManager mm )
- {
- dependencyResolverCtl = MockControl.createControl( DependencyResolver.class );
- mm.add( dependencyResolverCtl );
-
- dependencyResolver = (DependencyResolver) dependencyResolverCtl.getMock();
- }
-
- public void expectResolveDependencies( Set resolvedArtifacts )
- {
- try
- {
- dependencyResolver.resolveDependencies( null, null, null, null, null, true );
- dependencyResolverCtl.setMatcher( MockControl.ALWAYS_MATCHER );
- dependencyResolverCtl.setReturnValue( resolvedArtifacts );
- }
- catch ( ArtifactResolutionException e )
- {
- Assert.fail( "Should never happen!" );
- }
- catch ( ArtifactNotFoundException e )
- {
- Assert.fail( "Should never happen!" );
- }
- catch ( InvalidDependencyVersionException e )
- {
- Assert.fail( "Should never happen!" );
- }
- }
- }
-
private final class MockAndControlForRepositoryAssembler
{
RepositoryAssembler repositoryAssembler;
MockControl control;
- MockAndControlForRepositoryAssembler( MockManager mockManager )
+ MockAndControlForRepositoryAssembler( final MockManager mockManager )
{
control = MockControl.createControl( RepositoryAssembler.class );
mockManager.add( control );
@@ -443,7 +370,8 @@ public class RepositoryAssemblyPhaseTest
repositoryAssembler = (RepositoryAssembler) control.getMock();
}
- public void expectAssemble( File dir, Repository repo, AssemblerConfigurationSource configSource )
+ public void expectAssemble( final File dir, final Repository repo,
+ final AssemblerConfigurationSource configSource )
{
try
{
@@ -451,7 +379,7 @@ public class RepositoryAssemblyPhaseTest
new RepoBuilderConfigSourceWrapper( configSource ) );
control.setMatcher( MockControl.ALWAYS_MATCHER );
}
- catch ( RepositoryAssemblyException e )
+ catch ( final RepositoryAssemblyException e )
{
Assert.fail( "Should never happen" );
}