You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/04/21 19:28:24 UTC
[maven-assembly-plugin] 02/03: Inline configSource
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch setupInterpolators
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 3f43bd6250d26592c160c5c2b8ecc64c6c9665c5
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue Apr 21 19:58:56 2020 +0200
Inline configSource
---
.../phase/DependencySetAssemblyPhaseTest.java | 37 ++++-
.../archive/phase/FileSetAssemblyPhaseTest.java | 33 ++--
.../archive/phase/ModuleSetAssemblyPhaseTest.java | 182 +++++++++++++++------
.../assembly/archive/task/AddArtifactTaskTest.java | 31 ++--
.../archive/task/AddDependencySetsTaskTest.java | 79 +++++++--
.../assembly/archive/task/AddFileSetsTaskTest.java | 33 ++--
.../MockAndControlForAddArtifactTask.java | 32 ----
.../MockAndControlForAddDependencySetsTask.java | 50 +-----
.../MockAndControlForAddFileSetsTask.java | 45 +----
9 files changed, 293 insertions(+), 229 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
index c37b404..5b4e0ad 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
@@ -1,5 +1,7 @@
package org.apache.maven.plugins.assembly.archive.phase;
+import static org.easymock.EasyMock.expect;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,13 +22,17 @@ package org.apache.maven.plugins.assembly.archive.phase;
*/
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
+import java.util.Properties;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
+import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
@@ -36,6 +42,7 @@ import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.DependencySet;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.classextension.EasyMockSupport;
@@ -75,14 +82,26 @@ public class DependencySetAssemblyPhaseTest
final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mm, project );
- macTask.expectCSGetRepositories( null, null );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
+
+ expect( configSource.getLocalRepository() ).andReturn( null ).anyTimes();
+ expect( configSource.getRemoteRepositories() ).andReturn( null ).anyTimes();
macTask.expectGetDestFile( new File( "junk" ) );
// macTask.expectAddFile( artifactFile, "out/dep", 10 );
project.setArtifacts( Collections.singleton( artifact ) );
- macTask.expectCSGetFinalName( "final-name" );
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).anyTimes();
final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
@@ -95,7 +114,7 @@ public class DependencySetAssemblyPhaseTest
mm.replayAll();
createPhase( macTask, logger, macTask.dependencyResolver ).execute( assembly, macTask.archiver,
- macTask.configSource );
+ configSource );
mm.verifyAll();
}
@@ -123,12 +142,22 @@ public class DependencySetAssemblyPhaseTest
final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, null );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( null ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
macTask.expectResolveDependencySets();
mm.replayAll();
- createPhase( macTask, logger, macTask.dependencyResolver ).execute( assembly, null, macTask.configSource );
+ createPhase( macTask, logger, macTask.dependencyResolver ).execute( assembly, null, configSource );
mm.verifyAll();
}
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
index eb43fb5..03c1544 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhaseTest.java
@@ -19,14 +19,16 @@ package org.apache.maven.plugins.assembly.archive.phase;
* under the License.
*/
+import static org.mockito.Mockito.mock;
+
import org.apache.maven.model.Model;
-import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest;
import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask;
-import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.FileSet;
import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.logging.Logger;
import org.easymock.EasyMock;
import org.easymock.classextension.EasyMockSupport;
@@ -48,17 +50,16 @@ public class FileSetAssemblyPhaseTest
assembly.setId( "test" );
final MockAndControlForLogger macLogger = new MockAndControlForLogger();
- final MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mm );
-
- mm.replayAll();
+
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
+ Archiver archiver = mock( Archiver.class );
- createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource );
-
- mm.verifyAll();
+ createPhase( macLogger ).execute( assembly, archiver, configSource );
}
- @Test public void testShouldAddOneFileSet()
- throws ArchiveCreationException, AssemblyFormattingException
+ @Test
+ public void testShouldAddOneFileSet()
+ throws Exception
{
final Assembly assembly = new Assembly();
@@ -75,8 +76,10 @@ public class FileSetAssemblyPhaseTest
final MockAndControlForLogger macLogger = new MockAndControlForLogger();
final MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mm );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
- macTask.expectGetArchiveBaseDirectory();
+ expect( configSource.getArchiveBaseDirectory() ).andReturn( macTask.archiveBaseDir ).anyTimes();
final MavenProject project = new MavenProject( new Model() );
@@ -87,13 +90,15 @@ public class FileSetAssemblyPhaseTest
final int[] modes = { -1, -1, dirMode, fileMode };
- macTask.expectAdditionOfSingleFileSet( project, "final-name", false, modes, 1, true );
+ macTask.expectAdditionOfSingleFileSet( project, false, modes, 1, true );
+ expect( configSource.getProject() ).andReturn( project ).atLeastOnce();
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
- createPhase( macLogger ).execute( assembly, macTask.archiver, macTask.configSource );
+ createPhase( macLogger ).execute( assembly, macTask.archiver, configSource );
mm.verifyAll();
}
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
index 297ac95..beefbb9 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.assembly.archive.phase;
*/
import static java.util.Collections.singleton;
+import static org.easymock.EasyMock.expect;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -34,10 +35,13 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Properties;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
+import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest;
@@ -53,6 +57,7 @@ import org.apache.maven.plugins.assembly.model.ModuleSources;
import org.apache.maven.plugins.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.classextension.EasyMock;
@@ -134,9 +139,11 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = new MavenProject( model );
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
- macTask.expectGetFinalName( null );
+ expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
final FileSet fs = new FileSet();
@@ -153,14 +160,14 @@ public class ModuleSetAssemblyPhaseTest
artifactProject.setArtifact( artifact );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
final FileSet result =
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources,
artifactProject,
- macTask.configSource );
+ configSource );
assertEquals( "artifact/", result.getOutputDirectory() );
@@ -178,9 +185,11 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = new MavenProject( model );
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
- macTask.expectGetFinalName( null );
+ expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
final FileSet fs = new FileSet();
fs.setOutputDirectory( "out" );
@@ -198,14 +207,14 @@ public class ModuleSetAssemblyPhaseTest
when( artifact.getArtifactId() ).thenReturn( "artifact" );
artifactProject.setArtifact( artifact );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
final FileSet result =
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources,
artifactProject,
- macTask.configSource );
+ configSource );
assertEquals( "artifact/out/", result.getOutputDirectory() );
@@ -218,9 +227,12 @@ public class ModuleSetAssemblyPhaseTest
{
final EasyMockSupport mm = new EasyMockSupport();
- final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, null );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( null ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
- macTask.expectGetFinalName( null );
+
+ expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
final FileSet fs = new FileSet();
@@ -241,13 +253,13 @@ public class ModuleSetAssemblyPhaseTest
Artifact artifact = mock( Artifact.class );
project.setArtifact( artifact );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
final FileSet result =
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources, project,
- macTask.configSource );
+ configSource );
assertEquals( 1, result.getExcludes().size() );
assertEquals( "submodule/**", result.getExcludes().get( 0 ) );
@@ -274,6 +286,9 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, project );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
final MavenProject module = createProject( "group", "module", "version", project );
@@ -286,8 +301,8 @@ public class ModuleSetAssemblyPhaseTest
projects.add( module );
- macTask.expectGetReactorProjects( projects );
- macTask.expectGetFinalName( "final-name" );
+ expect( configSource.getReactorProjects() ).andReturn( projects ).atLeastOnce();
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectGetMode( 0777, 0777 );
@@ -315,12 +330,12 @@ public class ModuleSetAssemblyPhaseTest
final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
macTask.expectResolveDependencySets();
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
final ModuleSetAssemblyPhase phase = createPhase( logger, macTask.dependencyResolver, null );
- phase.execute( assembly, macTask.archiver, macTask.configSource );
+ phase.execute( assembly, macTask.archiver, configSource );
mm.verifyAll();
}
@@ -339,6 +354,9 @@ public class ModuleSetAssemblyPhaseTest
final EasyMockSupport mm = new EasyMockSupport();
final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( null ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
final ModuleBinaries binaries = new ModuleBinaries();
@@ -360,7 +378,7 @@ public class ModuleSetAssemblyPhaseTest
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( null, null, binaries,
projects,
macTask.archiver,
- macTask.configSource );
+ configSource );
mm.verifyAll();
}
@@ -372,13 +390,17 @@ public class ModuleSetAssemblyPhaseTest
final EasyMockSupport mm = new EasyMockSupport();
final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm, null );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( null ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
+
Artifact artifact = mock( Artifact.class );
when( artifact.getClassifier() ).thenReturn( "test" );
final File artifactFile = temporaryFolder.newFile();
when( artifact.getFile() ).thenReturn( artifactFile );
- macTask.expectGetFinalName( "final-name" );
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectGetMode( 0222, 0222 );
macTask.expectAddFile( artifactFile, "out/artifact",
@@ -400,7 +422,7 @@ public class ModuleSetAssemblyPhaseTest
final Set<MavenProject> projects = singleton( project );
macTask.expectResolveDependencySets();
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
@@ -408,7 +430,7 @@ public class ModuleSetAssemblyPhaseTest
createPhase( logger, macTask.dependencyResolver, null ).addModuleBinaries( null, null, binaries, projects,
macTask.archiver,
- macTask.configSource );
+ configSource );
mm.verifyAll();
}
@@ -420,6 +442,9 @@ public class ModuleSetAssemblyPhaseTest
final EasyMockSupport mm = new EasyMockSupport();
final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( null ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
Artifact artifact = mock( Artifact.class );
when( artifact.getClassifier() ).thenReturn( "test" );
@@ -444,7 +469,7 @@ public class ModuleSetAssemblyPhaseTest
try
{
createPhase( logger, null ).addModuleBinaries( null, null, binaries, projects, macTask.archiver,
- macTask.configSource );
+ configSource );
fail( "Should throw an invalid configuration exception because of module with missing attachment." );
}
@@ -465,12 +490,15 @@ public class ModuleSetAssemblyPhaseTest
final EasyMockSupport mm = new EasyMockSupport();
final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( null ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
Artifact artifact = mock( Artifact.class );
final File artifactFile = temporaryFolder.newFile();
when( artifact.getFile() ).thenReturn( artifactFile );
- macTask.expectGetFinalName( "final-name" );
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectAddFile( artifactFile, "out/artifact",
TypeConversionUtils.modeToInt( "777",
@@ -491,7 +519,7 @@ public class ModuleSetAssemblyPhaseTest
final Set<MavenProject> projects = singleton( project );
macTask.expectResolveDependencySets();
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
@@ -499,7 +527,7 @@ public class ModuleSetAssemblyPhaseTest
createPhase( logger, macTask.dependencyResolver, null ).addModuleBinaries( null, null, binaries, projects,
macTask.archiver,
- macTask.configSource );
+ configSource );
mm.verifyAll();
}
@@ -529,6 +557,9 @@ public class ModuleSetAssemblyPhaseTest
final EasyMockSupport mm = new EasyMockSupport();
final MockAndControlForAddArtifactTask macTask = new MockAndControlForAddArtifactTask( mm );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( null ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
Artifact artifact = mock( Artifact.class );
final File artifactFile = temporaryFolder.newFile();
@@ -537,7 +568,7 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
project.setArtifact( artifact );
- macTask.expectGetFinalName( "final-name" );
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectGetMode( 0222, 0222 );
@@ -550,13 +581,13 @@ public class ModuleSetAssemblyPhaseTest
binaries.setOutputFileNameMapping( "artifact" );
binaries.setUnpack( false );
binaries.setFileMode( "777" );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ),
null ).addModuleArtifact( artifact, project, macTask.archiver,
- macTask.configSource, binaries );
+ configSource, binaries );
mm.verifyAll();
}
@@ -576,10 +607,12 @@ public class ModuleSetAssemblyPhaseTest
final EasyMockSupport mm = new EasyMockSupport();
final MockAndControlForAddFileSetsTask macTask = new MockAndControlForAddFileSetsTask( mm );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
final MavenProject project = createProject( "group", "artifact", "version", null );
- macTask.expectGetProject( project );
+ expect( configSource.getProject() ).andReturn( project ).atLeastOnce();
project.setArtifact( mock( Artifact.class ) );
@@ -594,20 +627,21 @@ public class ModuleSetAssemblyPhaseTest
sources.addFileSet( fs );
- macTask.expectGetArchiveBaseDirectory();
+ expect( configSource.getArchiveBaseDirectory() ).andReturn( macTask.archiveBaseDir ).anyTimes();
final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
final int[] modes = { -1, -1, mode, mode };
- macTask.expectAdditionOfSingleFileSet( project, "final-name", false, modes, 1, true, false );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ macTask.expectAdditionOfSingleFileSet( project, false, modes, 1, true );
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
createPhase( logger, null ).addModuleSourceFileSets( sources, projects, macTask.archiver,
- macTask.configSource );
+ configSource );
mm.verifyAll();
}
@@ -620,12 +654,21 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mm, project );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
+
final List<MavenProject> projects = Collections.singletonList( project );
- macTask.expectGetReactorProjects( projects );
+ expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
@@ -633,7 +676,7 @@ public class ModuleSetAssemblyPhaseTest
mm.replayAll();
final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
assertTrue( moduleProjects.isEmpty() );
@@ -648,8 +691,16 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mm, project );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
final MavenProject project2 = createProject( "group", "artifact2", "version", null );
@@ -657,7 +708,7 @@ public class ModuleSetAssemblyPhaseTest
projects.add( project );
projects.add( project2 );
- macTask.expectGetReactorProjects( projects );
+ expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
@@ -665,7 +716,7 @@ public class ModuleSetAssemblyPhaseTest
mm.replayAll();
final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
assertTrue( moduleProjects.isEmpty() );
@@ -680,8 +731,17 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mm, project );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
+
final MavenProject project2 = createProject( "group", "artifact2", "version", project );
@@ -689,7 +749,7 @@ public class ModuleSetAssemblyPhaseTest
projects.add( project );
projects.add( project2 );
- macTask.expectGetReactorProjects( projects );
+ expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
@@ -697,7 +757,7 @@ public class ModuleSetAssemblyPhaseTest
mm.replayAll();
final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
assertFalse( moduleProjects.isEmpty() );
@@ -716,8 +776,17 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mm, project );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
+
final MavenProject project2 = createProject( "group", "artifact2", "version", project );
final MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
@@ -727,7 +796,7 @@ public class ModuleSetAssemblyPhaseTest
projects.add( project2 );
projects.add( project3 );
- macTask.expectGetReactorProjects( projects );
+ expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
@@ -735,7 +804,7 @@ public class ModuleSetAssemblyPhaseTest
mm.replayAll();
final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
assertEquals( 2, moduleProjects.size() );
@@ -756,8 +825,17 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
- final MockAndControlForAddDependencySetsTask macTask =
- new MockAndControlForAddDependencySetsTask( mm, project );
+ AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
+
Artifact artifact1 = mock( Artifact.class );
project.setArtifact( artifact1 );
@@ -784,7 +862,7 @@ public class ModuleSetAssemblyPhaseTest
projects.add( project2 );
projects.add( project3 );
- macTask.expectGetReactorProjects( projects );
+ expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
@@ -794,7 +872,7 @@ public class ModuleSetAssemblyPhaseTest
mm.replayAll();
final Set<MavenProject> moduleProjects =
- ModuleSetAssemblyPhase.getModuleProjects( moduleSet, macTask.configSource, logger );
+ ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
assertTrue( moduleProjects.isEmpty() );
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
index 32d13fa..fa7d867 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.assembly.archive.task;
*/
import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.expect;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.junit.Assert.fail;
@@ -32,7 +33,9 @@ import java.util.Arrays;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.model.Model;
+import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
+import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest;
import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddArtifactTask;
import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.model.DependencySet;
@@ -56,6 +59,8 @@ public class AddArtifactTaskTest
private EasyMockSupport mockManager;
private MockAndControlForAddArtifactTask mac;
+
+ private AssemblerConfigurationSource configSource;
@Before
public void setUp()
@@ -71,7 +76,11 @@ public class AddArtifactTaskTest
MavenProject mainProject = new MavenProject( model );
mac = new MockAndControlForAddArtifactTask( mockManager, mainProject );
- mac.expectGetFinalName( "final-name" );
+ configSource = mockManager.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getProject() ).andReturn( mainProject ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
+
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
}
@Test
@@ -87,13 +96,13 @@ public class AddArtifactTaskTest
mac.expectGetMode( 0222, 0222 );
mac.expectGetDestFile( new File( "junk" ) );
mac.expectAddFile( artifactFile, outputLocation );
- mac.expectInterpolators();
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
AddArtifactTask task = createTask( artifact );
- task.execute( mac.archiver, mac.configSource );
+ task.execute( mac.archiver, configSource );
mockManager.verifyAll();
}
@@ -118,7 +127,7 @@ public class AddArtifactTaskTest
mac.expectGetDestFile( new File( "junk" ) );
mac.expectAddFile( artifactFile, outputDir + artifactId + "-" + version + "." + ext );
- mac.expectInterpolators();
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
AddArtifactTask task =
@@ -133,7 +142,7 @@ public class AddArtifactTaskTest
MavenProject project = new MavenProject( model );
task.setProject( project );
- task.execute( mac.archiver, mac.configSource );
+ task.execute( mac.archiver, configSource );
mockManager.verifyAll();
}
@@ -152,7 +161,7 @@ public class AddArtifactTaskTest
throws ArchiveCreationException, AssemblyFormattingException, IOException
{
mac.expectModeChange( -1, -1, -1, -1, 1 );
- mac.expectInterpolators();
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
Artifact artifact = mock( Artifact.class );
when( artifact.getFile() ).thenReturn( temporaryFolder.newFile() );
@@ -173,7 +182,7 @@ public class AddArtifactTaskTest
task.setUnpack( true );
- task.execute( mac.archiver, mac.configSource );
+ task.execute( mac.archiver, configSource );
mockManager.verifyAll();
}
@@ -186,7 +195,7 @@ public class AddArtifactTaskTest
int fileMode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
mac.expectModeChange( -1, -1, directoryMode, fileMode, 2 );
- mac.expectInterpolators();
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
Artifact artifact = mock( Artifact.class );
when( artifact.getFile() ).thenReturn( temporaryFolder.newFile() );
@@ -210,7 +219,7 @@ public class AddArtifactTaskTest
task.setDirectoryMode( directoryMode );
task.setFileMode( fileMode );
- task.execute( mac.archiver, mac.configSource );
+ task.execute( mac.archiver, configSource );
mockManager.verifyAll();
}
@@ -229,7 +238,7 @@ public class AddArtifactTaskTest
mac.expectGetDestFile( new File( "junk" ) );
mac.expectAddArchivedFileSet();
- mac.expectInterpolators();
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
@@ -239,7 +248,7 @@ public class AddArtifactTaskTest
task.setIncludes( Arrays.asList( includes ) );
task.setExcludes( Arrays.asList( excludes ) );
- task.execute( mac.archiver, mac.configSource );
+ task.execute( mac.archiver, configSource );
mockManager.verifyAll();
}
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
index 464de0a..0c5ad4f 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
@@ -1,5 +1,7 @@
package org.apache.maven.plugins.assembly.archive.task;
+import static org.easymock.EasyMock.expect;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,7 +29,9 @@ import static org.mockito.Mockito.when;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
+import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest;
@@ -36,6 +40,7 @@ import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.model.DependencySet;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.classextension.EasyMockSupport;
@@ -47,6 +52,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Properties;
import java.util.Set;
public class AddDependencySetsTaskTest
@@ -103,18 +109,30 @@ public class AddDependencySetsTaskTest
final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mockManager, mainProject );
+ AssemblerConfigurationSource configSource = mockManager.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( mainProject ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
+
macTask.expectBuildFromRepository( depProject );
- macTask.expectCSGetFinalName( mainAid + "-" + mainVer );
+ expect( configSource.getFinalName() ).andReturn( mainAid + "-" + mainVer ).anyTimes();
- macTask.expectCSGetRepositories( null, null );
+ expect( configSource.getLocalRepository() ).andReturn( null ).anyTimes();
+ expect( configSource.getRemoteRepositories() ).andReturn( null ).anyTimes();
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectAddFile( newFile, outDir + depAid + "-" + depVer + "." + depExt, 10 );
macTask.expectGetMode( 0222, 0222 );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
@@ -124,7 +142,7 @@ public class AddDependencySetsTaskTest
new AddDependencySetsTask( Collections.singletonList( ds ), Collections.singleton( depArtifact ),
depProject, macTask.projectBuilder, logger );
- task.addDependencySet( ds, macTask.archiver, macTask.configSource );
+ task.addDependencySet( ds, macTask.archiver, configSource );
mockManager.verifyAll();
}
@@ -137,6 +155,17 @@ public class AddDependencySetsTaskTest
final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mockManager );
+
+ AssemblerConfigurationSource configSource = mockManager.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( null ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
final DependencySet ds = new DependencySet();
ds.setOutputDirectory( "/out" );
@@ -148,7 +177,7 @@ public class AddDependencySetsTaskTest
final AddDependencySetsTask task =
new AddDependencySetsTask( Collections.singletonList( ds ), null, project, macTask.projectBuilder, logger );
- task.addDependencySet( ds, null, macTask.configSource );
+ task.addDependencySet( ds, null, configSource );
mockManager.verifyAll();
}
@@ -164,6 +193,17 @@ public class AddDependencySetsTaskTest
final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mockManager, new MavenProject( new Model() ) );
+ AssemblerConfigurationSource configSource = mockManager.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
+
final String aid = "test-dep";
final String version = "2.0-SNAPSHOT";
@@ -183,15 +223,16 @@ public class AddDependencySetsTaskTest
macTask.expectGetDestFile( destFile );
macTask.expectBuildFromRepository( pbe );
- macTask.expectCSGetRepositories( null, null );
- macTask.expectCSGetFinalName( "final-name" );
+ expect( configSource.getLocalRepository() ).andReturn( null ).anyTimes();
+ expect( configSource.getRemoteRepositories() ).andReturn( null ).anyTimes();
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).anyTimes();
macTask.expectAddFile( file, "out/" + aid + "-" + version + "." + type );
macTask.expectGetMode( 0222, 0222 );
final DependencySet ds = new DependencySet();
ds.setOutputDirectory( "/out" );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
@@ -201,7 +242,7 @@ public class AddDependencySetsTaskTest
new AddDependencySetsTask( Collections.singletonList( ds ), Collections.singleton( depArtifact ),
project, macTask.projectBuilder, logger );
- task.addDependencySet( ds, macTask.archiver, macTask.configSource );
+ task.addDependencySet( ds, macTask.archiver, configSource );
mockManager.verifyAll();
}
@@ -238,6 +279,17 @@ public class AddDependencySetsTaskTest
final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mockManager, new MavenProject( new Model() ) );
+ AssemblerConfigurationSource configSource = mockManager.createMock( AssemblerConfigurationSource.class );
+ MavenSession session = mock( MavenSession.class );
+
+ when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
+ when( session.getSystemProperties() ).thenReturn( new Properties() );
+ when( session.getUserProperties() ).thenReturn( new Properties() );
+ when( session.getExecutionProperties() ).thenReturn( new Properties() );
+
+ expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
+
Artifact artifact = mock( Artifact.class );
final File artifactFile = temporaryFolder.newFile();
@@ -253,8 +305,9 @@ public class AddDependencySetsTaskTest
}
macTask.expectGetDestFile( new File( "junk" ) );
- macTask.expectCSGetFinalName( "final-name" );
- macTask.expectCSGetRepositories( null, null );
+ expect( configSource.getFinalName() ).andReturn( "final-name" ).anyTimes();
+ expect( configSource.getLocalRepository() ).andReturn( null ).anyTimes();
+ expect( configSource.getRemoteRepositories() ).andReturn( null ).anyTimes();
final MavenProject depProject = new MavenProject( new Model() );
@@ -267,11 +320,11 @@ public class AddDependencySetsTaskTest
Collections.singleton(
artifact ), project,
macTask.projectBuilder, logger );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
- task.addDependencySet( ds, macTask.archiver, macTask.configSource );
+ task.addDependencySet( ds, macTask.archiver, configSource );
mockManager.verifyAll();
}
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
index 98d861f..2d4d461 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTaskTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.assembly.archive.task;
*/
import org.apache.maven.model.Model;
+import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest;
import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddFileSetsTask;
@@ -48,6 +49,8 @@ public class AddFileSetsTaskTest
private EasyMockSupport mockManager;
private MockAndControlForAddFileSetsTask macTask;
+
+ private AssemblerConfigurationSource configSource;
@Before
public void setUp()
@@ -55,6 +58,8 @@ public class AddFileSetsTaskTest
mockManager = new EasyMockSupport();
macTask = new MockAndControlForAddFileSetsTask( mockManager );
+ configSource = mockManager.createMock( AssemblerConfigurationSource.class );
+ expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
}
@Test
@@ -140,13 +145,14 @@ public class AddFileSetsTaskTest
final int[] modes = { -1, -1, -1, -1 };
- macTask.expectAdditionOfSingleFileSet( null, null, true, modes, 1, true, false );
+ macTask.expectAdditionOfSingleFileSet( null, true, modes, 1, true );
+ expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
// macTask.expectGetProject( null );
final MavenProject project = new MavenProject( new Model() );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
final AddFileSetsTask task = new AddFileSetsTask( new ArrayList<FileSet>() );
@@ -154,7 +160,7 @@ public class AddFileSetsTaskTest
task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
task.setProject( project );
- task.addFileSet( fs, macTask.archiver, macTask.configSource, macTask.archiveBaseDir );
+ task.addFileSet( fs, macTask.archiver, configSource, macTask.archiveBaseDir );
mockManager.verifyAll();
}
@@ -177,12 +183,13 @@ public class AddFileSetsTaskTest
final int[] modes = { -1, -1, -1, -1 };
- macTask.expectAdditionOfSingleFileSet( null, null, true, modes, 1, true, false );
+ macTask.expectAdditionOfSingleFileSet( null, true, modes, 1, true );
+ expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
//macTask.expectGetProject( null );
final MavenProject project = new MavenProject( new Model() );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
@@ -191,7 +198,7 @@ public class AddFileSetsTaskTest
task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
task.setProject( project );
- task.addFileSet( fs, macTask.archiver, macTask.configSource, archiveBaseDir );
+ task.addFileSet( fs, macTask.archiver, configSource, archiveBaseDir );
mockManager.verifyAll();
}
@@ -208,7 +215,7 @@ public class AddFileSetsTaskTest
final File archiveBaseDir = temporaryFolder.newFolder();
- macTask.expectGetFinalName( "finalName" );
+ expect( configSource.getFinalName() ).andReturn( "finalName" ).atLeastOnce();
//macTask.expectGetProject( null );
@@ -216,7 +223,7 @@ public class AddFileSetsTaskTest
expect( macTask.archiver.getOverrideFileMode() ).andReturn( -1 );
final MavenProject project = new MavenProject( new Model() );
- DefaultAssemblyArchiverTest.setupInterpolators( macTask.configSource );
+ DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mockManager.replayAll();
@@ -225,7 +232,7 @@ public class AddFileSetsTaskTest
task.setLogger( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
task.setProject( project );
- task.addFileSet( fs, macTask.archiver, macTask.configSource, archiveBaseDir );
+ task.addFileSet( fs, macTask.archiver, configSource, archiveBaseDir );
mockManager.verifyAll();
}
@@ -235,7 +242,7 @@ public class AddFileSetsTaskTest
throws Exception
{
macTask.archiveBaseDir = new File( temporaryFolder.getRoot(), "archive");
- macTask.expectGetArchiveBaseDirectory();
+ expect( configSource.getArchiveBaseDirectory() ).andReturn( macTask.archiveBaseDir ).anyTimes();
mockManager.replayAll();
@@ -243,7 +250,7 @@ public class AddFileSetsTaskTest
try
{
- task.execute( macTask.archiver, macTask.configSource );
+ task.execute( macTask.archiver, configSource );
fail( "Should throw exception due to non-existent archiveBasedir location that was provided." );
}
@@ -260,7 +267,7 @@ public class AddFileSetsTaskTest
throws Exception
{
macTask.archiveBaseDir = temporaryFolder.newFile();
- macTask.expectGetArchiveBaseDirectory();
+ expect( configSource.getArchiveBaseDirectory() ).andReturn( macTask.archiveBaseDir ).anyTimes();
mockManager.replayAll();
@@ -268,7 +275,7 @@ public class AddFileSetsTaskTest
try
{
- task.execute( macTask.archiver, macTask.configSource );
+ task.execute( macTask.archiver, configSource );
fail( "Should throw exception due to non-directory archiveBasedir location that was provided." );
}
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
index d5c8f51..2719adf 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java
@@ -50,12 +50,8 @@ public class MockAndControlForAddArtifactTask
public final Archiver archiver;
- public final AssemblerConfigurationSource configSource;
-
public final DependencyResolver dependencyResolver;
- private MavenProject project = null;
-
public MockAndControlForAddArtifactTask( final EasyMockSupport mockManager )
{
this( mockManager, null );
@@ -63,24 +59,8 @@ public class MockAndControlForAddArtifactTask
public MockAndControlForAddArtifactTask( final EasyMockSupport mockManager, final MavenProject project )
{
- this.project = project;
-
archiver = mockManager.createMock( Archiver.class );
- configSource = mockManager.createMock( AssemblerConfigurationSource.class );
dependencyResolver = mockManager.createMock( DependencyResolver.class );
-
- enableDefaultExpectations();
- }
-
- private void enableDefaultExpectations()
- {
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
- }
-
- public void expectGetFinalName( final String finalName )
- {
- expect( configSource.getFinalName() ).andReturn( finalName ).atLeastOnce();
}
public void expectGetDestFile( final File destFile )
@@ -175,12 +155,6 @@ public class MockAndControlForAddArtifactTask
}
}
- public void expectGetReactorProjects( final List<MavenProject> projects )
- {
- expect( configSource.getReactorProjects() ).andReturn( projects ).atLeastOnce();
- }
-
-
public void expectResolveDependencySets()
throws DependencyResolutionException
{
@@ -190,10 +164,4 @@ public class MockAndControlForAddArtifactTask
new LinkedHashMap<DependencySet, Set<Artifact>>() ).anyTimes();
}
-
- public void expectInterpolators()
- {
- DefaultAssemblyArchiverTest.setupInterpolators( configSource );
-
- }
}
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
index 4989f0b..d801d62 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java
@@ -21,8 +21,6 @@ package org.apache.maven.plugins.assembly.archive.task.testutils;
import junit.framework.Assert;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException;
@@ -46,20 +44,18 @@ import java.io.File;
import java.nio.charset.Charset;
import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Properties;
import java.util.Set;
import static org.easymock.EasyMock.anyInt;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expect;
+
public class MockAndControlForAddDependencySetsTask
{
public final Archiver archiver;
- public final AssemblerConfigurationSource configSource;
-
public final ProjectBuilder projectBuilder;
public final ArchiverManager archiverManager;
@@ -68,9 +64,6 @@ public class MockAndControlForAddDependencySetsTask
private final MavenProject project;
- private final MavenSession session;
-
- private final ProjectBuildingRequest projectBuildingRequest;
public MockAndControlForAddDependencySetsTask( final EasyMockSupport mockManager )
{
@@ -81,32 +74,13 @@ public class MockAndControlForAddDependencySetsTask
{
this.project = project;
- this.session = mockManager.createMock( MavenSession.class );
-
- this.projectBuildingRequest = mockManager.createMock( ProjectBuildingRequest.class );
-
archiver = mockManager.createMock( Archiver.class );
- configSource = mockManager.createMock( AssemblerConfigurationSource.class );
-
projectBuilder = mockManager.createMock( ProjectBuilder.class );
archiverManager = mockManager.createMock( ArchiverManager.class );
dependencyResolver = mockManager.createMock( DependencyResolver.class );
-
- enableDefaultExpectations();
- }
-
- private void enableDefaultExpectations()
- {
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( session.getProjectBuildingRequest() ).andReturn( projectBuildingRequest ).anyTimes();
- expect( session.getSystemProperties() ).andReturn( new Properties() ).anyTimes();
- expect( session.getUserProperties() ).andReturn( new Properties() ).anyTimes();
- expect( session.getExecutionProperties() ).andReturn( new Properties() ).anyTimes();
-
- expectGetSession( session );
}
public void expectAddArchivedFileSet()
@@ -191,28 +165,11 @@ public class MockAndControlForAddDependencySetsTask
}
}
- public void expectGetReactorProjects( final List<MavenProject> projects )
- {
- expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
- }
-
- public void expectCSGetFinalName( final String finalName )
- {
- expect( configSource.getFinalName() ).andReturn( finalName ).anyTimes();
- }
-
public void expectGetDestFile( final File destFile )
{
expect( archiver.getDestFile() ).andReturn( destFile ).anyTimes();
}
- public void expectCSGetRepositories( final ArtifactRepository localRepo,
- final List<ArtifactRepository> remoteRepos )
- {
- expect( configSource.getLocalRepository() ).andReturn( localRepo ).anyTimes();
- expect( configSource.getRemoteRepositories() ).andReturn( remoteRepos ).anyTimes();
- }
-
public void expectBuildFromRepository( final ProjectBuildingException error )
{
try
@@ -273,11 +230,6 @@ public class MockAndControlForAddDependencySetsTask
}
}
- public void expectGetSession( final MavenSession session )
- {
- expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
- }
-
public void expectResolveDependencySets()
throws DependencyResolutionException
{
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
index 3d4b573..1f3247d 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java
@@ -20,7 +20,6 @@ package org.apache.maven.plugins.assembly.archive.task.testutils;
*/
import junit.framework.Assert;
-import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
@@ -35,24 +34,13 @@ import static org.easymock.EasyMock.expect;
public class MockAndControlForAddFileSetsTask
{
-
- public final AssemblerConfigurationSource configSource;
-
public final Archiver archiver;
public File archiveBaseDir;
public MockAndControlForAddFileSetsTask( EasyMockSupport mockManager )
{
- configSource = mockManager.createMock( AssemblerConfigurationSource.class );
archiver = mockManager.createMock( Archiver.class );
-
- expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
- }
-
- public void expectGetArchiveBaseDirectory()
- {
- expect( configSource.getArchiveBaseDirectory() ).andReturn( archiveBaseDir ).anyTimes();
}
void expectModeChanges( int[] modes, int modeChangeCount )
@@ -87,16 +75,8 @@ public class MockAndControlForAddFileSetsTask
}
}
- public void expectAdditionOfSingleFileSet( MavenProject project, String finalName, boolean shouldAddDir,
- int[] modes, int modeChangeCount, boolean isDebugEnabled )
- {
- expectAdditionOfSingleFileSet( project, finalName, shouldAddDir, modes, modeChangeCount, isDebugEnabled, true );
-
- }
-
- public void expectAdditionOfSingleFileSet( MavenProject project, String finalName, boolean shouldAddDir,
- int[] modes, int modeChangeCount, boolean isDebugEnabled,
- boolean isProjectUsed )
+ public void expectAdditionOfSingleFileSet( MavenProject project, boolean shouldAddDir, int[] modes,
+ int modeChangeCount, boolean isDebugEnabled )
{
// the logger sends a debug message with this info inside the addFileSet(..) method..
if ( isDebugEnabled )
@@ -104,18 +84,11 @@ public class MockAndControlForAddFileSetsTask
expect( archiver.getOverrideDirectoryMode() ).andReturn( modes[0] );
expect( archiver.getOverrideFileMode() ).andReturn( modes[1] );
}
-
- if ( isProjectUsed )
- {
- expect( configSource.getProject() ).andReturn( project ).atLeastOnce();
- }
-
- expect( configSource.getFinalName() ).andReturn( finalName ).atLeastOnce();
-
+
if ( shouldAddDir )
{
expectModeChanges( modes, modeChangeCount );
-
+
try
{
archiver.addFileSet( (FileSet) anyObject() );
@@ -129,14 +102,4 @@ public class MockAndControlForAddFileSetsTask
}
- public void expectGetProject( MavenProject project )
- {
- expect( configSource.getProject() ).andReturn( project ).atLeastOnce();
- }
-
- public void expectGetFinalName( String finalName )
- {
- expect( configSource.getFinalName() ).andReturn( finalName ).atLeastOnce();
- }
-
}