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:25 UTC
[maven-assembly-plugin] 03/03: use mockito for setupInterpolators
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 4d4e2175f8a05ec4a65684085de29278c700a1cf
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue Apr 21 21:28:11 2020 +0200
use mockito for setupInterpolators
---
.../archive/DefaultAssemblyArchiverTest.java | 23 +-
.../archive/phase/FileSetAssemblyPhaseTest.java | 11 +-
.../archive/phase/ModuleSetAssemblyPhaseTest.java | 153 ++++--------
.../assembly/archive/task/AddArtifactTaskTest.java | 9 +-
.../archive/task/AddDependencySetsTaskTest.java | 36 ++-
.../assembly/archive/task/AddFileSetsTaskTest.java | 16 +-
.../assembly/io/DefaultAssemblyReaderTest.java | 259 +++------------------
.../assembly/utils/AssemblyFormatUtilsTest.java | 61 +----
8 files changed, 113 insertions(+), 455 deletions(-)
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java
index b92397b..93a7401 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java
@@ -82,14 +82,10 @@ public class DefaultAssemblyArchiverTest
public static void setupInterpolators( AssemblerConfigurationSource configSource )
{
- expect( configSource.getRepositoryInterpolator() ).andReturn(
- FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getCommandLinePropsInterpolator() ).andReturn(
- FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getEnvInterpolator() ).andReturn( FixedStringSearchInterpolator.create() ).anyTimes();
- expect( configSource.getMainProjectInterpolator() ).andReturn(
- FixedStringSearchInterpolator.create() ).anyTimes();
-
+ when( configSource.getRepositoryInterpolator() ).thenReturn( FixedStringSearchInterpolator.create() );
+ when( configSource.getCommandLinePropsInterpolator() ).thenReturn( FixedStringSearchInterpolator.create() );
+ when( configSource.getEnvInterpolator() ).thenReturn( FixedStringSearchInterpolator.create() );
+ when( configSource.getMainProjectInterpolator() ).thenReturn( FixedStringSearchInterpolator.create() );
}
public static void setupInterpolators( AssemblerConfigurationSource configSource, MavenProject mavenProject )
@@ -178,17 +174,6 @@ public class DefaultAssemblyArchiverTest
final Assembly assembly = new Assembly();
assembly.setId( "id" );
- // try
- // {
- // expect( macMgr.dependencyResolver.resolve( (Assembly) anyObject(), (AssemblerConfigurationSource)
- // anyObject() )).andReturn( new HashSet<Artifact>( ) );
-// macMgr.dependencyResolverControl.setMatcher( MockControl.ALWAYS_MATCHER );
- // }
- // catch ( final DependencyResolutionException e )
- // {
- // fail( "Should never happen" );
- // }
-
mm.replayAll();
final DefaultAssemblyArchiver subject = createSubject( macMgr, Collections.singletonList( phase ), null );
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 03c1544..9b83f47 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
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.assembly.archive.phase;
*/
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.apache.maven.model.Model;
import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
@@ -76,10 +77,8 @@ 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();
-
- expect( configSource.getArchiveBaseDirectory() ).andReturn( macTask.archiveBaseDir ).anyTimes();
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
+ when( configSource.getArchiveBaseDirectory() ).thenReturn( macTask.archiveBaseDir );
final MavenProject project = new MavenProject( new Model() );
@@ -91,8 +90,8 @@ public class FileSetAssemblyPhaseTest
final int[] modes = { -1, -1, dirMode, fileMode };
macTask.expectAdditionOfSingleFileSet( project, false, modes, 1, true );
- expect( configSource.getProject() ).andReturn( project ).atLeastOnce();
- expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
+ when( configSource.getProject() ).thenReturn( project );
+ when( configSource.getFinalName() ).thenReturn( "final-name" );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
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 beefbb9..ddee59a 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
@@ -132,18 +132,13 @@ public class ModuleSetAssemblyPhaseTest
public void testCreateFileSet_ShouldUseModuleDirOnlyWhenOutDirIsNull()
throws Exception
{
- final EasyMockSupport mm = new EasyMockSupport();
-
final Model model = new Model();
model.setArtifactId( "artifact" );
final MavenProject project = new MavenProject( model );
- AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
-
- expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
+ when( configSource.getProject() ).thenReturn( project );
final FileSet fs = new FileSet();
@@ -162,35 +157,26 @@ public class ModuleSetAssemblyPhaseTest
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- mm.replayAll();
-
final FileSet result =
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources,
artifactProject,
configSource );
assertEquals( "artifact/", result.getOutputDirectory() );
-
- mm.verifyAll();
}
@Test
public void testCreateFileSet_ShouldPrependModuleDirWhenOutDirIsProvided()
throws Exception
{
- final EasyMockSupport mm = new EasyMockSupport();
-
final Model model = new Model();
model.setArtifactId( "artifact" );
final MavenProject project = new MavenProject( model );
- AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
-
- expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
-
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
+ when( configSource.getProject() ).thenReturn( project );
+
final FileSet fs = new FileSet();
fs.setOutputDirectory( "out" );
@@ -209,30 +195,19 @@ public class ModuleSetAssemblyPhaseTest
artifactProject.setArtifact( artifact );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- mm.replayAll();
-
final FileSet result =
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources,
artifactProject,
configSource );
assertEquals( "artifact/out/", result.getOutputDirectory() );
-
- mm.verifyAll();
}
@Test
public void testCreateFileSet_ShouldAddExcludesForSubModulesWhenExcludeSubModDirsIsTrue()
throws Exception
{
- final EasyMockSupport mm = new EasyMockSupport();
-
- AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
- expect( configSource.getProject() ).andReturn( null ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
-
-
- expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
final FileSet fs = new FileSet();
@@ -255,16 +230,12 @@ public class ModuleSetAssemblyPhaseTest
project.setArtifact( artifact );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- mm.replayAll();
-
final FileSet result =
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).createFileSet( fs, sources, project,
configSource );
assertEquals( 1, result.getExcludes().size() );
assertEquals( "submodule/**", result.getExcludes().get( 0 ) );
-
- mm.verifyAll();
}
@Test
@@ -286,9 +257,8 @@ 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();
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
+ when( configSource.getProject() ).thenReturn( project );
final MavenProject module = createProject( "group", "module", "version", project );
@@ -301,8 +271,8 @@ public class ModuleSetAssemblyPhaseTest
projects.add( module );
- expect( configSource.getReactorProjects() ).andReturn( projects ).atLeastOnce();
- expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
+ when( configSource.getReactorProjects() ).thenReturn( projects );
+ when( configSource.getFinalName() ).thenReturn( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectGetMode( 0777, 0777 );
@@ -390,17 +360,14 @@ 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();
-
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
Artifact artifact = mock( Artifact.class );
when( artifact.getClassifier() ).thenReturn( "test" );
final File artifactFile = temporaryFolder.newFile();
when( artifact.getFile() ).thenReturn( artifactFile );
- expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
+ when( configSource.getFinalName() ).thenReturn( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectGetMode( 0222, 0222 );
macTask.expectAddFile( artifactFile, "out/artifact",
@@ -490,15 +457,13 @@ 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();
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
Artifact artifact = mock( Artifact.class );
final File artifactFile = temporaryFolder.newFile();
when( artifact.getFile() ).thenReturn( artifactFile );
- expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
+ when( configSource.getFinalName() ).thenReturn( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectAddFile( artifactFile, "out/artifact",
TypeConversionUtils.modeToInt( "777",
@@ -557,9 +522,7 @@ 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();
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
Artifact artifact = mock( Artifact.class );
final File artifactFile = temporaryFolder.newFile();
@@ -568,7 +531,7 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject project = createProject( "group", "artifact", "version", null );
project.setArtifact( artifact );
- expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
+ when( configSource.getFinalName() ).thenReturn( "final-name" );
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectGetMode( 0222, 0222 );
@@ -607,12 +570,10 @@ 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();
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
final MavenProject project = createProject( "group", "artifact", "version", null );
-
- expect( configSource.getProject() ).andReturn( project ).atLeastOnce();
+ when( configSource.getProject() ).thenReturn( project );
project.setArtifact( mock( Artifact.class ) );
@@ -627,13 +588,13 @@ public class ModuleSetAssemblyPhaseTest
sources.addFileSet( fs );
- expect( configSource.getArchiveBaseDirectory() ).andReturn( macTask.archiveBaseDir ).anyTimes();
+ when( configSource.getArchiveBaseDirectory() ).thenReturn( macTask.archiveBaseDir );
final int mode = TypeConversionUtils.modeToInt( "777", new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) );
final int[] modes = { -1, -1, mode, mode };
macTask.expectAdditionOfSingleFileSet( project, false, modes, 1, true );
- expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
+ when( configSource.getFinalName() ).thenReturn( "final-name" );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
mm.replayAll();
@@ -650,11 +611,9 @@ public class ModuleSetAssemblyPhaseTest
public void testGetModuleProjects_ShouldReturnNothingWhenReactorContainsOnlyCurrentProject()
throws Exception
{
- final EasyMockSupport mm = new EasyMockSupport();
-
final MavenProject project = createProject( "group", "artifact", "version", null );
- AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
MavenSession session = mock( MavenSession.class );
when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
@@ -662,36 +621,29 @@ public class ModuleSetAssemblyPhaseTest
when( session.getUserProperties() ).thenReturn( new Properties() );
when( session.getExecutionProperties() ).thenReturn( new Properties() );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
-
+ when( configSource.getProject() ).thenReturn( project );
+ when( configSource.getMavenSession() ).thenReturn( session );
final List<MavenProject> projects = Collections.singletonList( project );
- expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
+ when( configSource.getReactorProjects() ).thenReturn( projects );
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
- mm.replayAll();
-
final Set<MavenProject> moduleProjects =
ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
assertTrue( moduleProjects.isEmpty() );
-
- mm.verifyAll();
}
@Test
public void testGetModuleProjects_ShouldReturnNothingWhenReactorContainsTwoSiblingProjects()
throws Exception
{
- final EasyMockSupport mm = new EasyMockSupport();
-
final MavenProject project = createProject( "group", "artifact", "version", null );
- AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
MavenSession session = mock( MavenSession.class );
when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
@@ -699,8 +651,8 @@ public class ModuleSetAssemblyPhaseTest
when( session.getUserProperties() ).thenReturn( new Properties() );
when( session.getExecutionProperties() ).thenReturn( new Properties() );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
+ when( configSource.getProject() ).thenReturn( project );
+ when( configSource.getMavenSession() ).thenReturn( session );
final MavenProject project2 = createProject( "group", "artifact2", "version", null );
@@ -708,30 +660,24 @@ public class ModuleSetAssemblyPhaseTest
projects.add( project );
projects.add( project2 );
- expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
+ when( configSource.getReactorProjects() ).thenReturn( projects );
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
- mm.replayAll();
-
final Set<MavenProject> moduleProjects =
ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
assertTrue( moduleProjects.isEmpty() );
-
- mm.verifyAll();
}
@Test
public void testGetModuleProjects_ShouldReturnModuleOfCurrentProject()
throws Exception
{
- final EasyMockSupport mm = new EasyMockSupport();
-
final MavenProject project = createProject( "group", "artifact", "version", null );
- AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
MavenSession session = mock( MavenSession.class );
when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
@@ -739,9 +685,8 @@ public class ModuleSetAssemblyPhaseTest
when( session.getUserProperties() ).thenReturn( new Properties() );
when( session.getExecutionProperties() ).thenReturn( new Properties() );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
-
+ when( configSource.getProject() ).thenReturn( project );
+ when( configSource.getMavenSession() ).thenReturn( session );
final MavenProject project2 = createProject( "group", "artifact2", "version", project );
@@ -749,13 +694,11 @@ public class ModuleSetAssemblyPhaseTest
projects.add( project );
projects.add( project2 );
- expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
+ when( configSource.getReactorProjects() ).thenReturn( projects );
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
- mm.replayAll();
-
final Set<MavenProject> moduleProjects =
ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
@@ -764,19 +707,15 @@ public class ModuleSetAssemblyPhaseTest
final MavenProject result = moduleProjects.iterator().next();
assertEquals( "artifact2", result.getArtifactId() );
-
- mm.verifyAll();
}
@Test
public void testGetModuleProjects_ShouldReturnDescendentModulesOfCurrentProject()
throws Exception
{
- final EasyMockSupport mm = new EasyMockSupport();
-
final MavenProject project = createProject( "group", "artifact", "version", null );
- AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
MavenSession session = mock( MavenSession.class );
when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
@@ -784,9 +723,8 @@ public class ModuleSetAssemblyPhaseTest
when( session.getUserProperties() ).thenReturn( new Properties() );
when( session.getExecutionProperties() ).thenReturn( new Properties() );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
-
+ when( configSource.getProject() ).thenReturn( project );
+ when( configSource.getMavenSession() ).thenReturn( session );
final MavenProject project2 = createProject( "group", "artifact2", "version", project );
final MavenProject project3 = createProject( "group", "artifact3", "version", project2 );
@@ -796,13 +734,11 @@ public class ModuleSetAssemblyPhaseTest
projects.add( project2 );
projects.add( project3 );
- expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
+ when( configSource.getReactorProjects() ).thenReturn( projects );
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
- mm.replayAll();
-
final Set<MavenProject> moduleProjects =
ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
@@ -813,19 +749,15 @@ public class ModuleSetAssemblyPhaseTest
check.add( project3 );
verifyResultIs( check, moduleProjects );
-
- mm.verifyAll();
}
@Test
public void testGetModuleProjects_ShouldExcludeModuleAndDescendentsTransitively()
throws Exception
{
- final EasyMockSupport mm = new EasyMockSupport();
-
final MavenProject project = createProject( "group", "artifact", "version", null );
- AssemblerConfigurationSource configSource = mm.createMock( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
MavenSession session = mock( MavenSession.class );
when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
@@ -833,9 +765,8 @@ public class ModuleSetAssemblyPhaseTest
when( session.getUserProperties() ).thenReturn( new Properties() );
when( session.getExecutionProperties() ).thenReturn( new Properties() );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
-
+ when( configSource.getProject() ).thenReturn( project );
+ when( configSource.getMavenSession() ).thenReturn( session );
Artifact artifact1 = mock( Artifact.class );
project.setArtifact( artifact1 );
@@ -862,21 +793,17 @@ public class ModuleSetAssemblyPhaseTest
projects.add( project2 );
projects.add( project3 );
- expect( configSource.getReactorProjects() ).andReturn( projects ).anyTimes();
+ when( configSource.getReactorProjects() ).thenReturn( projects );
final ModuleSet moduleSet = new ModuleSet();
moduleSet.setIncludeSubModules( true );
moduleSet.addExclude( "group:artifact2" );
- mm.replayAll();
-
final Set<MavenProject> moduleProjects =
ModuleSetAssemblyPhase.getModuleProjects( moduleSet, configSource, logger );
assertTrue( moduleProjects.isEmpty() );
-
- mm.verifyAll();
}
private void verifyResultIs( final List<MavenProject> check, final Set<MavenProject> moduleProjects )
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 fa7d867..eaa2ef3 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,7 +20,6 @@ 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;
@@ -76,11 +75,9 @@ public class AddArtifactTaskTest
MavenProject mainProject = new MavenProject( model );
mac = new MockAndControlForAddArtifactTask( mockManager, mainProject );
- configSource = mockManager.createMock( AssemblerConfigurationSource.class );
- expect( configSource.getProject() ).andReturn( mainProject ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
-
- expect( configSource.getFinalName() ).andReturn( "final-name" ).atLeastOnce();
+ configSource = mock( AssemblerConfigurationSource.class );
+ when( configSource.getProject() ).thenReturn( mainProject );
+ when( configSource.getFinalName() ).thenReturn( "final-name" );
}
@Test
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 0c5ad4f..d25da20 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
@@ -109,7 +109,7 @@ public class AddDependencySetsTaskTest
final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mockManager, mainProject );
- AssemblerConfigurationSource configSource = mockManager.createMock( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
MavenSession session = mock( MavenSession.class );
when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
@@ -117,15 +117,11 @@ public class AddDependencySetsTaskTest
when( session.getUserProperties() ).thenReturn( new Properties() );
when( session.getExecutionProperties() ).thenReturn( new Properties() );
- expect( configSource.getProject() ).andReturn( mainProject ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
-
+ when( configSource.getProject() ).thenReturn( mainProject );
+ when( configSource.getMavenSession() ).thenReturn( session );
macTask.expectBuildFromRepository( depProject );
- expect( configSource.getFinalName() ).andReturn( mainAid + "-" + mainVer ).anyTimes();
-
- expect( configSource.getLocalRepository() ).andReturn( null ).anyTimes();
- expect( configSource.getRemoteRepositories() ).andReturn( null ).anyTimes();
+ when( configSource.getFinalName() ).thenReturn( mainAid + "-" + mainVer );
macTask.expectGetDestFile( new File( "junk" ) );
macTask.expectAddFile( newFile, outDir + depAid + "-" + depVer + "." + depExt, 10 );
@@ -193,7 +189,7 @@ public class AddDependencySetsTaskTest
final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mockManager, new MavenProject( new Model() ) );
- AssemblerConfigurationSource configSource = mockManager.createMock( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
MavenSession session = mock( MavenSession.class );
when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
@@ -201,9 +197,8 @@ public class AddDependencySetsTaskTest
when( session.getUserProperties() ).thenReturn( new Properties() );
when( session.getExecutionProperties() ).thenReturn( new Properties() );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
-
+ when( configSource.getProject() ).thenReturn( project );
+ when( configSource.getMavenSession() ).thenReturn( session );
final String aid = "test-dep";
final String version = "2.0-SNAPSHOT";
@@ -223,11 +218,9 @@ public class AddDependencySetsTaskTest
macTask.expectGetDestFile( destFile );
macTask.expectBuildFromRepository( pbe );
- 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 );
+ when( configSource.getFinalName() ).thenReturn( "final-name" );
+ macTask.expectAddFile( file, "out/" + aid + "-" + version + "." + type );
macTask.expectGetMode( 0222, 0222 );
final DependencySet ds = new DependencySet();
@@ -279,7 +272,7 @@ public class AddDependencySetsTaskTest
final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mockManager, new MavenProject( new Model() ) );
- AssemblerConfigurationSource configSource = mockManager.createMock( AssemblerConfigurationSource.class );
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
MavenSession session = mock( MavenSession.class );
when( session.getProjectBuildingRequest() ).thenReturn( mock( ProjectBuildingRequest.class ) );
@@ -287,9 +280,8 @@ public class AddDependencySetsTaskTest
when( session.getUserProperties() ).thenReturn( new Properties() );
when( session.getExecutionProperties() ).thenReturn( new Properties() );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( session ).anyTimes();
-
+ when( configSource.getProject() ).thenReturn( project );
+ when( configSource.getMavenSession() ).thenReturn( session );
Artifact artifact = mock( Artifact.class );
final File artifactFile = temporaryFolder.newFile();
@@ -305,9 +297,7 @@ public class AddDependencySetsTaskTest
}
macTask.expectGetDestFile( new File( "junk" ) );
- expect( configSource.getFinalName() ).andReturn( "final-name" ).anyTimes();
- expect( configSource.getLocalRepository() ).andReturn( null ).anyTimes();
- expect( configSource.getRemoteRepositories() ).andReturn( null ).anyTimes();
+ when( configSource.getFinalName() ).thenReturn( "final-name" );
final MavenProject depProject = new MavenProject( new Model() );
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 2d4d461..0826bf9 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
@@ -19,6 +19,9 @@ package org.apache.maven.plugins.assembly.archive.task;
* under the License.
*/
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import org.apache.maven.model.Model;
import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
@@ -58,8 +61,7 @@ public class AddFileSetsTaskTest
mockManager = new EasyMockSupport();
macTask = new MockAndControlForAddFileSetsTask( mockManager );
- configSource = mockManager.createMock( AssemblerConfigurationSource.class );
- expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
+ configSource = mock( AssemblerConfigurationSource.class );
}
@Test
@@ -146,9 +148,6 @@ public class AddFileSetsTaskTest
final int[] modes = { -1, -1, -1, -1 };
macTask.expectAdditionOfSingleFileSet( null, true, modes, 1, true );
- expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
-
-// macTask.expectGetProject( null );
final MavenProject project = new MavenProject( new Model() );
@@ -184,7 +183,6 @@ public class AddFileSetsTaskTest
final int[] modes = { -1, -1, -1, -1 };
macTask.expectAdditionOfSingleFileSet( null, true, modes, 1, true );
- expect( configSource.getFinalName() ).andReturn( null ).atLeastOnce();
//macTask.expectGetProject( null );
@@ -215,7 +213,7 @@ public class AddFileSetsTaskTest
final File archiveBaseDir = temporaryFolder.newFolder();
- expect( configSource.getFinalName() ).andReturn( "finalName" ).atLeastOnce();
+ when( configSource.getFinalName() ).thenReturn( "finalName" );
//macTask.expectGetProject( null );
@@ -242,7 +240,7 @@ public class AddFileSetsTaskTest
throws Exception
{
macTask.archiveBaseDir = new File( temporaryFolder.getRoot(), "archive");
- expect( configSource.getArchiveBaseDirectory() ).andReturn( macTask.archiveBaseDir ).anyTimes();
+ when( configSource.getArchiveBaseDirectory() ).thenReturn( macTask.archiveBaseDir );
mockManager.replayAll();
@@ -267,7 +265,7 @@ public class AddFileSetsTaskTest
throws Exception
{
macTask.archiveBaseDir = temporaryFolder.newFile();
- expect( configSource.getArchiveBaseDirectory() ).andReturn( macTask.archiveBaseDir ).anyTimes();
+ when( configSource.getArchiveBaseDirectory() ).thenReturn( macTask.archiveBaseDir );
mockManager.replayAll();
diff --git a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
index f29e73d..5e3eefd 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
@@ -19,10 +19,11 @@ package org.apache.maven.plugins.assembly.io;
* under the License.
*/
-import static org.easymock.EasyMock.expect;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.io.File;
import java.io.FileOutputStream;
@@ -61,7 +62,6 @@ import org.codehaus.plexus.interpolation.fixed.FixedStringSearchInterpolator;
import org.codehaus.plexus.interpolation.fixed.InterpolationState;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
-import org.easymock.classextension.EasyMockSupport;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -72,8 +72,6 @@ public class DefaultAssemblyReaderTest
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
- private EasyMockSupport mockManager;
-
private AssemblerConfigurationSource configSource;
public static StringReader writeToStringReader( Assembly assembly )
@@ -90,33 +88,23 @@ public class DefaultAssemblyReaderTest
@Before
public void setUp()
{
-// fileManager = new TestFileManager( "assembly-reader.test.", ".xml" );
- mockManager = new EasyMockSupport();
-
- configSource = mockManager.createMock( AssemblerConfigurationSource.class );
-
- ArtifactRepository localRepo = mockManager.createMock( ArtifactRepository.class );
+ configSource = mock( AssemblerConfigurationSource.class );
- expect( localRepo.getBasedir() ).andReturn( "/path/to/local/repo" ).anyTimes();
- expect( configSource.getLocalRepository() ).andReturn( localRepo ).anyTimes();
- expect( configSource.getRemoteRepositories() ).andReturn(
- Collections.<ArtifactRepository>emptyList() ).anyTimes();
- expect( configSource.getMavenSession() ).andReturn( null ).anyTimes();
+ ArtifactRepository localRepo = mock( ArtifactRepository.class );
+ when( localRepo.getBasedir() ).thenReturn( "/path/to/local/repo" );
+ when( configSource.getLocalRepository() ).thenReturn( localRepo );
+ when( configSource.getRemoteRepositories() ).thenReturn( Collections.<ArtifactRepository>emptyList() );
}
@Test
public void testIncludeSiteInAssembly_ShouldFailIfSiteDirectoryNonExistent()
throws Exception
{
- final File siteDir = File.createTempFile( "assembly-reader.", ".test" );
- siteDir.delete();
-
- expect( configSource.getSiteDirectory() ).andReturn( siteDir ).anyTimes();
+ final File siteDir = new File( temporaryFolder.getRoot(), "assembly-readertest" );
+ when( configSource.getSiteDirectory() ).thenReturn( siteDir );
final Assembly assembly = new Assembly();
- mockManager.replayAll();
-
try
{
new DefaultAssemblyReader().includeSiteInAssembly( assembly, configSource );
@@ -127,111 +115,25 @@ public class DefaultAssemblyReaderTest
{
// this should happen.
}
-
- mockManager.verifyAll();
}
- // @Test public void testReadComponent_ShouldReadComponentFromXml()
- // throws IOException, AssemblyReadException
- // {
- // Component component = new Component();
- //
- // FileSet fileSet = new FileSet();
- // fileSet.setDirectory( "/dir" );
- //
- // component.addFileSet( fileSet );
- //
- // StringWriter sw = new StringWriter();
- //
- // ComponentXpp3Writer componentWriter = new ComponentXpp3Writer();
- //
- // componentWriter.write( sw, component );
- //
- // Component result = new DefaultAssemblyReader().readComponent( new StringReader( sw.toString() ) );
- //
- // List<FileSet> fileSets = result.getFileSets();
- //
- // assertNotNull( fileSets );
- // assertEquals( 1, fileSets.size() );
- //
- // FileSet fs = (FileSet) fileSets.get( 0 );
- //
- // assertEquals( "/dir", fs.getDirectory() );
- // }
- //
- // @Test public void testGetComponentFromFile_ShouldReadComponent()
- // throws IOException, AssemblyReadException
- // {
- // Component component = new Component();
- //
- // FileSet fileSet = new FileSet();
- // fileSet.setDirectory( "/dir" );
- //
- // component.addFileSet( fileSet );
- //
- // File componentFile = fileManager.createTempFile();
- //
- // FileWriter writer = null;
- //
- // try
- // {
- // writer = new FileWriter( componentFile );
- //
- // ComponentXpp3Writer componentWriter = new ComponentXpp3Writer();
- //
- // componentWriter.write( writer, component );
- // }
- // finally
- // {
- // IOUtil.close( writer );
- // }
- //
- // File basedir = componentFile.getParentFile();
- // String filename = componentFile.getName();
- //
- // configSource.getBasedir();
- // configSourceControl.setReturnValue( basedir );
- //
- // mockManager.replayAll();
- //
- // Component result = new DefaultAssemblyReader().getComponentFromFile( filename, configSource );
- //
- // List<FileSet> fileSets = result.getFileSets();
- //
- // assertNotNull( fileSets );
- // assertEquals( 1, fileSets.size() );
- //
- // FileSet fs = (FileSet) fileSets.get( 0 );
- //
- // assertEquals( "/dir", fs.getDirectory() );
- //
- // mockManager.verifyAll();
- // }
-
@Test
public void testIncludeSiteInAssembly_ShouldAddSiteDirFileSetWhenDirExists()
throws Exception
{
final File siteDir = temporaryFolder.getRoot();
-
- expect( configSource.getSiteDirectory() ).andReturn( siteDir ).anyTimes();
+ when( configSource.getSiteDirectory() ).thenReturn( siteDir );
final Assembly assembly = new Assembly();
- mockManager.replayAll();
-
new DefaultAssemblyReader().includeSiteInAssembly( assembly, configSource );
final List<FileSet> fileSets = assembly.getFileSets();
-
assertNotNull( fileSets );
assertEquals( 1, fileSets.size() );
final FileSet fs = fileSets.get( 0 );
-
assertEquals( siteDir.getPath(), fs.getDirectory() );
-
- mockManager.verifyAll();
}
@Test
@@ -381,53 +283,6 @@ public class DefaultAssemblyReaderTest
assertEquals( Artifact.SCOPE_SYSTEM, depSets.get( 2 ).getScope() );
}
- // FIXME: Deep merging should take place...
- // public void
- // testMergeComponentWithAssembly_ShouldMergeOneFileSetToOneOfExistingTwo()
- // {
- // Assembly assembly = new Assembly();
- //
- // FileSet fs = new FileSet();
- // fs.setDirectory( "/dir" );
- // fs.addInclude( "**/test.txt" );
- //
- // assembly.addFileSet( fs );
- //
- // fs = new FileSet();
- // fs.setDirectory( "/other-dir" );
- // assembly.addFileSet( fs );
- //
- // fs = new FileSet();
- // fs.setDirectory( "/dir" );
- // fs.addInclude( "**/components.txt" );
- //
- // Component component = new Component();
- //
- // component.addFileSet( fs );
- //
- // new DefaultAssemblyReader().mergeComponentWithAssembly( component,
- // assembly );
- //
- // List<FileSet> fileSets = assembly.getFileSets();
- //
- // assertNotNull( fileSets );
- // assertEquals( 2, fileSets.size() );
- //
- // FileSet rfs1 = (FileSet) fileSets.get( 0 );
- // assertEquals( "/dir", rfs1.getDirectory() );
- //
- // List includes = rfs1.getIncludes();
- //
- // assertNotNull( includes );
- // assertEquals( 2, includes.size() );
- // assertTrue( includes.contains( "**/test.txt" ) );
- // assertTrue( includes.contains( "**/components.txt" ) );
- //
- // FileSet rfs2 = (FileSet) fileSets.get( 1 );
- // assertEquals( "/other-dir", rfs2.getDirectory() );
- //
- // }
-
@Test
public void testMergeComponentWithAssembly_ShouldAddOneContainerDescriptorHandlerToExistingListOfTwo()
{
@@ -492,16 +347,14 @@ public class DefaultAssemblyReaderTest
final MavenProject project = new MavenProject();
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
- expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes();
+ when( configSource.getProject() ).thenReturn( project );
+ when( configSource.getBasedir() ).thenReturn( basedir );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
InterpolationState is = new InterpolationState();
ComponentXpp3Reader.ContentTransformer componentIp =
AssemblyInterpolator.componentInterpolator( FixedStringSearchInterpolator.create(), is,
new ConsoleLogger( Logger.LEVEL_DEBUG, "console" ) );
- mockManager.replayAll();
-
new DefaultAssemblyReader().mergeComponentsWithMainAssembly( assembly, null, configSource, componentIp );
final List<FileSet> fileSets = assembly.getFileSets();
@@ -512,8 +365,6 @@ public class DefaultAssemblyReaderTest
final FileSet fs = fileSets.get( 0 );
assertEquals( "/dir", fs.getDirectory() );
-
- mockManager.verifyAll();
}
@Test
@@ -526,8 +377,6 @@ public class DefaultAssemblyReaderTest
final Assembly result = doReadAssembly( assembly );
assertEquals( assembly.getId(), result.getId() );
-
- mockManager.verifyAll();
}
@Test
@@ -542,12 +391,10 @@ public class DefaultAssemblyReaderTest
final StringReader sr = writeToStringReader( assembly );
final File siteDir = temporaryFolder.newFolder( "site" );
-
- expect( configSource.getSiteDirectory() ).andReturn( siteDir ).anyTimes();
+ when( configSource.getSiteDirectory() ).thenReturn( siteDir );
final File basedir = temporaryFolder.getRoot();
-
- expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes();
+ when( configSource.getBasedir() ).thenReturn( basedir );
final Model model = new Model();
model.setGroupId( "group" );
@@ -555,13 +402,10 @@ public class DefaultAssemblyReaderTest
model.setVersion( "version" );
final MavenProject project = new MavenProject( model );
-
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ when( configSource.getProject() ).thenReturn( project );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- mockManager.replayAll();
-
final Assembly result = new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
assertEquals( assembly.getId(), result.getId() );
@@ -571,8 +415,6 @@ public class DefaultAssemblyReaderTest
assertEquals( 1, fileSets.size() );
assertEquals( "/site", fileSets.get( 0 ).getOutputDirectory() );
-
- mockManager.verifyAll();
}
@Test
@@ -603,7 +445,7 @@ public class DefaultAssemblyReaderTest
final StringReader sr = writeToStringReader( assembly );
- expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes();
+ when( configSource.getBasedir() ).thenReturn( basedir );
final Model model = new Model();
model.setGroupId( "group" );
@@ -611,12 +453,10 @@ public class DefaultAssemblyReaderTest
model.setVersion( "version" );
final MavenProject project = new MavenProject( model );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ when( configSource.getProject() ).thenReturn( project );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- mockManager.replayAll();
-
final Assembly result = new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
assertEquals( assembly.getId(), result.getId() );
@@ -626,8 +466,6 @@ public class DefaultAssemblyReaderTest
assertEquals( 1, fileSets.size() );
assertEquals( "/dir", fileSets.get( 0 ).getDirectory() );
-
- mockManager.verifyAll();
}
@Test
@@ -658,7 +496,7 @@ public class DefaultAssemblyReaderTest
final StringReader sr = writeToStringReader( assembly );
- expect( configSource.getBasedir() ).andReturn( basedir ).atLeastOnce();
+ when( configSource.getBasedir() ).thenReturn( basedir );
final Model model = new Model();
model.setGroupId( "group" );
@@ -667,12 +505,10 @@ public class DefaultAssemblyReaderTest
final MavenProject project = new MavenProject( model );
- expect( configSource.getProject() ).andReturn( project ).atLeastOnce();
+ when( configSource.getProject() ).thenReturn( project );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- mockManager.replayAll();
-
final Assembly result = new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
assertEquals( assembly.getId(), result.getId() );
@@ -682,8 +518,6 @@ public class DefaultAssemblyReaderTest
assertEquals( 1, fileSets.size() );
assertEquals( "group-dir", fileSets.get( 0 ).getDirectory() );
-
- mockManager.verifyAll();
}
@Test
@@ -696,8 +530,6 @@ public class DefaultAssemblyReaderTest
final Assembly result = doReadAssembly( assembly );
assertEquals( "group-assembly", result.getId() );
-
- mockManager.verifyAll();
}
private Assembly doReadAssembly( Assembly assembly )
@@ -707,7 +539,7 @@ public class DefaultAssemblyReaderTest
final File basedir = temporaryFolder.getRoot();
- expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes();
+ when( configSource.getBasedir() ).thenReturn( basedir );
final Model model = new Model();
model.setGroupId( "group" );
@@ -716,12 +548,10 @@ public class DefaultAssemblyReaderTest
final MavenProject project = new MavenProject( model );
- expect( configSource.getProject() ).andReturn( project ).anyTimes();
+ when( configSource.getProject() ).thenReturn( project );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- mockManager.replayAll();
-
return new DefaultAssemblyReader().readAssembly( sr, "testLocation", null, configSource );
}
@@ -741,9 +571,9 @@ public class DefaultAssemblyReaderTest
final File basedir = assemblyFile.getParentFile();
- expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes();
+ when( configSource.getBasedir() ).thenReturn( basedir );
- expect( configSource.getProject() ).andReturn( new MavenProject( new Model() ) ).anyTimes();
+ when( configSource.getProject() ).thenReturn( new MavenProject( new Model() ) );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
@@ -752,36 +582,23 @@ public class DefaultAssemblyReaderTest
new AssemblyXpp3Writer().write( writer, assembly );
}
- mockManager.replayAll();
-
final Assembly result = new DefaultAssemblyReader().getAssemblyFromDescriptorFile( assemblyFile, configSource );
assertEquals( assembly.getId(), result.getId() );
-
- mockManager.verifyAll();
}
@Test
public void testGetAssemblyForDescriptorReference_ShouldReadBinaryAssemblyRef()
throws Exception
{
- final File basedir = temporaryFolder.getRoot();
-
- expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes();
-
- expect( configSource.getProject() ).andReturn( new MavenProject( new Model() ) ).anyTimes();
-
- expect( configSource.isIgnoreMissingDescriptor() ).andReturn( false ).anyTimes();
-
+ when( configSource.getBasedir() ).thenReturn( temporaryFolder.getRoot() );
+ when( configSource.getProject() ).thenReturn( new MavenProject( new Model() ) );
+ when( configSource.isIgnoreMissingDescriptor() ).thenReturn( false );
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- mockManager.replayAll();
-
final Assembly result = new DefaultAssemblyReader().getAssemblyForDescriptorReference( "bin", configSource );
assertEquals( "bin", result.getId() );
-
- mockManager.verifyAll();
}
@Test
@@ -1001,26 +818,16 @@ public class DefaultAssemblyReaderTest
final boolean ignoreMissing )
throws AssemblyReadException, InvalidAssemblerConfigurationException
{
- expect( configSource.getDescriptorReferences() ).andReturn( descriptorRefs );
-
- expect( configSource.getDescriptors() ).andReturn( descriptors );
-
- expect( configSource.getDescriptorSourceDirectory() ).andReturn( descriptorDir );
+ when( configSource.getDescriptorReferences() ).thenReturn( descriptorRefs );
+ when( configSource.getDescriptors() ).thenReturn( descriptors );
+ when( configSource.getDescriptorSourceDirectory() ).thenReturn( descriptorDir );
+ when( configSource.getBasedir() ).thenReturn( basedir );
+ when( configSource.getProject() ).thenReturn( new MavenProject( new Model() ) );
+ when( configSource.isIgnoreMissingDescriptor() ).thenReturn( ignoreMissing );
- expect( configSource.getBasedir() ).andReturn( basedir ).anyTimes();
-
- expect( configSource.getProject() ).andReturn( new MavenProject( new Model() ) ).anyTimes();
-
- expect( configSource.isIgnoreMissingDescriptor() ).andReturn( ignoreMissing ).anyTimes();
DefaultAssemblyArchiverTest.setupInterpolators( configSource );
- mockManager.replayAll();
-
- final List<Assembly> assemblies = new DefaultAssemblyReader().readAssemblies( configSource );
-
- mockManager.verifyAll();
-
- return assemblies;
+ return new DefaultAssemblyReader().readAssemblies( configSource );
}
}
diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
index 8d72694..22307f2 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
@@ -1,8 +1,5 @@
package org.apache.maven.plugins.assembly.utils;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,6 +19,8 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
* under the License.
*/
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
@@ -30,7 +29,6 @@ import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest;
import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.project.MavenProject;
-import org.easymock.classextension.EasyMockSupport;
import org.junit.Test;
import java.util.Properties;
@@ -40,13 +38,9 @@ import static org.mockito.Mockito.when;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.easymock.EasyMock.expect;
-
public class AssemblyFormatUtilsTest
{
- private final EasyMockSupport mockManager = new EasyMockSupport();
-
@Test
public void testFixRelativePathRefs_ShouldRemoveRelativeRefToCurrentDir()
throws Exception
@@ -347,12 +341,10 @@ public class AssemblyFormatUtilsTest
final MavenSession session = mock( MavenSession.class );
when( session.getUserProperties() ).thenReturn( new Properties() );
- final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class );
- expect( cs.getMavenSession() ).andReturn( session );
+ final AssemblerConfigurationSource cs = mock( AssemblerConfigurationSource.class );
+ when( cs.getMavenSession() ).thenReturn( session );
DefaultAssemblyArchiverTest.setupInterpolators( cs );
- mockManager.replayAll();
-
final String result =
AssemblyFormatUtils.evaluateFileNameMapping( "${artifact.artifactId}-${artifact.baseVersion}",
artifact, mainProject, null, cs,
@@ -360,11 +352,6 @@ public class AssemblyFormatUtilsTest
AssemblyFormatUtils.artifactProjectInterpolator( artifactProject ) );
assertEquals( "artifact-2-SNAPSHOT", result );
-
- mockManager.verifyAll();
-
- // clear out for next call.
- mockManager.resetAll();
}
@Test
@@ -798,21 +785,16 @@ public class AssemblyFormatUtilsTest
private void verifyDistroName( final String assemblyId, final String finalName, final boolean appendAssemblyId,
final String checkValue )
{
- final MockAndControlForGetDistroName mac = new MockAndControlForGetDistroName( finalName, appendAssemblyId );
-
- mockManager.replayAll();
+ AssemblerConfigurationSource configSource = mock( AssemblerConfigurationSource.class );
+ when( configSource.isAssemblyIdAppended() ).thenReturn( appendAssemblyId );
+ when( configSource.getFinalName() ).thenReturn( finalName );
final Assembly assembly = new Assembly();
assembly.setId( assemblyId );
- final String result = AssemblyFormatUtils.getDistributionName( assembly, mac.configSource );
+ final String result = AssemblyFormatUtils.getDistributionName( assembly, configSource );
assertEquals( checkValue, result );
-
- mockManager.verifyAll();
-
- // clear it out for the next call.
- mockManager.resetAll();
}
@Test
@@ -826,31 +808,4 @@ public class AssemblyFormatUtilsTest
{
assertTrue( AssemblyFormatUtils.isUnixRootReference( "/etc/home" ) );
}
-
- private final class MockAndControlForGetDistroName
- {
- final AssemblerConfigurationSource configSource;
-
- private final boolean isAssemblyIdAppended;
-
- private final String finalName;
-
- public MockAndControlForGetDistroName( final String finalName, final boolean isAssemblyIdAppended )
- {
- this.finalName = finalName;
- this.isAssemblyIdAppended = isAssemblyIdAppended;
-
- configSource = mockManager.createMock( AssemblerConfigurationSource.class );
-
- enableExpectations();
- }
-
- private void enableExpectations()
- {
- expect( configSource.isAssemblyIdAppended() ).andReturn( isAssemblyIdAppended ).atLeastOnce();
-
- expect( configSource.getFinalName() ).andReturn( finalName ).atLeastOnce();
- }
- }
-
}