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/02/19 23:19:24 UTC
svn commit: r1291075 - in
/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase:
IsScmFileSetEquals.java IsScmTagEquals.java IsScmTagParamtersEquals.java
Author: rfscholte
Date: Sun Feb 19 22:19:23 2012
New Revision: 1291075
URL: http://svn.apache.org/viewvc?rev=1291075&view=rev
Log:
MRELEASE-741: migrate to mockito, let custom Constraint extend ArgumentMatcher
Modified:
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParamtersEquals.java
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java?rev=1291075&r1=1291074&r2=1291075&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java Sun Feb 19 22:19:23 2012
@@ -23,6 +23,7 @@ import java.io.IOException;
import org.apache.maven.scm.ScmFileSet;
import org.jmock.core.Constraint;
+import org.mockito.ArgumentMatcher;
/**
* JMock constraint to compare file sets since it has no equals method.
@@ -30,7 +31,7 @@ import org.jmock.core.Constraint;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @todo add an equals() method
*/
-public class IsScmFileSetEquals
+public class IsScmFileSetEquals extends ArgumentMatcher<ScmFileSet>
implements Constraint
{
private final ScmFileSet fileSet;
@@ -42,7 +43,13 @@ public class IsScmFileSetEquals
public boolean eval( Object object )
{
- ScmFileSet fs = (ScmFileSet) object;
+ return matches( object );
+ }
+
+ @Override
+ public boolean matches( Object argument )
+ {
+ ScmFileSet fs = (ScmFileSet) argument;
try
{
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java?rev=1291075&r1=1291074&r2=1291075&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java Sun Feb 19 22:19:23 2012
@@ -21,6 +21,7 @@ package org.apache.maven.shared.release.
import org.apache.maven.scm.ScmTag;
import org.jmock.core.Constraint;
+import org.mockito.ArgumentMatcher;
/**
* JMock constraint to compare tags since it has no equals method.
@@ -28,7 +29,7 @@ import org.jmock.core.Constraint;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @todo add an equals() method
*/
-public class IsScmTagEquals
+public class IsScmTagEquals extends ArgumentMatcher<ScmTag>
implements Constraint
{
private final ScmTag tag;
@@ -40,7 +41,13 @@ public class IsScmTagEquals
public boolean eval( Object object )
{
- ScmTag tag = (ScmTag) object;
+ return matches( object );
+ }
+
+ @Override
+ public boolean matches( Object argument )
+ {
+ ScmTag tag = (ScmTag) argument;
return tag.getName().equals( this.tag.getName() );
}
Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParamtersEquals.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParamtersEquals.java?rev=1291075&r1=1291074&r2=1291075&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParamtersEquals.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParamtersEquals.java Sun Feb 19 22:19:23 2012
@@ -2,6 +2,7 @@ package org.apache.maven.shared.release.
import org.apache.maven.scm.ScmTagParameters;
import org.jmock.core.Constraint;
+import org.mockito.ArgumentMatcher;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +26,7 @@ import org.jmock.core.Constraint;
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
*/
-public class IsScmTagParamtersEquals
+public class IsScmTagParamtersEquals extends ArgumentMatcher<ScmTagParameters>
implements Constraint
{
private final ScmTagParameters scmTagParameters;
@@ -35,13 +36,18 @@ public class IsScmTagParamtersEquals
this.scmTagParameters = scmTagParameters;
}
-
/**
* @see org.jmock.core.Constraint#eval(java.lang.Object)
*/
public boolean eval( Object o )
{
- ScmTagParameters stp = (ScmTagParameters) o;
+ return matches( o );
+ }
+
+ @Override
+ public boolean matches( Object argument )
+ {
+ ScmTagParameters stp = (ScmTagParameters) argument;
return stp.getMessage().equals( this.scmTagParameters.getMessage() )
&& stp.isRemoteTagging() == this.scmTagParameters.isRemoteTagging();
}