-
Notifications
You must be signed in to change notification settings - Fork 132
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MRELEASE-1045] Update mockito-core to 2.28.2 (#53)
* [MRELEASE-1045] Update mockito-core to 2.28.2 changed classes to implement interfaces that used to be abstract classes
- Loading branch information
1 parent
11dc53c
commit 01676ee
Showing
6 changed files
with
14 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
||
|
@@ -37,7 +37,7 @@ public IsScmBranchEquals( ScmBranch branch ) | |
} | ||
|
||
@Override | ||
public boolean matches( Object argument ) | ||
public boolean matches( ScmBranch argument ) | ||
{ | ||
ScmBranch sb = (ScmBranch) argument; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
||
|
@@ -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() ) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
||
|
@@ -40,7 +40,7 @@ public IsScmFileSetEquals( ScmFileSet fileSet ) | |
} | ||
|
||
@Override | ||
public boolean matches( Object argument ) | ||
public boolean matches( ScmFileSet argument ) | ||
{ | ||
ScmFileSet fs = (ScmFileSet) argument; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
||
|
@@ -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() ); | ||
} | ||
|
||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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; | ||
|
||
|
@@ -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() ) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters