Skip to content

Commit

Permalink
Replace EasyMock with Mockito
Browse files Browse the repository at this point in the history
  • Loading branch information
@rfscholte
rfscholte committed Apr 26, 2020
1 parent 3a58218 commit 2c44462
Show file tree
Hide file tree
Showing 22 changed files with 1,279 additions and 2,540 deletions.
12 changes: 0 additions & 12 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,6 @@ under the License.
<version>2.28.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<version>2.5.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.5.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
Expand Down
634 changes: 260 additions & 374 deletions src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java
View file

Large diffs are not rendered by default.

30 changes: 4 additions & 26 deletions src/test/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,15 @@
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.ArchiveFinalizer;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.util.IOUtil;
import org.easymock.classextension.EasyMockSupport;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith( MockitoJUnitRunner.class )
public class ManifestCreationFinalizerTest
{

Expand All @@ -62,18 +63,10 @@ public void testShouldDoNothingWhenArchiveConfigIsNull()
public void testShouldDoNothingWhenArchiverIsNotJarArchiver()
throws Exception
{
EasyMockSupport mm = new EasyMockSupport();

MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );

MavenProject project = new MavenProject( new Model() );
MavenArchiveConfiguration config = new MavenArchiveConfiguration();

mm.replayAll();

new ManifestCreationFinalizer( null, project, config ).finalizeArchiveCreation( macArchiver.archiver );

mm.verifyAll();
new ManifestCreationFinalizer( null, project, config ).finalizeArchiveCreation( null );
}

@Test
Expand Down Expand Up @@ -147,24 +140,9 @@ public void testShouldAddManifestEntriesWhenArchiverIsJarArchiver()

IOUtil.copy( reader, writer );

System.out.println( "Test Manifest:\n\n" + writer );

assertTrue( writer.toString().contains( testKey + ": " + testValue ) );

// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4823678
( (JarURLConnection) resource.openConnection() ).getJarFile().close();
}

private final class MockAndControlForArchiver
{
final Archiver archiver;


MockAndControlForArchiver( EasyMockSupport mm )
{

archiver = mm.createMock( Archiver.class );
}
}

}
24 changes: 14 additions & 10 deletions ...st/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,22 @@
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import javax.annotation.Nonnull;

import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.FileSet;
Expand All @@ -42,17 +52,11 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.junit.MockitoJUnitRunner;

import javax.annotation.Nonnull;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

@RunWith( MockitoJUnitRunner.class )
public class AssemblyProxyArchiverTest
{
@Rule
Expand Down
110 changes: 49 additions & 61 deletions .../java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,48 @@
* under the License.
*/

import static org.mockito.ArgumentMatchers.anyListOf;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Set;

import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Model;
import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugins.assembly.archive.task.testutils.MockAndControlForAddDependencySetsTask;
import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException;
import org.apache.maven.plugins.assembly.artifact.DependencyResolver;
import org.apache.maven.plugins.assembly.format.AssemblyFormattingException;
import org.apache.maven.plugins.assembly.model.Assembly;
import org.apache.maven.plugins.assembly.model.DependencySet;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.easymock.classextension.EasyMockSupport;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith( MockitoJUnitRunner.class )
public class DependencySetAssemblyPhaseTest
{

final EasyMockSupport mm = new EasyMockSupport();
private DependencySetAssemblyPhase phase;

private DependencyResolver dependencyResolver;

@Before
public void setUp()
{
this.dependencyResolver = mock( DependencyResolver.class );

this.phase = new DependencySetAssemblyPhase( null, dependencyResolver, null );
}

@Test
public void testExecute_ShouldAddOneDependencyFromProject()
Expand Down Expand Up @@ -72,75 +88,47 @@ public void testExecute_ShouldAddOneDependencyFromProject()
assembly.setIncludeBaseDirectory( false );
assembly.addDependencySet( ds );

final MockAndControlForAddDependencySetsTask macTask =
new MockAndControlForAddDependencySetsTask( mm, project );

macTask.expectCSGetRepositories( null, null );

macTask.expectGetDestFile( new File( "junk" ) );
// macTask.expectAddFile( artifactFile, "out/dep", 10 );

project.setArtifacts( Collections.singleton( artifact ) );

macTask.expectCSGetFinalName( "final-name" );

final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );

final MavenProject depProject = newMavenProject( "group", "dep", "1" );

macTask.expectBuildFromRepository( depProject );

macTask.expectResolveDependencySets();

mm.replayAll();

createPhase( macTask, logger, macTask.dependencyResolver ).execute( assembly, macTask.archiver,
macTask.configSource );

mm.verifyAll();
}

private MavenProject newMavenProject( final String groupId, final String artifactId, final String version )
{
final Model model = new Model();
model.setGroupId( groupId );
model.setArtifactId( artifactId );
model.setVersion( version );
when( dependencyResolver.resolveDependencySets( eq( assembly ),
isNull(AssemblerConfigurationSource.class),
anyListOf( DependencySet.class ) ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );

this.phase.execute( assembly, null, null );

return new MavenProject( model );
// result of easymock migration, should be assert of expected result instead of verifying methodcalls
verify( dependencyResolver ).resolveDependencySets( eq( assembly ),
isNull(AssemblerConfigurationSource.class),
anyListOf( DependencySet.class ) );
}

@Test
public void testExecute_ShouldNotAddDependenciesWhenProjectHasNone()
throws AssemblyFormattingException, ArchiveCreationException, IOException,
InvalidAssemblerConfigurationException, DependencyResolutionException
throws Exception
{
final Assembly assembly = new Assembly();

assembly.setId( "test" );
assembly.setIncludeBaseDirectory( false );

when( dependencyResolver.resolveDependencySets( eq( assembly ),
isNull( AssemblerConfigurationSource.class ),
anyListOf( DependencySet.class ) ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );

final Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );

final MockAndControlForAddDependencySetsTask macTask = new MockAndControlForAddDependencySetsTask( mm, null );

macTask.expectResolveDependencySets();

mm.replayAll();

createPhase( macTask, logger, macTask.dependencyResolver ).execute( assembly, null, macTask.configSource );
this.phase.execute( assembly, null, null );

mm.verifyAll();
// result of easymock migration, should be assert of expected result instead of verifying methodcalls
verify( dependencyResolver ).resolveDependencySets( eq( assembly ),
isNull( AssemblerConfigurationSource.class ),
anyListOf( DependencySet.class ) );
}

private DependencySetAssemblyPhase createPhase( final MockAndControlForAddDependencySetsTask macTask,
final Logger logger, DependencyResolver dr )

private MavenProject newMavenProject( final String groupId, final String artifactId, final String version )
{
final DependencySetAssemblyPhase phase = new DependencySetAssemblyPhase( null, dr, null );

phase.enableLogging( logger );
final Model model = new Model();
model.setGroupId( groupId );
model.setArtifactId( artifactId );
model.setVersion( version );

return phase;
return new MavenProject( model );
}

}
7 changes: 5 additions & 2 deletions src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* under the License.
*/

import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
Expand All @@ -44,7 +44,10 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.junit.MockitoJUnitRunner;

@RunWith( MockitoJUnitRunner.class )
public class FileItemAssemblyPhaseTest
{
@Rule
Expand Down
Loading

0 comments on commit 2c44462

Please sign in to comment.