Author: rfscholte
Date: Thu Feb 23 22:57:04 2012
New Revision: 1293008
URL: http://svn.apache.org/viewvc?rev=1293008&view=rev
Log:
MRELEASE-741: migrate to mockito
Modified:
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java
Modified:
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java?rev=1293008&r1=1293007&r2=1293008&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
Thu Feb 23 22:57:04 2012
@@ -19,7 +19,16 @@ package org.apache.maven.plugins.release
* under the License.
*/
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
import java.io.File;
+import java.util.List;
import java.util.Properties;
import org.apache.maven.execution.MavenSession;
@@ -31,13 +40,6 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.ReleaseManager;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
-import org.jmock.Mock;
-import org.jmock.core.Constraint;
-import org.jmock.core.constraint.IsEqual;
-import org.jmock.core.constraint.IsInstanceOf;
-import org.jmock.core.constraint.IsNull;
-import org.jmock.core.matcher.InvokeOnceMatcher;
-import org.jmock.core.stub.ThrowStub;
/**
* Test release:prepare.
@@ -53,6 +55,7 @@ public class PrepareReleaseMojoTest
setVariableValueToObject( mojo, "updateWorkingCopyVersions",
Boolean.TRUE );
}
+ @SuppressWarnings( "unchecked" )
public void testPrepare()
throws Exception
{
@@ -71,24 +74,18 @@ public class PrepareReleaseMojoTest
releaseDescriptor.setWorkingDirectory(
testFile.getParentFile().getAbsolutePath() );
releaseDescriptor.setUpdateDependencies( false );
- Mock mock = new Mock( ReleaseManager.class );
-
- Constraint[] constraints = new Constraint[] {
- new IsEqual( releaseDescriptor ),
- new IsInstanceOf( ReleaseEnvironment.class ),
- new IsNull(),
- new IsEqual( Boolean.TRUE ),
- new IsEqual( Boolean.FALSE )
- };
-
- mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with(
constraints );
- mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
+ ReleaseManager mock = mock( ReleaseManager.class );
+ mojo.setReleaseManager( mock );
+ // execute
mojo.execute();
+ // verify
+ verify( mock ).prepare( eq( releaseDescriptor ), isA(
ReleaseEnvironment.class ), isNull( List.class), eq( true ), eq( false ) );
assertTrue( true );
}
+ @SuppressWarnings( "unchecked" )
public void testPrepareWithExecutionException()
throws Exception
{
@@ -106,20 +103,15 @@ public class PrepareReleaseMojoTest
releaseDescriptor.setWorkingDirectory(
testFile.getParentFile().getAbsolutePath() );
releaseDescriptor.setUpdateDependencies( false );
- Mock mock = new Mock( ReleaseManager.class );
-
- Constraint[] constraints = new Constraint[] {
- new IsEqual( releaseDescriptor ),
- new IsInstanceOf( ReleaseEnvironment.class ),
- new IsNull(),
- new IsEqual( Boolean.TRUE ),
- new IsEqual( Boolean.FALSE )
- };
-
- mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with(
constraints ).will(
- new ThrowStub( new ReleaseExecutionException( "..." ) ) );
- mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
+ ReleaseManager mock = mock( ReleaseManager.class );
+ doThrow( new ReleaseExecutionException( "..." ) ).when( mock
).prepare( eq( releaseDescriptor ),
+
isA( ReleaseEnvironment.class ),
+
isNull( List.class),
+
eq( true ),
+
eq( false ) );
+ mojo.setReleaseManager( mock );
+ //execute
try
{
mojo.execute();
@@ -130,8 +122,17 @@ public class PrepareReleaseMojoTest
{
assertEquals( "Check cause", ReleaseExecutionException.class,
e.getCause().getClass() );
}
+
+ // verify
+ verify( mock ).prepare( eq( releaseDescriptor ),
+ isA( ReleaseEnvironment.class ),
+ isNull( List.class),
+ eq( true ),
+ eq( false ) );
+ verifyNoMoreInteractions( mock );
}
+ @SuppressWarnings( "unchecked" )
public void testPrepareWithExecutionFailure()
throws Exception
{
@@ -149,21 +150,16 @@ public class PrepareReleaseMojoTest
releaseDescriptor.setWorkingDirectory(
testFile.getParentFile().getAbsolutePath() );
releaseDescriptor.setUpdateDependencies( false );
- Mock mock = new Mock( ReleaseManager.class );
-
- Constraint[] constraints = new Constraint[] {
- new IsEqual( releaseDescriptor ),
- new IsInstanceOf( ReleaseEnvironment.class ),
- new IsNull(),
- new IsEqual( Boolean.TRUE ),
- new IsEqual( Boolean.FALSE )
- };
-
+ ReleaseManager mock = mock( ReleaseManager.class );
ReleaseFailureException cause = new ReleaseFailureException( "..." );
- mock.expects( new InvokeOnceMatcher() ).method( "prepare" ).with(
constraints ).will(
- new ThrowStub( cause ) );
- mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
+ doThrow( cause ).when( mock ).prepare( eq( releaseDescriptor ),
+ isA( ReleaseEnvironment.class
),
+ isNull( List.class),
+ eq( true ),
+ eq( false ) );
+ mojo.setReleaseManager( mock );
+ // execute
try
{
mojo.execute();
@@ -174,6 +170,13 @@ public class PrepareReleaseMojoTest
{
assertEquals( "Check cause exists", cause, e.getCause() );
}
+ // verify
+ verify( mock ).prepare( eq( releaseDescriptor ),
+ isA( ReleaseEnvironment.class ),
+ isNull( List.class),
+ eq( true ),
+ eq( false ) );
+ verifyNoMoreInteractions( mock );
}
/*
Modified:
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java?rev=1293008&r1=1293007&r2=1293008&view=diff
==============================================================================
---
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java
(original)
+++
maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/StageReleaseMojoTest.java
Thu Feb 23 22:57:04 2012
@@ -19,6 +19,16 @@ package org.apache.maven.plugins.release
* under the License.
*/
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Site;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
@@ -26,14 +36,6 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.shared.release.ReleaseManager;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
-import org.jmock.Mock;
-import org.jmock.core.Constraint;
-import org.jmock.core.constraint.IsEqual;
-import org.jmock.core.constraint.IsInstanceOf;
-import org.jmock.core.constraint.IsNull;
-import org.jmock.core.matcher.InvokeOnceMatcher;
-
-import java.io.File;
/**
* Test release:perform.
@@ -45,6 +47,7 @@ public class StageReleaseMojoTest
{
private File workingDirectory;
+ @SuppressWarnings( "unchecked" )
public void testStage()
throws Exception
{
@@ -57,21 +60,13 @@ public class StageReleaseMojoTest
releaseDescriptor.setPerformGoals( "deploy site:stage-deploy" );
releaseDescriptor.setAdditionalArguments(
"-DaltDeploymentRepository=\"staging\"" );
- Mock mock = new Mock( ReleaseManager.class );
-
- Constraint[] constraints = new Constraint[] {
- new IsEqual( releaseDescriptor ),
- new IsInstanceOf( ReleaseEnvironment.class ),
- new IsNull(),
- new IsEqual( Boolean.FALSE )
- };
-
- mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with(
constraints );
- mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
+ ReleaseManager mock = mock( ReleaseManager.class );
+ mojo.setReleaseManager( mock );
mojo.execute();
- assertTrue( true );
+ verify( mock ).perform( eq( releaseDescriptor ), isA(
ReleaseEnvironment.class ), isNull( List.class ), eq( false ) );
+ verifyNoMoreInteractions( mock );
}
private StageReleaseMojo getMojoWithProjectSite( String fileName )
