You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/01/21 21:50:51 UTC
svn commit: r1234414 - in /maven/enforcer/trunk: enforcer-rules/pom.xml
enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
pom.xml
Author: rfscholte
Date: Sat Jan 21 20:50:50 2012
New Revision: 1234414
URL: http://svn.apache.org/viewvc?rev=1234414&view=rev
Log:
Replace easymock with mockito
Modified:
maven/enforcer/trunk/enforcer-rules/pom.xml
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
maven/enforcer/trunk/pom.xml
Modified: maven/enforcer/trunk/enforcer-rules/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=1234414&r1=1234413&r2=1234414&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-rules/pom.xml Sat Jan 21 20:50:50 2012
@@ -82,8 +82,8 @@
<artifactId>junit</artifactId>
</dependency>
<dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java?rev=1234414&r1=1234413&r2=1234414&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java Sat Jan 21 20:50:50 2012
@@ -19,13 +19,14 @@ package org.apache.maven.plugins.enforce
* under the License.
*/
+import static org.mockito.Mockito.*;
+
import junit.framework.TestCase;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.easymock.MockControl;
/**
* The Class TestEvaluateBeanshell.
@@ -105,14 +106,11 @@ public class TestEvaluateBeanshell
EvaluateBeanshell rule = new EvaluateBeanshell();
rule.condition = "${env} == null";
rule.message = "We have a variable : ${env}";
- MockControl evalControl = MockControl.createControl( ExpressionEvaluator.class );
+
+ ExpressionEvaluator eval = mock( ExpressionEvaluator.class );
+ when( eval.evaluate( rule.condition ) ).thenThrow( new ExpressionEvaluationException( "expected error" ) );
try
{
- ExpressionEvaluator eval = (ExpressionEvaluator) evalControl.getMock();
- eval.evaluate( rule.condition );
- evalControl.expectAndDefaultThrow( null, new ExpressionEvaluationException( "expected error" ) );
- evalControl.replay();
-
EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( project, eval );
rule.execute( helper );
fail( "Expected an exception." );
@@ -121,8 +119,7 @@ public class TestEvaluateBeanshell
{
assertFalse( e.getLocalizedMessage().equals( rule.message ) );
}
-
- evalControl.verify();
+ verify( eval );
}
public void testRuleInvalidBeanshell()
Modified: maven/enforcer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=1234414&r1=1234413&r2=1234414&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Sat Jan 21 20:50:50 2012
@@ -212,9 +212,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.2_Java1.3</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.0</version>
<scope>test</scope>
</dependency>
<dependency>