Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MRELEASE-1045] Update mockito-core to 2.28.2 #53

Merged
merged 3 commits into from
May 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*
* @author <a href="mailto:[email protected]">Brett Porter</a>
*/
public class IsScmBranchEquals extends ArgumentMatcher<ScmBranch>
public class IsScmBranchEquals implements ArgumentMatcher<ScmBranch>
{
private final ScmBranch branch;

Expand All @@ -37,7 +37,7 @@ public IsScmBranchEquals( ScmBranch branch )
}

@Override
public boolean matches( Object argument )
public boolean matches( ScmBranch argument )
{
ScmBranch sb = (ScmBranch) argument;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
* under the License.
*/

import org.apache.maven.scm.ScmBranch;
import org.apache.maven.scm.ScmBranchParameters;

import org.mockito.ArgumentMatcher;

/**
* @author <a href="mailto:[email protected]">olamy</a>
*/
public class IsScmBranchParametersEquals extends ArgumentMatcher<ScmBranchParameters>
public class IsScmBranchParametersEquals implements ArgumentMatcher<ScmBranchParameters>
{
private final ScmBranchParameters scmBranchParameters;

Expand All @@ -36,7 +37,7 @@ public IsScmBranchParametersEquals( ScmBranchParameters scmBranchParameters )
}

@Override
public boolean matches( Object argument )
public boolean matches( ScmBranchParameters argument )
{
ScmBranchParameters sbp = (ScmBranchParameters) argument;
return sbp.getMessage().equals( this.scmBranchParameters.getMessage() )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* @author <a href="mailto:[email protected]">Brett Porter</a>
* @todo add an equals() method
*/
public class IsScmFileSetEquals extends ArgumentMatcher<ScmFileSet>
public class IsScmFileSetEquals implements ArgumentMatcher<ScmFileSet>
{
private final ScmFileSet fileSet;

Expand All @@ -40,7 +40,7 @@ public IsScmFileSetEquals( ScmFileSet fileSet )
}

@Override
public boolean matches( Object argument )
public boolean matches( ScmFileSet argument )
{
ScmFileSet fs = (ScmFileSet) argument;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* @author <a href="mailto:[email protected]">Brett Porter</a>
* @todo add an equals() method
*/
public class IsScmTagEquals extends ArgumentMatcher<ScmTag>
public class IsScmTagEquals implements ArgumentMatcher<ScmTag>
{
private final ScmTag tag;

Expand All @@ -38,10 +38,12 @@ public IsScmTagEquals( ScmTag tag )
}

@Override
public boolean matches( Object argument )
public boolean matches( ScmTag argument )
{
ScmTag tag = (ScmTag) argument;

return tag.getName().equals( this.tag.getName() );
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/**
* @author <a href="mailto:[email protected]">olamy</a>
*/
public class IsScmTagParametersEquals extends ArgumentMatcher<ScmTagParameters>
public class IsScmTagParametersEquals implements ArgumentMatcher<ScmTagParameters>
{
private final ScmTagParameters scmTagParameters;

Expand All @@ -35,7 +35,7 @@ public IsScmTagParametersEquals( ScmTagParameters scmTagParameters )
}

@Override
public boolean matches( Object argument )
public boolean matches( ScmTagParameters argument )
{
ScmTagParameters stp = (ScmTagParameters) argument;
return stp.getMessage().equals( this.scmTagParameters.getMessage() )
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.5</version>
<version>2.28.2</version>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
Expand Down