Author: rfscholte
Date: Thu Feb 23 19:46:38 2012
New Revision: 1292923
URL: http://svn.apache.org/viewvc?rev=1292923&view=rev
Log:
Remove jmocks Constraint interface from ArgumentMatchers
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=1292923&r1=1292922&r2=1292923&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
Thu Feb 23 19:46:38 2012
@@ -22,7 +22,6 @@ package org.apache.maven.shared.release.
import java.io.IOException;
import org.apache.maven.scm.ScmFileSet;
-import org.jmock.core.Constraint;
import org.mockito.ArgumentMatcher;
/**
@@ -32,7 +31,6 @@ import org.mockito.ArgumentMatcher;
* @todo add an equals() method
*/
public class IsScmFileSetEquals extends ArgumentMatcher<ScmFileSet>
- implements Constraint
{
private final ScmFileSet fileSet;
@@ -41,11 +39,6 @@ public class IsScmFileSetEquals extends
this.fileSet = fileSet;
}
- public boolean eval( Object object )
- {
- return matches( object );
- }
-
@Override
public boolean matches( Object argument )
{
@@ -62,9 +55,4 @@ public class IsScmFileSetEquals extends
throw new RuntimeException(e.getMessage(), e);
}
}
-
- public StringBuffer describeTo( StringBuffer stringBuffer )
- {
- return stringBuffer.append( fileSet.toString() );
- }
-}
+}
\ No newline at end of file
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=1292923&r1=1292922&r2=1292923&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
Thu Feb 23 19:46:38 2012
@@ -20,7 +20,6 @@ package org.apache.maven.shared.release.
*/
import org.apache.maven.scm.ScmTag;
-import org.jmock.core.Constraint;
import org.mockito.ArgumentMatcher;
/**
@@ -30,7 +29,6 @@ import org.mockito.ArgumentMatcher;
* @todo add an equals() method
*/
public class IsScmTagEquals extends ArgumentMatcher<ScmTag>
- implements Constraint
{
private final ScmTag tag;
@@ -39,11 +37,6 @@ public class IsScmTagEquals extends Argu
this.tag = tag;
}
- public boolean eval( Object object )
- {
- return matches( object );
- }
-
@Override
public boolean matches( Object argument )
{
@@ -51,9 +44,4 @@ public class IsScmTagEquals extends Argu
return tag.getName().equals( this.tag.getName() );
}
-
- public StringBuffer describeTo( StringBuffer stringBuffer )
- {
- return stringBuffer.append( tag.toString() );
- }
}
\ No newline at end of file
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=1292923&r1=1292922&r2=1292923&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
Thu Feb 23 19:46:38 2012
@@ -1,9 +1,5 @@
package org.apache.maven.shared.release.phase;
-import org.apache.maven.scm.ScmTagParameters;
-import org.jmock.core.Constraint;
-import org.mockito.ArgumentMatcher;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,11 +19,13 @@ import org.mockito.ArgumentMatcher;
* under the License.
*/
+import org.apache.maven.scm.ScmTagParameters;
+import org.mockito.ArgumentMatcher;
+
/**
* @author <a href="mailto:[email protected]";>olamy</a>
*/
public class IsScmTagParamtersEquals extends ArgumentMatcher<ScmTagParameters>
- implements Constraint
{
private final ScmTagParameters scmTagParameters;
@@ -35,14 +33,6 @@ public class IsScmTagParamtersEquals ext
{
this.scmTagParameters = scmTagParameters;
}
-
- /**
- * @see org.jmock.core.Constraint#eval(java.lang.Object)
- */
- public boolean eval( Object o )
- {
- return matches( o );
- }
@Override
public boolean matches( Object argument )
@@ -51,14 +41,4 @@ public class IsScmTagParamtersEquals ext
return stp.getMessage().equals( this.scmTagParameters.getMessage() )
&& stp.isRemoteTagging() ==
this.scmTagParameters.isRemoteTagging();
}
-
- /**
- * @see org.jmock.core.SelfDescribing#describeTo(java.lang.StringBuffer)
- */
- public StringBuffer describeTo( StringBuffer buffer )
- {
- // TODO Auto-generated method stub
- return null;
- }
-
}
