Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Mockito 2.10.0

Browse Source 
Issue: gh-4608
This commit is contained in:
Rob Winch
2017-10-09 13:19:21 -05:00
parent 74aa8bc803
commit 445834784a
40 changed files with 78 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
messaging/spring-security-messaging.gradle
View File

@@ -14,7 +14,7 @@ dependencies {
testCompile project(path: ':spring-security-core', configuration: 'tests')
testCompile 'commons-codec:commons-codec'
testCompile powerMockDependencies
testCompile powerMock2Dependencies
testCompile slf4jDependencies
testCompile spockDependencies

1
messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java
View File

@@ -100,7 +100,6 @@ public class AndMessageMatcherTest {
@Test
public void matchesMultiBothFalse() {
when(delegate.matches(message)).thenReturn(false);
when(delegate2.matches(message)).thenReturn(false);
matcher = new AndMessageMatcher<Object>(delegate, delegate2);
assertThat(matcher.matches(message)).isFalse();

2
messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java
View File

@@ -83,7 +83,6 @@ public class OrMessageMatcherTest {
@Test
public void matchesMultiTrue() {
when(delegate.matches(message)).thenReturn(true);
when(delegate2.matches(message)).thenReturn(true);
matcher = new OrMessageMatcher<Object>(delegate, delegate2);
assertThat(matcher.matches(message)).isTrue();
@@ -109,7 +108,6 @@ public class OrMessageMatcherTest {
@Test
public void matchesMultiSingleFalse() {
when(delegate.matches(message)).thenReturn(true);
when(delegate2.matches(message)).thenReturn(false);
matcher = new OrMessageMatcher<Object>(delegate, delegate2);
assertThat(matcher.matches(message)).isTrue();