Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/ArtifactMock.java Thu Oct 23 18:52:26 2014 @@ -25,17 +25,16 @@ import java.util.List; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.handler.ArtifactHandler; -import org.apache.maven.plugin.assembly.testutils.MockManager; -import org.easymock.MockControl; +import org.easymock.classextension.EasyMockSupport; + +import static org.easymock.EasyMock.expect; public class ArtifactMock { - private final MockControl artifactCtl; private final Artifact artifact; - private final MockControl handlerCtl; private final ArtifactHandler handler; @@ -61,61 +60,51 @@ public class ArtifactMock private final String classifier; - public ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId, + public ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId, final String version, final String type, final boolean isSnapshot ) { this( mockManager, groupId, artifactId, version, type, null, isSnapshot, null, null ); } - public ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId, + public ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId, final String version, final String type, final boolean isSnapshot, final String baseVersion ) { this( mockManager, groupId, artifactId, version, type, null, isSnapshot, baseVersion, null ); } - public ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId, + public ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId, final String version, final String type, final String classifier, final boolean isSnapshot ) { this( mockManager, groupId, artifactId, version, type, classifier, isSnapshot, null, null ); } - public ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId, + public ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId, final String version, final String type, final String classifier, final boolean isSnapshot, final String baseVersion ) { this( mockManager, groupId, artifactId, version, type, classifier, isSnapshot, baseVersion, null ); } - private ArtifactMock( final MockManager mockManager, final String groupId, final String artifactId, + private ArtifactMock( final EasyMockSupport mockManager, final String groupId, final String artifactId, final String version, final String type, final String classifier, final boolean isSnapshot, final String baseVersion, String scope ) { - artifactCtl = MockControl.createControl( Artifact.class ); - - mockManager.add( artifactCtl ); - artifact = (Artifact) artifactCtl.getMock(); + artifact = mockManager.createMock( Artifact.class ); if ( scope == null ) { scope = Artifact.SCOPE_COMPILE; } - artifact.getScope(); - artifactCtl.setReturnValue( scope, MockControl.ZERO_OR_MORE ); - - handlerCtl = MockControl.createControl( ArtifactHandler.class ); - - mockManager.add( handlerCtl ); + expect( artifact.getScope()).andReturn( scope ).anyTimes(); - handler = (ArtifactHandler) handlerCtl.getMock(); + handler = mockManager.createMock( ArtifactHandler.class ); - artifact.getArtifactHandler(); - artifactCtl.setReturnValue( handler, MockControl.ZERO_OR_MORE ); + expect(artifact.getArtifactHandler()).andReturn( handler ).anyTimes(); this.classifier = classifier; - artifact.getClassifier(); - artifactCtl.setReturnValue( classifier, MockControl.ZERO_OR_MORE ); + expect(artifact.getClassifier()).andReturn( classifier ).anyTimes(); setSnapshot( isSnapshot ); setGroupId( groupId ); @@ -142,9 +131,7 @@ public class ArtifactMock { if ( ( artifactId != null ) && ( this.artifactId == null ) ) { - artifact.getArtifactId(); - artifactCtl.setReturnValue( artifactId, MockControl.ZERO_OR_MORE ); - + expect(artifact.getArtifactId()).andReturn( artifactId ).anyTimes(); this.artifactId = artifactId; } } @@ -153,8 +140,7 @@ public class ArtifactMock { if ( ( baseVersion != null ) && ( this.baseVersion == null ) ) { - artifact.getBaseVersion(); - artifactCtl.setReturnValue( baseVersion, MockControl.ZERO_OR_MORE ); + expect(artifact.getBaseVersion()).andReturn( baseVersion ).anyTimes(); this.baseVersion = baseVersion; } @@ -164,9 +150,7 @@ public class ArtifactMock { if ( ( destination != null ) && ( file == null ) ) { - artifact.getFile(); - artifactCtl.setReturnValue( destination, MockControl.ZERO_OR_MORE ); - + expect(artifact.getFile()).andReturn( destination ).anyTimes(); file = destination; } } @@ -175,8 +159,7 @@ public class ArtifactMock { if ( ( groupId != null ) && ( this.groupId == null ) ) { - artifact.getGroupId(); - artifactCtl.setReturnValue( groupId, MockControl.ZERO_OR_MORE ); + expect(artifact.getGroupId()).andReturn( groupId ).anyTimes(); this.groupId = groupId; } @@ -186,8 +169,7 @@ public class ArtifactMock { if ( ( version != null ) && ( this.version == null ) ) { - artifact.getVersion(); - artifactCtl.setReturnValue( version, MockControl.ZERO_OR_MORE ); + expect(artifact.getVersion()).andReturn( version ).anyTimes(); this.version = version; @@ -203,9 +185,7 @@ public class ArtifactMock { if ( ( dependencyTrail != null ) && ( this.dependencyTrail == null ) ) { - artifact.getDependencyTrail(); - artifactCtl.setReturnValue( dependencyTrail, MockControl.ZERO_OR_MORE ); - + expect(artifact.getDependencyTrail()).andReturn( dependencyTrail ).anyTimes(); this.dependencyTrail = dependencyTrail; } } @@ -214,9 +194,7 @@ public class ArtifactMock { if ( ( id != null ) && ( this.id == null ) ) { - artifact.getId(); - artifactCtl.setReturnValue( id, MockControl.ZERO_OR_MORE ); - + expect(artifact.getId()).andReturn( id ).anyTimes(); this.id = id; } } @@ -225,8 +203,7 @@ public class ArtifactMock { if ( ( id != null ) && ( dependencyConflictId == null ) ) { - artifact.getDependencyConflictId(); - artifactCtl.setReturnValue( id, MockControl.ZERO_OR_MORE ); + expect( artifact.getDependencyConflictId()).andReturn( id ).anyTimes(); dependencyConflictId = id; } @@ -236,9 +213,7 @@ public class ArtifactMock { if ( isSnapshot == null ) { - artifact.isSnapshot(); - artifactCtl.setReturnValue( snapshot, MockControl.ZERO_OR_MORE ); - + expect(artifact.isSnapshot()).andReturn( snapshot ).anyTimes(); isSnapshot = snapshot; } } @@ -250,10 +225,7 @@ public class ArtifactMock { final File newFile = File.createTempFile( "ArtifactMock.test.", "" ); newFile.deleteOnExit(); - - artifact.getFile(); - artifactCtl.setReturnValue( newFile, MockControl.ZERO_OR_MORE ); - + expect( artifact.getFile()).andReturn( newFile ).anyTimes(); file = newFile; } @@ -269,12 +241,8 @@ public class ArtifactMock { if ( ( type != null ) && ( typeAndExt == null ) ) { - artifact.getType(); - artifactCtl.setReturnValue( type, MockControl.ZERO_OR_MORE ); - - handler.getExtension(); - handlerCtl.setReturnValue( type, MockControl.ZERO_OR_MORE ); - + expect(artifact.getType()).andReturn( type ).anyTimes(); + expect(handler.getExtension()).andReturn( type ).anyTimes(); typeAndExt = type; } } @@ -302,8 +270,7 @@ public class ArtifactMock public void setNullFile() { - artifact.getFile(); - artifactCtl.setReturnValue( null, MockControl.ZERO_OR_MORE ); + expect(artifact.getFile()).andReturn( null ).anyTimes(); file = new File( "set-to-null" ); }
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddArtifactTask.java Thu Oct 23 18:52:26 2014 @@ -25,66 +25,53 @@ import java.util.List; import junit.framework.Assert; import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; -import org.easymock.MockControl; +import org.easymock.EasyMock; +import org.easymock.classextension.EasyMockSupport; + +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.expect; public class MockAndControlForAddArtifactTask { public final Archiver archiver; - private final MockControl archiverCtl; - public AssemblerConfigurationSource configSource; - private final MockControl configSourceCtl; - private MavenProject project = null; - public MockAndControlForAddArtifactTask( final MockManager mockManager ) + public MockAndControlForAddArtifactTask( final EasyMockSupport mockManager ) { this( mockManager, null ); } - public MockAndControlForAddArtifactTask( final MockManager mockManager, final MavenProject project ) + public MockAndControlForAddArtifactTask( final EasyMockSupport mockManager, final MavenProject project ) { this.project = project; - archiverCtl = MockControl.createControl( Archiver.class ); - mockManager.add( archiverCtl ); - - archiver = (Archiver) archiverCtl.getMock(); - - configSourceCtl = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( configSourceCtl ); - - configSource = (AssemblerConfigurationSource) configSourceCtl.getMock(); + archiver = mockManager.createMock(Archiver.class); + configSource = mockManager.createMock(AssemblerConfigurationSource.class); enableDefaultExpectations(); } private void enableDefaultExpectations() { - configSource.getProject(); - configSourceCtl.setReturnValue( project, MockControl.ZERO_OR_MORE ); - - configSource.getMavenSession(); - configSourceCtl.setReturnValue( null, MockControl.ZERO_OR_MORE ); + expect( configSource.getProject()).andReturn( project ).anyTimes(); + expect( configSource.getMavenSession()).andReturn( null ).anyTimes(); } public void expectGetFinalName( final String finalName ) { - configSource.getFinalName(); - configSourceCtl.setReturnValue( finalName, MockControl.ONE_OR_MORE ); + expect(configSource.getFinalName()).andReturn( finalName ).atLeastOnce(); } public void expectGetDestFile( final File destFile ) { - archiver.getDestFile(); - archiverCtl.setReturnValue( destFile, MockControl.ZERO_OR_MORE ); + expect(archiver.getDestFile()).andReturn( destFile ).atLeastOnce(); } public void expectAddArchivedFileSet( final File artifactFile, final String outputLocation, @@ -92,14 +79,8 @@ public class MockAndControlForAddArtifac { try { - archiver.addArchivedFileSet( artifactFile, outputLocation, includes, excludes ); - - if ( ( includes != null ) || ( excludes != null ) ) - { - archiverCtl.setMatcher( MockControl.ARRAY_MATCHER ); - } - - archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE ); + archiver.addArchivedFileSet( (File)anyObject(), (String)anyObject(), (String[])anyObject(), (String[])anyObject() ); + EasyMock.expectLastCall().atLeastOnce(); } catch ( final ArchiverException e ) { @@ -110,11 +91,8 @@ public class MockAndControlForAddArtifac public void expectModeChange( final int originalDirMode, final int originalFileMode, final int dirMode, final int fileMode, final int numberOfChanges ) { - archiver.getOverrideDirectoryMode(); - archiverCtl.setReturnValue( originalDirMode ); - - archiver.getOverrideFileMode(); - archiverCtl.setReturnValue( originalFileMode ); + expect( archiver.getOverrideDirectoryMode()).andReturn( originalDirMode ); + expect(archiver.getOverrideFileMode()).andReturn( originalFileMode ); // one of the changes will occur below, when we restore the original mode. if ( numberOfChanges > 1 ) @@ -149,7 +127,7 @@ public class MockAndControlForAddArtifac try { archiver.addFile( file, outputLocation, fileMode ); - archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE ); + EasyMock.expectLastCall().atLeastOnce(); } catch ( final ArchiverException e ) { @@ -162,7 +140,7 @@ public class MockAndControlForAddArtifac try { archiver.addFile( file, outputLocation ); - archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE ); + EasyMock.expectLastCall().atLeastOnce(); } catch ( final ArchiverException e ) { @@ -172,8 +150,7 @@ public class MockAndControlForAddArtifac public void expectGetReactorProjects( final List<MavenProject> projects ) { - configSource.getReactorProjects(); - configSourceCtl.setReturnValue( projects, MockControl.ONE_OR_MORE ); + expect(configSource.getReactorProjects()).andReturn( projects ).atLeastOnce(); } } Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddDependencySetsTask.java Thu Oct 23 18:52:26 2014 @@ -24,77 +24,58 @@ import java.util.List; 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.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.manager.ArchiverManager; -import org.easymock.MockControl; +import org.easymock.EasyMock; +import org.easymock.classextension.EasyMockSupport; + +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.expect; public class MockAndControlForAddDependencySetsTask { public final Archiver archiver; - private final MockControl archiverCtl; - public AssemblerConfigurationSource configSource; - private final MockControl configSourceCtl; - - public MockControl dependencyResolverCtl; - public MavenProjectBuilder projectBuilder; - private final MockControl archiverManagerCtl; - public ArchiverManager archiverManager; - private final MockControl projectBuilderCtl; - private final MavenProject project; - public MockAndControlForAddDependencySetsTask( final MockManager mockManager ) + public MockAndControlForAddDependencySetsTask( final EasyMockSupport mockManager ) { this( mockManager, null ); } - public MockAndControlForAddDependencySetsTask( final MockManager mockManager, final MavenProject project ) + public MockAndControlForAddDependencySetsTask( final EasyMockSupport mockManager, final MavenProject project ) { this.project = project; - archiverCtl = MockControl.createControl( Archiver.class ); - mockManager.add( archiverCtl ); - - archiver = (Archiver) archiverCtl.getMock(); + archiver = mockManager.createMock(Archiver.class); + configSource = mockManager.createMock (AssemblerConfigurationSource.class); - configSourceCtl = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( configSourceCtl ); - configSource = (AssemblerConfigurationSource) configSourceCtl.getMock(); + projectBuilder = mockManager.createMock(MavenProjectBuilder.class); - projectBuilderCtl = MockControl.createControl( MavenProjectBuilder.class ); - mockManager.add( projectBuilderCtl ); - - projectBuilder = (MavenProjectBuilder) projectBuilderCtl.getMock(); - - archiverManagerCtl = MockControl.createControl( ArchiverManager.class ); - mockManager.add( archiverManagerCtl ); - - archiverManager = (ArchiverManager) archiverManagerCtl.getMock(); + archiverManager = mockManager.createMock(ArchiverManager.class); enableDefaultExpectations(); } private void enableDefaultExpectations() { - configSource.getProject(); - configSourceCtl.setReturnValue( project, MockControl.ZERO_OR_MORE ); + expect(configSource.getProject()).andReturn( project ).anyTimes(); } public void expectAddArchivedFileSet( final File file, final String outputLocation, final String[] includes, @@ -102,14 +83,12 @@ public class MockAndControlForAddDepende { try { - archiver.addArchivedFileSet( file, outputLocation, includes, excludes ); + archiver.addArchivedFileSet( (File)anyObject(), (String)anyObject(), (String[])anyObject(), (String[])anyObject() ); - if ( ( includes != null ) || ( excludes != null ) ) - { - archiverCtl.setMatcher( MockControl.ARRAY_MATCHER ); - } + archiver.addArchivedFileSet( (File) anyObject(), (String) anyObject(), (String[]) anyObject(), + (String[]) anyObject() ); + EasyMock.expectLastCall().anyTimes(); - archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE ); } catch ( final ArchiverException e ) { @@ -120,11 +99,8 @@ public class MockAndControlForAddDepende public void expectModeChange( final int originalDirMode, final int originalFileMode, final int dirMode, final int fileMode, final int numberOfChanges ) { - archiver.getOverrideDirectoryMode(); - archiverCtl.setReturnValue( originalDirMode ); - - archiver.getOverrideFileMode(); - archiverCtl.setReturnValue( originalFileMode ); + expect( archiver.getOverrideDirectoryMode()).andReturn( originalDirMode ); + expect(archiver.getOverrideFileMode()).andReturn( originalFileMode ); // one of the changes will occur below, when we restore the original mode. if ( numberOfChanges > 1 ) @@ -166,38 +142,32 @@ public class MockAndControlForAddDepende public void expectGetReactorProjects( final List<MavenProject> projects ) { - configSource.getReactorProjects(); - configSourceCtl.setReturnValue( projects, MockControl.ONE_OR_MORE ); + expect(configSource.getReactorProjects()).andReturn( projects ).anyTimes(); } public void expectCSGetFinalName( final String finalName ) { - configSource.getFinalName(); - configSourceCtl.setReturnValue( finalName, MockControl.ONE_OR_MORE ); + expect(configSource.getFinalName()).andReturn( finalName ).anyTimes(); } public void expectGetDestFile( final File destFile ) { - archiver.getDestFile(); - archiverCtl.setReturnValue( destFile, MockControl.ZERO_OR_MORE ); + expect(archiver.getDestFile()).andReturn( destFile ).anyTimes(); } public void expectCSGetRepositories( final ArtifactRepository localRepo, final List<ArtifactRepository> remoteRepos ) { - configSource.getLocalRepository(); - configSourceCtl.setReturnValue( localRepo, MockControl.ONE_OR_MORE ); - - configSource.getRemoteRepositories(); - configSourceCtl.setReturnValue( remoteRepos, MockControl.ONE_OR_MORE ); + expect(configSource.getLocalRepository()).andReturn( localRepo ).anyTimes(); + expect(configSource.getRemoteRepositories()).andReturn( remoteRepos ).anyTimes(); } public void expectBuildFromRepository( final ProjectBuildingException error ) { try { - projectBuilder.buildFromRepository( null, null, null ); - projectBuilderCtl.setMatcher( MockControl.ALWAYS_MATCHER ); - projectBuilderCtl.setThrowable( error, MockControl.ONE_OR_MORE ); + expect(projectBuilder.buildFromRepository( (Artifact) anyObject(), (List) anyObject(), + (ArtifactRepository) anyObject() )).andThrow( error ); +// projectBuilderCtl.setThrowable( error, MockControl.ONE_OR_MORE ); } catch ( final ProjectBuildingException e ) { @@ -209,9 +179,7 @@ public class MockAndControlForAddDepende { try { - projectBuilder.buildFromRepository( null, null, null ); - projectBuilderCtl.setMatcher( MockControl.ALWAYS_MATCHER ); - projectBuilderCtl.setReturnValue( project, MockControl.ONE_OR_MORE ); + expect(projectBuilder.buildFromRepository( ( Artifact) anyObject(), (List)anyObject(), (ArtifactRepository)anyObject() )).andReturn( project ).anyTimes(); } catch ( final ProjectBuildingException e ) { @@ -221,8 +189,7 @@ public class MockAndControlForAddDepende public void expectGetSession( final MavenSession session ) { - configSource.getMavenSession(); - configSourceCtl.setReturnValue( session, MockControl.ZERO_OR_MORE ); + expect(configSource.getMavenSession()).andReturn( session ).anyTimes(); } } Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/testutils/MockAndControlForAddFileSetsTask.java Thu Oct 23 18:52:26 2014 @@ -25,67 +25,51 @@ import junit.framework.Assert; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.plugin.assembly.testutils.TestFileManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.archiver.Archiver; import org.codehaus.plexus.archiver.ArchiverException; -import org.easymock.MockControl; +import org.codehaus.plexus.archiver.FileSet; +import org.easymock.EasyMock; +import org.easymock.classextension.EasyMockSupport; + +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.expect; public class MockAndControlForAddFileSetsTask { public final AssemblerConfigurationSource configSource; - private final MockControl configSourceCtl; public Archiver archiver; - public MockControl archiverCtl; - - private final TestFileManager fileManager; - public File archiveBaseDir; - public MockAndControlForAddFileSetsTask( MockManager mockManager, TestFileManager fileManager ) + public MockAndControlForAddFileSetsTask( EasyMockSupport mockManager, TestFileManager fileManager ) { - this.fileManager = fileManager; - - configSourceCtl = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( configSourceCtl ); - - configSource = (AssemblerConfigurationSource) configSourceCtl.getMock(); - - archiverCtl = MockControl.createControl( Archiver.class ); - mockManager.add( archiverCtl ); - - archiver = (Archiver) archiverCtl.getMock(); - + configSource = mockManager.createMock (AssemblerConfigurationSource.class); + archiver = mockManager.createMock (Archiver.class); archiveBaseDir = fileManager.createTempDir(); - configSource.getMavenSession(); - configSourceCtl.setReturnValue( null, MockControl.ZERO_OR_MORE ); + expect(configSource.getMavenSession()).andReturn( null).anyTimes(); } public void expectGetArchiveBaseDirectory() { - configSource.getArchiveBaseDirectory(); - configSourceCtl.setReturnValue( archiveBaseDir, MockControl.ONE_OR_MORE ); + expect(configSource.getArchiveBaseDirectory()).andReturn( archiveBaseDir ).anyTimes(); } public void expectGetBasedir( File basedir ) { - configSource.getBasedir(); - configSourceCtl.setReturnValue( basedir, MockControl.ONE_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); } void expectModeChanges( int[] modes, int modeChangeCount ) { - archiver.getOverrideDirectoryMode(); - archiverCtl.setReturnValue( modes[0] ); + expect(archiver.getOverrideDirectoryMode()).andReturn( modes[0] ); + expect(archiver.getOverrideFileMode()).andReturn( modes[1] ); - archiver.getOverrideFileMode(); - archiverCtl.setReturnValue( modes[1] ); if ( modeChangeCount > 1 ) { @@ -129,21 +113,16 @@ public class MockAndControlForAddFileSet // the logger sends a debug message with this info inside the addFileSet(..) method.. if ( isDebugEnabled ) { - archiver.getOverrideDirectoryMode(); - archiverCtl.setReturnValue( modes[0] ); - - archiver.getOverrideFileMode(); - archiverCtl.setReturnValue( modes[1] ); + expect(archiver.getOverrideDirectoryMode()).andReturn( modes[0] ); + expect(archiver.getOverrideFileMode()).andReturn( modes[1] ); } if ( isProjectUsed ) { - configSource.getProject(); - configSourceCtl.setReturnValue( project, MockControl.ONE_OR_MORE ); + expect(configSource.getProject()).andReturn( project ).atLeastOnce(); } - configSource.getFinalName(); - configSourceCtl.setReturnValue( finalName, MockControl.ONE_OR_MORE ); + expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce(); if ( shouldAddDir ) { @@ -151,9 +130,8 @@ public class MockAndControlForAddFileSet try { - archiver.addFileSet( null ); - archiverCtl.setMatcher( MockControl.ALWAYS_MATCHER ); - archiverCtl.setVoidCallable( MockControl.ONE_OR_MORE ); + archiver.addFileSet( (FileSet) anyObject() ); + EasyMock.expectLastCall().atLeastOnce(); } catch ( ArchiverException e ) { @@ -165,20 +143,17 @@ public class MockAndControlForAddFileSet public void expectGetProject( MavenProject project ) { - configSource.getProject(); - configSourceCtl.setReturnValue( project, MockControl.ONE_OR_MORE ); + expect(configSource.getProject()).andReturn( project ).atLeastOnce(); } public void expectGetSession( MavenSession session ) { - configSource.getMavenSession(); - configSourceCtl.setReturnValue( session, MockControl.ONE_OR_MORE ); + expect(configSource.getMavenSession()).andReturn( session ).atLeastOnce(); } public void expectGetFinalName( String finalName ) { - configSource.getFinalName(); - configSourceCtl.setReturnValue( finalName, MockControl.ONE_OR_MORE ); + expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce(); } } Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/artifact/DefaultDependencyResolverTest.java Thu Oct 23 18:52:26 2014 @@ -19,12 +19,6 @@ package org.apache.maven.plugin.assembly * under the License. */ -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; @@ -40,12 +34,19 @@ import org.apache.maven.plugin.assembly. import org.apache.maven.plugin.assembly.model.ModuleSet; import org.apache.maven.plugin.assembly.model.Repository; import org.apache.maven.plugin.assembly.resolved.AssemblyId; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; -import org.easymock.MockControl; +import org.easymock.classextension.EasyMockSupport; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +import static org.easymock.EasyMock.expect; public class DefaultDependencyResolverTest extends PlexusTestCase @@ -119,12 +120,9 @@ public class DefaultDependencyResolverTe public void test_getModuleSetResolutionRequirements() throws DependencyResolutionException { - final MockManager mm = new MockManager(); - - final MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class ); - mm.add( csControl ); + final EasyMockSupport mm = new EasyMockSupport(); - final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csControl.getMock(); + final AssemblerConfigurationSource cs = mm.createMock( AssemblerConfigurationSource.class ); final File rootDir = new File( "root" ); final MavenProject project = createMavenProject( "main-group", "main-artifact", "1", rootDir ); @@ -157,11 +155,9 @@ public class DefaultDependencyResolverTe allProjects.add( module2 ); allProjects.add( module2a ); - cs.getReactorProjects(); - csControl.setReturnValue( allProjects, MockControl.ZERO_OR_MORE ); + expect( cs.getReactorProjects()).andReturn( allProjects ).anyTimes(); - cs.getProject(); - csControl.setReturnValue( project, MockControl.ZERO_OR_MORE ); + expect( cs.getProject()).andReturn( project ).anyTimes(); final ResolutionManagementInfo info = new ResolutionManagementInfo( project ); Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/format/FileFormatterTest.java Thu Oct 23 18:52:26 2014 @@ -22,13 +22,14 @@ package org.apache.maven.plugin.assembly import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.plugin.assembly.testutils.TestFileManager; import org.apache.maven.project.MavenProject; +import org.apache.maven.shared.filtering.MavenFileFilter; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; import org.easymock.MockControl; +import org.easymock.classextension.EasyMockSupport; import java.io.File; import java.io.IOException; @@ -37,6 +38,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import static org.easymock.EasyMock.expect; + public class FileFormatterTest extends PlexusTestCase { @@ -45,11 +48,10 @@ public class FileFormatterTest private final TestFileManager fileManager = new TestFileManager( "fileFormatterTest.", "" ); - private final MockManager mockManager = new MockManager(); + private final EasyMockSupport mockManager = new EasyMockSupport(); private AssemblerConfigurationSource configSource; - private MockControl configSourceControl; @Override public void setUp() @@ -57,10 +59,7 @@ public class FileFormatterTest { super.setUp(); - configSourceControl = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( configSourceControl ); - - configSource = (AssemblerConfigurationSource) configSourceControl.getMock(); + configSource = mockManager.createMock(AssemblerConfigurationSource.class); } @Override @@ -75,8 +74,7 @@ public class FileFormatterTest { final File basedir = fileManager.createTempDir(); final File tempRoot = new File( basedir, "tempdir" ); - configSource.getTemporaryRootDirectory(); - configSourceControl.setReturnValue( tempRoot ); + expect( configSource.getTemporaryRootDirectory()).andReturn( tempRoot ); final File file = fileManager.createFile( basedir, "one.txt", "This is a\ntest." ); @@ -94,8 +92,7 @@ public class FileFormatterTest { final File basedir = fileManager.createTempDir(); - configSource.getTemporaryRootDirectory(); - configSourceControl.setReturnValue( basedir ); + expect( configSource.getTemporaryRootDirectory()).andReturn( basedir ); // Model model = new Model(); // model.setArtifactId( "artifact" ); @@ -123,8 +120,7 @@ public class FileFormatterTest { final File basedir = fileManager.createTempDir(); - configSource.getTemporaryRootDirectory(); - configSourceControl.setReturnValue( basedir ); + expect( configSource.getTemporaryRootDirectory()).andReturn( basedir ); final File file = fileManager.createFile( basedir, "one.txt", "This is a\ntest." ); @@ -142,8 +138,7 @@ public class FileFormatterTest { final File basedir = fileManager.createTempDir(); - configSource.getTemporaryRootDirectory(); - configSourceControl.setReturnValue( basedir ); + expect( configSource.getTemporaryRootDirectory()).andReturn( basedir ); final File file = fileManager.createFile( basedir, "one.txt", "This is a\r\ntest." ); @@ -519,29 +514,21 @@ public class FileFormatterTest final List<String> filters, final boolean includeProjectBuildFilters ) throws Exception { - configSource.getTemporaryRootDirectory(); - configSourceControl.setReturnValue( basedir ); - - configSource.getEscapeString(); - configSourceControl.setReturnValue( null, MockControl.ONE_OR_MORE ); + expect( configSource.getTemporaryRootDirectory()).andReturn( basedir ).atLeastOnce(); + expect( configSource.getEscapeString()).andReturn( null ).atLeastOnce(); - configSource.getProject(); - configSourceControl.setReturnValue( project, MockControl.ONE_OR_MORE ); + expect( configSource.getProject()).andReturn( project).atLeastOnce(); - configSource.getMavenFileFilter(); - configSourceControl.setReturnValue( lookup( "org.apache.maven.shared.filtering.MavenFileFilter" ) ); + expect( configSource.getMavenFileFilter()).andReturn( + (MavenFileFilter) lookup( "org.apache.maven.shared.filtering.MavenFileFilter" ) ); - configSource.getMavenSession(); - configSourceControl.setReturnValue( null ); + expect( configSource.getMavenSession()).andReturn( null ); - configSource.getFilters(); - configSourceControl.setReturnValue( filters ); + expect( configSource.getFilters()).andReturn( filters ); - configSource.isIncludeProjectBuildFilters(); - configSourceControl.setReturnValue( includeProjectBuildFilters ); + expect( configSource.isIncludeProjectBuildFilters()).andReturn( includeProjectBuildFilters ); - configSource.getDelimiters(); - configSourceControl.setReturnValue( delimiters ); + expect( configSource.getDelimiters()).andReturn( delimiters ); } Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyExpressionEvaluatorTest.java Thu Oct 23 18:52:26 2014 @@ -19,42 +19,28 @@ package org.apache.maven.plugin.assembly * under the License. */ -import java.io.IOException; -import java.util.Properties; - import junit.framework.TestCase; - import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Build; import org.apache.maven.model.Model; import org.apache.maven.plugin.assembly.AssemblerConfigurationSource; import org.apache.maven.plugin.assembly.testutils.ConfigSourceStub; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.logging.console.ConsoleLogger; -import org.easymock.MockControl; -import org.easymock.classextension.MockClassControl; +import org.easymock.classextension.EasyMockSupport; +import org.easymock.classextension.IMocksControl; + +import java.util.Properties; + +import static org.easymock.EasyMock.expect; public class AssemblyExpressionEvaluatorTest extends TestCase { - private AssemblyInterpolator interpolator; - private final ConfigSourceStub configSourceStub = new ConfigSourceStub(); - @Override - public void setUp() - throws IOException - { - interpolator = new AssemblyInterpolator(); - - interpolator.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ) ); - } - public void testShouldResolveModelGroupId() throws ExpressionEvaluationException { @@ -106,42 +92,26 @@ public class AssemblyExpressionEvaluator model.setProperties( props ); - final MockManager mm = new MockManager(); - - final MockControl sessionControl = MockClassControl.createControl( MavenSession.class ); - final MavenSession session = (MavenSession) sessionControl.getMock(); + final EasyMockSupport mm = new EasyMockSupport(); - mm.add( sessionControl ); + MavenSession session = mm.createControl().createMock( MavenSession.class ); final Properties execProps = new Properties(); execProps.setProperty( "groupId", "still.another.id" ); - session.getExecutionProperties(); - sessionControl.setReturnValue( execProps, MockControl.ZERO_OR_MORE ); - - session.getUserProperties(); - sessionControl.setReturnValue( new Properties(), MockControl.ZERO_OR_MORE ); - - final MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class ); - final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csControl.getMock(); - - mm.add( csControl ); - - cs.getMavenSession(); - csControl.setReturnValue( session, MockControl.ZERO_OR_MORE ); + expect( session.getExecutionProperties()).andReturn( execProps ).anyTimes(); + expect( session.getUserProperties()).andReturn( new Properties() ).anyTimes(); - cs.getProject(); - csControl.setReturnValue( new MavenProject( model ), MockControl.ZERO_OR_MORE ); + AssemblerConfigurationSource cs = mm.createControl().createMock( AssemblerConfigurationSource.class ); - final MockControl lrCtl = MockControl.createControl( ArtifactRepository.class ); - final ArtifactRepository lr = (ArtifactRepository) lrCtl.getMock(); - mm.add( lrCtl ); + expect( cs.getMavenSession()).andReturn( session ); + expect( cs.getProject() ).andReturn( new MavenProject( model ) ); - lr.getBasedir(); - lrCtl.setReturnValue( "/path/to/local/repo", MockControl.ZERO_OR_MORE ); + final IMocksControl lrCtl = mm.createControl(); + final ArtifactRepository lr = lrCtl.createMock( ArtifactRepository.class ); - cs.getLocalRepository(); - csControl.setReturnValue( lr, MockControl.ZERO_OR_MORE ); + expect( lr.getBasedir()).andReturn( "/path/to/local/repo" ).anyTimes(); + expect( cs.getLocalRepository()).andReturn( lr ).anyTimes(); mm.replayAll(); @@ -150,7 +120,6 @@ public class AssemblyExpressionEvaluator assertEquals( "assembly.still.another.id", result ); mm.verifyAll(); - mm.clear(); } public void testShouldReturnUnchangedInputForUnresolvedExpression() Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolatorTest.java Thu Oct 23 18:52:26 2014 @@ -33,12 +33,13 @@ import org.apache.maven.plugin.assembly. import org.apache.maven.plugin.assembly.model.Assembly; import org.apache.maven.plugin.assembly.model.DependencySet; import org.apache.maven.plugin.assembly.testutils.ConfigSourceStub; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; import org.easymock.MockControl; -import org.easymock.classextension.MockClassControl; +import org.easymock.classextension.EasyMockSupport; + +import static org.easymock.EasyMock.expect; public class AssemblyInterpolatorTest extends TestCase @@ -176,39 +177,27 @@ public class AssemblyInterpolatorTest assembly.setId( "assembly.${groupId}" ); - final MockManager mm = new MockManager(); - - final MockControl sessionControl = MockClassControl.createControl( MavenSession.class ); - final MavenSession session = (MavenSession) sessionControl.getMock(); + final EasyMockSupport mm = new EasyMockSupport(); - mm.add( sessionControl ); + final MavenSession session = mm.createMock( MavenSession.class ); final Properties execProps = new Properties(); execProps.setProperty( "groupId", "still.another.id" ); - session.getExecutionProperties(); - sessionControl.setReturnValue( execProps, MockControl.ZERO_OR_MORE ); - - session.getUserProperties(); - sessionControl.setReturnValue( new Properties(), MockControl.ZERO_OR_MORE ); + expect( session.getExecutionProperties()).andReturn( execProps ).anyTimes(); - final MockControl csControl = MockControl.createControl( AssemblerConfigurationSource.class ); - final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csControl.getMock(); + expect( session.getUserProperties()).andReturn( new Properties()).anyTimes(); - mm.add( csControl ); + final AssemblerConfigurationSource cs = mm.createMock( AssemblerConfigurationSource.class ); final MockControl lrCtl = MockControl.createControl( ArtifactRepository.class ); - final ArtifactRepository lr = (ArtifactRepository) lrCtl.getMock(); - mm.add( lrCtl ); + final ArtifactRepository lr = mm.createMock( ArtifactRepository.class ); - lr.getBasedir(); - lrCtl.setReturnValue( "/path/to/local/repo", MockControl.ZERO_OR_MORE ); + expect( lr.getBasedir()).andReturn( "/path/to/local/repo").anyTimes(); - cs.getLocalRepository(); - csControl.setReturnValue( lr, MockControl.ZERO_OR_MORE ); + expect(cs.getLocalRepository()).andReturn( lr ).anyTimes(); - cs.getMavenSession(); - csControl.setReturnValue( session, MockControl.ZERO_OR_MORE ); + expect( cs.getMavenSession()).andReturn( session ).anyTimes(); mm.replayAll(); @@ -217,7 +206,7 @@ public class AssemblyInterpolatorTest assertEquals( "assembly.still.another.id", result.getId() ); mm.verifyAll(); - mm.clear(); + mm.resetAll(); } public void testShouldNotTouchUnresolvedExpression() Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/io/DefaultAssemblyReaderTest.java Thu Oct 23 18:52:26 2014 @@ -19,20 +19,7 @@ package org.apache.maven.plugin.assembly * under the License. */ -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - import junit.framework.TestCase; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Model; @@ -47,11 +34,24 @@ import org.apache.maven.plugin.assembly. import org.apache.maven.plugin.assembly.model.Repository; import org.apache.maven.plugin.assembly.model.io.xpp3.AssemblyXpp3Writer; import org.apache.maven.plugin.assembly.model.io.xpp3.ComponentXpp3Writer; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.plugin.assembly.testutils.TestFileManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.IOUtil; -import org.easymock.MockControl; +import org.easymock.classextension.EasyMockSupport; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import static org.easymock.EasyMock.expect; public class DefaultAssemblyReaderTest extends TestCase @@ -59,42 +59,28 @@ public class DefaultAssemblyReaderTest private TestFileManager fileManager; - private MockManager mockManager; + private EasyMockSupport mockManager; - private MockControl configSourceControl; private AssemblerConfigurationSource configSource; private ArtifactRepository localRepo; - private MockControl localRepoControl; @Override public void setUp() { fileManager = new TestFileManager( "assembly-reader.test.", ".xml" ); - mockManager = new MockManager(); - - configSourceControl = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( configSourceControl ); - - configSource = (AssemblerConfigurationSource) configSourceControl.getMock(); - - localRepoControl = MockControl.createControl( ArtifactRepository.class ); - localRepo = (ArtifactRepository) localRepoControl.getMock(); - mockManager.add( localRepoControl ); - - localRepo.getBasedir(); - localRepoControl.setReturnValue( "/path/to/local/repo", MockControl.ZERO_OR_MORE ); + mockManager = new EasyMockSupport(); - configSource.getLocalRepository(); - configSourceControl.setReturnValue( localRepo, MockControl.ZERO_OR_MORE ); + configSource = mockManager.createMock(AssemblerConfigurationSource.class); - configSource.getRemoteRepositories(); - configSourceControl.setReturnValue( Collections.EMPTY_LIST, MockControl.ZERO_OR_MORE ); + localRepo = mockManager.createMock( ArtifactRepository.class ); - configSource.getMavenSession(); - configSourceControl.setReturnValue( null, MockControl.ZERO_OR_MORE ); + 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(); } @Override @@ -110,8 +96,7 @@ public class DefaultAssemblyReaderTest final File siteDir = File.createTempFile( "assembly-reader.", ".test" ); siteDir.delete(); - configSource.getSiteDirectory(); - configSourceControl.setReturnValue( siteDir, MockControl.ZERO_OR_MORE ); + expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes(); final Assembly assembly = new Assembly(); @@ -136,8 +121,7 @@ public class DefaultAssemblyReaderTest { final File siteDir = fileManager.createTempDir(); - configSource.getSiteDirectory(); - configSourceControl.setReturnValue( siteDir, MockControl.ZERO_OR_MORE ); + expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes(); final Assembly assembly = new Assembly(); @@ -502,13 +486,11 @@ public class DefaultAssemblyReaderTest final File basedir = componentFile.getParentFile(); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); final MavenProject project = new MavenProject(); - configSource.getProject(); - configSourceControl.setReturnValue( project, MockControl.ZERO_OR_MORE ); + expect( configSource.getProject()).andReturn( project ).anyTimes(); mockManager.replayAll(); @@ -541,8 +523,7 @@ public class DefaultAssemblyReaderTest final File basedir = fileManager.createTempDir(); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); final Model model = new Model(); model.setGroupId( "group" ); @@ -551,11 +532,9 @@ public class DefaultAssemblyReaderTest final MavenProject project = new MavenProject( model ); - configSource.getProject(); - configSourceControl.setReturnValue( project, MockControl.ZERO_OR_MORE ); + expect( configSource.getProject()).andReturn( project ).anyTimes(); - configSource.isSiteIncluded(); - configSourceControl.setReturnValue( false, MockControl.ZERO_OR_MORE ); + expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); mockManager.replayAll(); @@ -583,13 +562,11 @@ public class DefaultAssemblyReaderTest final File siteDir = fileManager.createTempDir(); - configSource.getSiteDirectory(); - configSourceControl.setReturnValue( siteDir, MockControl.ZERO_OR_MORE ); + expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes(); final File basedir = fileManager.createTempDir(); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); final Model model = new Model(); model.setGroupId( "group" ); @@ -598,11 +575,9 @@ public class DefaultAssemblyReaderTest final MavenProject project = new MavenProject( model ); - configSource.getProject(); - configSourceControl.setReturnValue( project, MockControl.ZERO_OR_MORE ); + expect(configSource.getProject()).andReturn( project ).anyTimes(); - configSource.isSiteIncluded(); - configSourceControl.setReturnValue( false, MockControl.ZERO_OR_MORE ); + expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); mockManager.replayAll(); @@ -635,13 +610,11 @@ public class DefaultAssemblyReaderTest final File siteDir = fileManager.createTempDir(); - configSource.getSiteDirectory(); - configSourceControl.setReturnValue( siteDir, MockControl.ZERO_OR_MORE ); + expect( configSource.getSiteDirectory()).andReturn( siteDir ).anyTimes(); final File basedir = fileManager.createTempDir(); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); final Model model = new Model(); model.setGroupId( "group" ); @@ -650,11 +623,9 @@ public class DefaultAssemblyReaderTest final MavenProject project = new MavenProject( model ); - configSource.getProject(); - configSourceControl.setReturnValue( project, MockControl.ZERO_OR_MORE ); + expect( configSource.getProject()).andReturn( project ).anyTimes(); - configSource.isSiteIncluded(); - configSourceControl.setReturnValue( true, MockControl.ZERO_OR_MORE ); + expect( configSource.isSiteIncluded()).andReturn( true ).anyTimes(); mockManager.replayAll(); @@ -711,8 +682,7 @@ public class DefaultAssemblyReaderTest final StringReader sr = new StringReader( sw.toString() ); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); final Model model = new Model(); model.setGroupId( "group" ); @@ -720,11 +690,9 @@ public class DefaultAssemblyReaderTest model.setVersion( "version" ); final MavenProject project = new MavenProject( model ); - configSource.getProject(); - configSourceControl.setReturnValue( project, MockControl.ZERO_OR_MORE ); + expect( configSource.getProject()).andReturn( project ).anyTimes(); - configSource.isSiteIncluded(); - configSourceControl.setReturnValue( false, MockControl.ZERO_OR_MORE ); + expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); mockManager.replayAll(); @@ -781,8 +749,7 @@ public class DefaultAssemblyReaderTest final StringReader sr = new StringReader( sw.toString() ); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ONE_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir ).atLeastOnce(); final Model model = new Model(); model.setGroupId( "group" ); @@ -791,11 +758,9 @@ public class DefaultAssemblyReaderTest final MavenProject project = new MavenProject( model ); - configSource.getProject(); - configSourceControl.setReturnValue( project, MockControl.ONE_OR_MORE ); + expect( configSource.getProject()).andReturn( project ).atLeastOnce(); - configSource.isSiteIncluded(); - configSourceControl.setReturnValue( false ); + expect( configSource.isSiteIncluded()).andReturn( false ); mockManager.replayAll(); @@ -828,8 +793,7 @@ public class DefaultAssemblyReaderTest final File basedir = fileManager.createTempDir(); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); final Model model = new Model(); model.setGroupId( "group" ); @@ -838,11 +802,9 @@ public class DefaultAssemblyReaderTest final MavenProject project = new MavenProject( model ); - configSource.getProject(); - configSourceControl.setReturnValue( project, MockControl.ZERO_OR_MORE ); + expect( configSource.getProject()).andReturn( project ).anyTimes(); - configSource.isSiteIncluded(); - configSourceControl.setReturnValue( false, MockControl.ZERO_OR_MORE ); + expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); mockManager.replayAll(); @@ -868,14 +830,11 @@ public class DefaultAssemblyReaderTest final File basedir = assemblyFile.getParentFile(); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir).anyTimes(); - configSource.getProject(); - configSourceControl.setReturnValue( new MavenProject( new Model() ), MockControl.ZERO_OR_MORE ); + expect( configSource.getProject()).andReturn( new MavenProject( new Model() )).anyTimes(); - configSource.isSiteIncluded(); - configSourceControl.setReturnValue( false, MockControl.ZERO_OR_MORE ); + expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); Writer writer = null; try @@ -902,17 +861,13 @@ public class DefaultAssemblyReaderTest { final File basedir = fileManager.createTempDir(); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir).anyTimes(); - configSource.getProject(); - configSourceControl.setReturnValue( new MavenProject( new Model() ), MockControl.ZERO_OR_MORE ); + expect( configSource.getProject()).andReturn( new MavenProject( new Model() )).anyTimes(); - configSource.isSiteIncluded(); - configSourceControl.setReturnValue( false, MockControl.ZERO_OR_MORE ); + expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); - configSource.isIgnoreMissingDescriptor(); - configSourceControl.setReturnValue( false, MockControl.ZERO_OR_MORE ); + expect( configSource.isIgnoreMissingDescriptor()).andReturn( false ).anyTimes(); mockManager.replayAll(); @@ -1157,32 +1112,23 @@ public class DefaultAssemblyReaderTest final boolean ignoreMissing ) throws AssemblyReadException, InvalidAssemblerConfigurationException { - configSource.getDescriptor(); - configSourceControl.setReturnValue( descriptor ); + expect( configSource.getDescriptor()).andReturn( descriptor ); - configSource.getDescriptorId(); - configSourceControl.setReturnValue( descriptorRef ); + expect( configSource.getDescriptorId()).andReturn( descriptorRef ); - configSource.getDescriptorReferences(); - configSourceControl.setReturnValue( descriptorRefs ); + expect( configSource.getDescriptorReferences()).andReturn( descriptorRefs ); - configSource.getDescriptors(); - configSourceControl.setReturnValue( descriptors ); + expect( configSource.getDescriptors()).andReturn( descriptors ); - configSource.getDescriptorSourceDirectory(); - configSourceControl.setReturnValue( descriptorDir ); + expect( configSource.getDescriptorSourceDirectory()).andReturn( descriptorDir ); - configSource.getBasedir(); - configSourceControl.setReturnValue( basedir, MockControl.ZERO_OR_MORE ); + expect( configSource.getBasedir()).andReturn( basedir ).anyTimes(); - configSource.getProject(); - configSourceControl.setReturnValue( new MavenProject( new Model() ), MockControl.ZERO_OR_MORE ); + expect( configSource.getProject()).andReturn( new MavenProject( new Model() )).anyTimes(); - configSource.isSiteIncluded(); - configSourceControl.setReturnValue( false, MockControl.ZERO_OR_MORE ); + expect( configSource.isSiteIncluded()).andReturn( false ).anyTimes(); - configSource.isIgnoreMissingDescriptor(); - configSourceControl.setReturnValue( ignoreMissing, MockControl.ZERO_OR_MORE ); + expect( configSource.isIgnoreMissingDescriptor()).andReturn( ignoreMissing).anyTimes(); mockManager.replayAll(); Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFileUtilsTest.java Thu Oct 23 18:52:26 2014 @@ -19,19 +19,19 @@ package org.apache.maven.plugin.assembly * under the License. */ -import java.io.File; -import java.io.IOException; - import junit.framework.TestCase; - import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.plugin.assembly.testutils.TestFileManager; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.UnArchiver; import org.codehaus.plexus.archiver.manager.ArchiverManager; import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; -import org.easymock.MockControl; +import org.easymock.classextension.EasyMockSupport; + +import java.io.File; +import java.io.IOException; + +import static org.easymock.EasyMock.expect; public class AssemblyFileUtilsTest extends TestCase @@ -48,25 +48,18 @@ public class AssemblyFileUtilsTest public void testUnpack_ShouldSetSourceAndDestinationAndCallExtract() throws IOException, ArchiveExpansionException, NoSuchArchiverException { - MockManager mockManager = new MockManager(); + EasyMockSupport mockManager = new EasyMockSupport(); File source = fileManager.createTempFile(); File destDir = fileManager.createTempDir(); - MockControl unarchiverCtl = MockControl.createControl( UnArchiver.class ); - mockManager.add( unarchiverCtl ); - - UnArchiver unarchiver = (UnArchiver) unarchiverCtl.getMock(); - - MockControl archiverManagerCtl = MockControl.createControl( ArchiverManager.class ); - mockManager.add( archiverManagerCtl ); + UnArchiver unarchiver = mockManager.createMock( UnArchiver.class ); - ArchiverManager archiverManager = (ArchiverManager) archiverManagerCtl.getMock(); + ArchiverManager archiverManager = mockManager.createMock( ArchiverManager.class ); try { - archiverManager.getUnArchiver( source ); - archiverManagerCtl.setReturnValue( unarchiver ); + expect(archiverManager.getUnArchiver( source )).andReturn( unarchiver ); } catch ( NoSuchArchiverException e ) { Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java Thu Oct 23 18:52:26 2014 @@ -30,16 +30,16 @@ import org.apache.maven.plugin.assembly. import org.apache.maven.plugin.assembly.archive.task.testutils.ArtifactMock; import org.apache.maven.plugin.assembly.format.AssemblyFormattingException; import org.apache.maven.plugin.assembly.model.Assembly; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.project.MavenProject; -import org.easymock.MockControl; -import org.easymock.classextension.MockClassControl; +import org.easymock.classextension.EasyMockSupport; + +import static org.easymock.EasyMock.expect; public class AssemblyFormatUtilsTest extends TestCase { - private final MockManager mockManager = new MockManager(); + private final EasyMockSupport mockManager = new EasyMockSupport(); public void testFixRelativePathRefs_ShouldRemoveRelativeRefToCurrentDir() throws AssemblyFormattingException @@ -294,22 +294,14 @@ public class AssemblyFormatUtilsTest artifactProject.setArtifact( artifactMock.getArtifact() ); - final MockControl sessionCtl = MockClassControl.createControl( MavenSession.class ); - mockManager.add( sessionCtl ); + final MavenSession session = mockManager.createMock(MavenSession.class); + expect( session.getExecutionProperties()).andReturn( null ).anyTimes(); + + expect( session.getUserProperties()).andReturn( new Properties( ) ).anyTimes(); + - final MavenSession session = (MavenSession) sessionCtl.getMock(); - session.getExecutionProperties(); - sessionCtl.setReturnValue( null, MockControl.ZERO_OR_MORE ); - - session.getUserProperties(); - sessionCtl.setReturnValue( new Properties(), MockControl.ZERO_OR_MORE ); - - final MockControl csCtl = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( csCtl ); - - final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csCtl.getMock(); - cs.getMavenSession(); - csCtl.setReturnValue( session, MockControl.ZERO_OR_MORE ); + final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class ); + expect( cs.getMavenSession()).andReturn( session ).anyTimes(); mockManager.replayAll(); @@ -322,7 +314,7 @@ public class AssemblyFormatUtilsTest mockManager.verifyAll(); // clear out for next call. - mockManager.clear(); + mockManager.resetAll(); } public void testEvalFileNameMapping_ShouldResolveGroupIdInOutDir_UseArtifactInfo() @@ -611,22 +603,15 @@ public class AssemblyFormatUtilsTest new ArtifactMock( mockManager, moduleProject.getGroupId(), moduleProject.getArtifactId(), moduleProject.getVersion(), "jar", false, null ); - final MockControl sessionCtl = MockClassControl.createControl( MavenSession.class ); - mockManager.add( sessionCtl ); - final MavenSession session = (MavenSession) sessionCtl.getMock(); - session.getExecutionProperties(); - sessionCtl.setReturnValue( System.getProperties(), MockControl.ZERO_OR_MORE ); - - session.getUserProperties(); - sessionCtl.setReturnValue( new Properties(), MockControl.ZERO_OR_MORE ); - - final MockControl csCtl = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( csCtl ); - - final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csCtl.getMock(); - cs.getMavenSession(); - csCtl.setReturnValue( session, MockControl.ZERO_OR_MORE ); + final MavenSession session = mockManager.createMock( MavenSession.class ); + expect( session.getExecutionProperties()).andReturn( System.getProperties() ).anyTimes(); + + expect(session.getUserProperties()).andReturn( new Properties( ) ).anyTimes(); + + + final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class ); + expect( cs.getMavenSession()).andReturn( session ).anyTimes(); mockManager.replayAll(); @@ -640,7 +625,7 @@ public class AssemblyFormatUtilsTest mockManager.verifyAll(); // clear out for next call. - mockManager.clear(); + mockManager.resetAll(); } private void verifyOutputDir( final String outDir, final String finalName, final String projectFinalName, @@ -721,22 +706,15 @@ public class AssemblyFormatUtilsTest final String checkValue ) throws AssemblyFormattingException { - final MockControl sessionCtl = MockClassControl.createControl( MavenSession.class ); - mockManager.add( sessionCtl ); - final MavenSession session = (MavenSession) sessionCtl.getMock(); - session.getExecutionProperties(); - sessionCtl.setReturnValue( System.getProperties(), MockControl.ZERO_OR_MORE ); - - session.getUserProperties(); - sessionCtl.setReturnValue( new Properties(), MockControl.ZERO_OR_MORE ); - - final MockControl csCtl = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( csCtl ); - - final AssemblerConfigurationSource cs = (AssemblerConfigurationSource) csCtl.getMock(); - cs.getMavenSession(); - csCtl.setReturnValue( session, MockControl.ZERO_OR_MORE ); + final MavenSession session = mockManager.createMock( MavenSession.class ); + expect( session.getExecutionProperties()).andReturn( System.getProperties()).anyTimes(); + + expect( session.getUserProperties()).andReturn( new Properties( ) ).anyTimes(); + + + final AssemblerConfigurationSource cs = mockManager.createMock( AssemblerConfigurationSource.class ); + expect( cs.getMavenSession()).andReturn( session ).anyTimes(); String result; @@ -748,7 +726,7 @@ public class AssemblyFormatUtilsTest mockManager.verifyAll(); - mockManager.clear(); + mockManager.resetAll(); } private void verifyDistroName( final String assemblyId, final String classifier, final String finalName, @@ -769,13 +747,11 @@ public class AssemblyFormatUtilsTest mockManager.verifyAll(); // clear it out for the next call. - mockManager.clear(); + mockManager.resetAll(); } private final class MockAndControlForGetDistroName { - final MockControl control; - final AssemblerConfigurationSource configSource; private final String classifier; @@ -791,24 +767,18 @@ public class AssemblyFormatUtilsTest this.isAssemblyIdAppended = isAssemblyIdAppended; this.classifier = classifier; - control = MockControl.createControl( AssemblerConfigurationSource.class ); - mockManager.add( control ); - - configSource = (AssemblerConfigurationSource) control.getMock(); + configSource = mockManager.createMock (AssemblerConfigurationSource.class); enableExpectations(); } private void enableExpectations() { - configSource.getClassifier(); - control.setReturnValue( classifier, MockControl.ONE_OR_MORE ); + expect(configSource.getClassifier()).andReturn( classifier ).atLeastOnce(); - configSource.isAssemblyIdAppended(); - control.setReturnValue( isAssemblyIdAppended, MockControl.ONE_OR_MORE ); + expect(configSource.isAssemblyIdAppended()).andReturn( isAssemblyIdAppended ).atLeastOnce(); - configSource.getFinalName(); - control.setReturnValue( finalName, MockControl.ONE_OR_MORE ); + expect( configSource.getFinalName()).andReturn( finalName ).atLeastOnce(); } } Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java?rev=1633918&r1=1633917&r2=1633918&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/FilterUtilsTest.java Thu Oct 23 18:52:26 2014 @@ -19,30 +19,30 @@ package org.apache.maven.plugin.assembly * under the License. */ -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import junit.framework.TestCase; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.model.Model; import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException; -import org.apache.maven.plugin.assembly.testutils.MockManager; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.console.ConsoleLogger; -import org.easymock.MockControl; +import org.easymock.classextension.EasyMockSupport; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static org.easymock.EasyMock.expect; public class FilterUtilsTest extends TestCase { - private final MockManager mockManager = new MockManager(); + private final EasyMockSupport mockManager = new EasyMockSupport(); private Logger logger; @@ -54,29 +54,20 @@ public class FilterUtilsTest private void clearAll() { - mockManager.clear(); - logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ); } public void testFilterArtifacts_ShouldThrowExceptionUsingStrictModeWithUnmatchedInclude() { - final MockControl artifactCtl = MockControl.createControl( Artifact.class ); - final Artifact artifact = (Artifact) artifactCtl.getMock(); - - mockManager.add( artifactCtl ); + final Artifact artifact = mockManager.createMock( Artifact.class ); - artifact.getGroupId(); - artifactCtl.setReturnValue( "group", MockControl.ONE_OR_MORE ); + expect(artifact.getGroupId()).andReturn( "group").atLeastOnce(); - artifact.getArtifactId(); - artifactCtl.setReturnValue( "artifact", MockControl.ONE_OR_MORE ); + expect( artifact.getArtifactId()).andReturn( "artifact").atLeastOnce(); - artifact.getId(); - artifactCtl.setReturnValue( "group:artifact:type:version", MockControl.ONE_OR_MORE ); + expect( artifact.getId()).andReturn( "group:artifact:type:version").atLeastOnce(); - artifact.getDependencyConflictId(); - artifactCtl.setReturnValue( "group:artifact:type", MockControl.ONE_OR_MORE ); + expect( artifact.getDependencyConflictId()).andReturn( "group:artifact:type").atLeastOnce(); final List<String> includes = new ArrayList<String>(); @@ -274,7 +265,7 @@ public class FilterUtilsTest mockManager.verifyAll(); // get ready for multiple calls per test. - mockManager.clear(); + mockManager.resetAll(); } private void verifyProjectInclusion( final String groupId, final String artifactId, final String inclusionPattern, @@ -342,7 +333,7 @@ public class FilterUtilsTest mockManager.verifyAll(); // get ready for multiple calls per test. - mockManager.clear(); + mockManager.resetAll(); } private static Model buildModel( final String groupId, final String artifactId ) @@ -372,8 +363,6 @@ public class FilterUtilsTest private final class ArtifactMockAndControl { - final MockControl control; - final Artifact artifact; final String groupId; @@ -388,10 +377,7 @@ public class FilterUtilsTest this.artifactId = artifactId; this.dependencyTrail = dependencyTrail; - control = MockControl.createControl( Artifact.class ); - mockManager.add( control ); - - artifact = (Artifact) control.getMock(); + artifact = mockManager.createMock (Artifact.class); // this is always enabled, for verification purposes. enableGetDependencyConflictId(); @@ -405,26 +391,21 @@ public class FilterUtilsTest void enableGetDependencyTrail() { - artifact.getDependencyTrail(); - control.setReturnValue( dependencyTrail, MockControl.ZERO_OR_MORE ); + expect( artifact.getDependencyTrail()).andReturn( dependencyTrail ).anyTimes(); } void enableGetDependencyConflictId() { - artifact.getDependencyConflictId(); - control.setReturnValue( groupId + ":" + artifactId + ":jar", MockControl.ZERO_OR_MORE ); + expect(artifact.getDependencyConflictId()).andReturn( groupId + ":" + artifactId + ":jar").anyTimes(); } void enableGetGroupIdArtifactIdAndId() { - artifact.getGroupId(); - control.setReturnValue( groupId, MockControl.ZERO_OR_MORE ); + expect( artifact.getGroupId()).andReturn( groupId).anyTimes(); - artifact.getArtifactId(); - control.setReturnValue( artifactId, MockControl.ZERO_OR_MORE ); + expect( artifact.getArtifactId()).andReturn( artifactId ).anyTimes(); - artifact.getId(); - control.setReturnValue( groupId + ":" + artifactId + ":version:null:jar", MockControl.ZERO_OR_MORE ); + expect( artifact.getId()).andReturn( groupId + ":" + artifactId + ":version:null:jar").anyTimes(); } }