Commit 6663eea

committed

Polish OTT Tests

Improve tests so that they do not rely on OneTimeTokenAuthenticationToken as the concrete type. Issue gh-17799

1 parent 89b2f9c commit 6663eeaCopy full SHA for 6663eea

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`import org.mockito.junit.jupiter.MockitoExtension;`
`27`	`27`
`28`	`28`	`import org.springframework.security.authentication.BadCredentialsException;`
	`29`	`+import org.springframework.security.core.Authentication;`
`29`	`30`	`import org.springframework.security.core.userdetails.User;`
`30`	`31`	`import org.springframework.security.core.userdetails.UserDetailsService;`
`31`	`32`	`import org.springframework.security.core.userdetails.UsernameNotFoundException;`
`@@ -69,8 +70,7 @@ void authenticateWhenAuthenticationTokenIsPresentThenAuthenticates() {`
`69`	`70`	`.willReturn(new User(USERNAME, PASSWORD, List.of()));`
`70`	`71`	`OneTimeTokenAuthenticationToken token = new OneTimeTokenAuthenticationToken(TOKEN);`
`71`	`72`
`72`		`- OneTimeTokenAuthenticationToken authentication = (OneTimeTokenAuthenticationToken) this.provider`
`73`		`- .authenticate(token);`
	`73`	`+ Authentication authentication = this.provider.authenticate(token);`
`74`	`74`
`75`	`75`	`User user = (User) authentication.getPrincipal();`
`76`	`76`	`assertThat(authentication.isAuthenticated()).isTrue();`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,13 +88,12 @@ void authenticateWhenOneTimeTokenAuthenticationTokenIsPresentThenSuccess() {`
`88`	`88`	`this.authenticationManager = new OneTimeTokenReactiveAuthenticationManager(oneTimeTokenService,`
`89`	`89`	`userDetailsService);`
`90`	`90`
`91`		`- Authentication auth = this.authenticationManager`
	`91`	`+ Authentication token = this.authenticationManager`
`92`	`92`	`.authenticate(OneTimeTokenAuthenticationToken.unauthenticated(TOKEN))`
`93`	`93`	`.block();`
`94`	`94`
`95`		`- OneTimeTokenAuthenticationToken token = (OneTimeTokenAuthenticationToken) auth;`
`96`	`95`	`UserDetails user = (UserDetails) token.getPrincipal();`
`97`		`- Collection<GrantedAuthority> authorities = token.getAuthorities();`
	`96`	`+ Collection<? extendsGrantedAuthority> authorities = token.getAuthorities();`
`98`	`97`
`99`	`98`	`assertThat(user).isNotNull();`
`100`	`99`	`assertThat(user.getUsername()).isEqualTo(USERNAME);`

Comments

(0)