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

Update io.spring.javaformat to 0.0.27

Browse Source 
Closes gh-9553
This commit is contained in:
Rob Winch
2021-04-05 22:03:45 -05:00
parent 7cc8dac37d
commit f3f1106624
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java
View File

@@ -40,9 +40,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
import static org.mockito.BDDMockito.verify;
import static org.mockito.BDDMockito.when;
/**
* @author Rob Winch
@@ -141,7 +141,7 @@ public class AuthenticationPrincipalArgumentResolverTests {
public void resolveArgumentSpelBean() throws Exception {
CustomUserPrincipal principal = new CustomUserPrincipal();
setAuthenticationPrincipal(principal);
when(this.beanResolver.resolve(any(), eq("test"))).thenReturn(principal.property);
given(this.beanResolver.resolve(any(), eq("test"))).willReturn(principal.property);
this.expectedPrincipal = principal.property;
assertThat(this.resolver.resolveArgument(showUserSpelBean(), null, null, null))
.isEqualTo(this.expectedPrincipal);

4
web/src/test/java/org/springframework/security/web/method/annotation/CurrentSecurityContextArgumentResolverTests.java
View File

@@ -42,9 +42,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.mock;
import static org.mockito.BDDMockito.verify;
import static org.mockito.BDDMockito.when;
/**
* @author Dan Zheng
@@ -119,7 +119,7 @@ public class CurrentSecurityContextArgumentResolverTests {
@Test
public void resolveArgumentWithAuthenticationWithBean() throws Exception {
String principal = "john";
when(this.beanResolver.resolve(any(), eq("test"))).thenReturn(principal);
given(this.beanResolver.resolve(any(), eq("test"))).willReturn(principal);
assertThat(this.resolver.resolveArgument(showSecurityContextAuthenticationWithBean(), null, null, null))
.isEqualTo(principal);
verify(this.beanResolver).resolve(any(), eq("test"));