diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java index cd91ae1745..2db9f37c61 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java @@ -112,7 +112,7 @@ public class JdbcAclServiceTests { given(this.jdbcOperations.query(anyString(), eq(args), any(RowMapper.class))).willReturn(result); ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 1L); List objectIdentities = this.aclService.findChildren(objectIdentity); - assertThat(objectIdentities.size()).isEqualTo(1); + assertThat(objectIdentities).hasSize(1); assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("5577"); } @@ -127,7 +127,7 @@ public class JdbcAclServiceTests { public void findChildrenWithoutIdType() { ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 4711L); List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); - assertThat(objectIdentities.size()).isEqualTo(1); + assertThat(objectIdentities).hasSize(1); assertThat(objectIdentities.get(0).getType()).isEqualTo(MockUntypedIdDomainObject.class.getName()); assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo(5000L); } @@ -143,7 +143,7 @@ public class JdbcAclServiceTests { public void findChildrenOfIdTypeLong() { ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US-PAL"); List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); - assertThat(objectIdentities.size()).isEqualTo(2); + assertThat(objectIdentities).hasSize(2); assertThat(objectIdentities.get(0).getType()).isEqualTo(MockLongIdDomainObject.class.getName()); assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo(4711L); assertThat(objectIdentities.get(1).getType()).isEqualTo(MockLongIdDomainObject.class.getName()); @@ -155,7 +155,7 @@ public class JdbcAclServiceTests { ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US"); this.aclServiceIntegration.setAclClassIdSupported(true); List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); - assertThat(objectIdentities.size()).isEqualTo(1); + assertThat(objectIdentities).hasSize(1); assertThat(objectIdentities.get(0).getType()).isEqualTo("location"); assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("US-PAL"); } @@ -165,7 +165,7 @@ public class JdbcAclServiceTests { ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockUntypedIdDomainObject.class, 5000L); this.aclServiceIntegration.setAclClassIdSupported(true); List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); - assertThat(objectIdentities.size()).isEqualTo(1); + assertThat(objectIdentities).hasSize(1); assertThat(objectIdentities.get(0).getType()).isEqualTo("costcenter"); assertThat(objectIdentities.get(0).getIdentifier()) .isEqualTo(UUID.fromString("25d93b3f-c3aa-4814-9d5e-c7c96ced7762")); @@ -186,7 +186,7 @@ public class JdbcAclServiceTests { ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US"); this.aclServiceIntegration.setAclClassIdSupported(true); List objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity); - assertThat(objectIdentities.size()).isEqualTo(1); + assertThat(objectIdentities).hasSize(1); assertThat(objectIdentities.get(0).getType()).isEqualTo("location"); assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("prefix:US-PAL"); } diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java index 50c1ba685b..dc38d7c93f 100644 --- a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java +++ b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java @@ -120,9 +120,9 @@ public class SidTests { PrincipalSid principalSid = new PrincipalSid(authentication); GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST"); GrantedAuthoritySid gaSid = new GrantedAuthoritySid(ga); - assertThat("johndoe".equals(principalSid.getPrincipal())).isTrue(); + assertThat("johndoe").isEqualTo(principalSid.getPrincipal()); assertThat("scott".equals(principalSid.getPrincipal())).isFalse(); - assertThat("ROLE_TEST".equals(gaSid.getGrantedAuthority())).isTrue(); + assertThat("ROLE_TEST").isEqualTo(gaSid.getGrantedAuthority()); assertThat("ROLE_TEST2".equals(gaSid.getGrantedAuthority())).isFalse(); } diff --git a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java index c749614815..aca30f4271 100644 --- a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java +++ b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java @@ -143,8 +143,8 @@ public class AnnotationSecurityAspectTests { SecurityContextHolder.getContext().setAuthentication(this.anne); List objects = this.prePostSecured.postFilterMethod(); assertThat(objects).hasSize(2); - assertThat(objects.contains("apple")).isTrue(); - assertThat(objects.contains("aubergine")).isTrue(); + assertThat(objects).contains("apple"); + assertThat(objects).contains("aubergine"); } private void configureForElAnnotations() { diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java index 5dbc35e0da..d6305bf328 100644 --- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java @@ -87,7 +87,7 @@ public class LdapUserServiceBeanDefinitionParserTests { Set authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities()); assertThat(authorities).hasSize(3); - assertThat(authorities.contains("ROLE_DEVELOPERS")).isTrue(); + assertThat(authorities).contains("ROLE_DEVELOPERS"); } @Test @@ -128,7 +128,7 @@ public class LdapUserServiceBeanDefinitionParserTests { Set authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities()); assertThat(authorities).hasSize(3); - assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue(); + assertThat(authorities).contains("ROLE_DEVELOPER"); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurerTests.java index de5240661a..06935c82cd 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurerTests.java @@ -17,11 +17,13 @@ package org.springframework.security.config.annotation.authentication.configurers.provisioning; import java.util.Arrays; +import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.provisioning.InMemoryUserDetailsManager; @@ -73,7 +75,7 @@ public class UserDetailsManagerConfigurerTests { .authorities(authority) .build(); // @formatter:on - assertThat(userDetails.getAuthorities().stream().findFirst().get()).isEqualTo(authority); + assertThat((Optional) userDetails.getAuthorities().stream().findFirst()).contains(authority); } @Test @@ -99,7 +101,7 @@ public class UserDetailsManagerConfigurerTests { .authorities(Arrays.asList(authority)) .build(); // @formatter:on - assertThat(userDetails.getAuthorities().stream().findFirst().get()).isEqualTo(authority); + assertThat((Optional) userDetails.getAuthorities().stream().findFirst()).contains(authority); } private UserDetailsManagerConfigurer> configurer() { diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryNoMvcTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryNoMvcTests.java index 38ef3176e0..4d7c9a18ff 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryNoMvcTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryNoMvcTests.java @@ -47,7 +47,7 @@ public class AbstractRequestMatcherRegistryNoMvcTests { public void requestMatchersWhenPatternAndMvcNotPresentThenReturnAntPathRequestMatcherType() { List requestMatchers = this.matcherRegistry.requestMatchers("/path"); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class); } @@ -55,7 +55,7 @@ public class AbstractRequestMatcherRegistryNoMvcTests { public void requestMatchersWhenHttpMethodAndPatternAndMvcNotPresentThenReturnAntPathRequestMatcherType() { List requestMatchers = this.matcherRegistry.requestMatchers(HttpMethod.GET, "/path"); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class); } @@ -63,7 +63,7 @@ public class AbstractRequestMatcherRegistryNoMvcTests { public void requestMatchersWhenHttpMethodAndMvcNotPresentThenReturnAntPathMatcherType() { List requestMatchers = this.matcherRegistry.requestMatchers(HttpMethod.GET); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryTests.java index 107b4694e7..6ade531ca1 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryTests.java @@ -75,7 +75,7 @@ public class AbstractRequestMatcherRegistryTests { List requestMatchers = this.matcherRegistry .requestMatchers(new RegexRequestMatcher("/a.*", HttpMethod.GET.name())); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(RegexRequestMatcher.class); } @@ -84,7 +84,7 @@ public class AbstractRequestMatcherRegistryTests { List requestMatchers = this.matcherRegistry .requestMatchers(new RegexRequestMatcher("/a.*", null)); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(RegexRequestMatcher.class); } @@ -93,7 +93,7 @@ public class AbstractRequestMatcherRegistryTests { List requestMatchers = this.matcherRegistry .requestMatchers(new AntPathRequestMatcher("/a.*", HttpMethod.GET.name())); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class); } @@ -101,7 +101,7 @@ public class AbstractRequestMatcherRegistryTests { public void antMatchersWhenPatternParamThenReturnAntPathRequestMatcherType() { List requestMatchers = this.matcherRegistry.requestMatchers(new AntPathRequestMatcher("/a.*")); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class); } @@ -110,7 +110,7 @@ public class AbstractRequestMatcherRegistryTests { List requestMatchers = this.matcherRegistry.dispatcherTypeMatchers(HttpMethod.GET, DispatcherType.ASYNC); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(DispatcherTypeRequestMatcher.class); } @@ -118,7 +118,7 @@ public class AbstractRequestMatcherRegistryTests { public void dispatcherMatchersWhenPatternParamThenReturnAntPathRequestMatcherType() { List requestMatchers = this.matcherRegistry.dispatcherTypeMatchers(DispatcherType.INCLUDE); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(DispatcherTypeRequestMatcher.class); } @@ -126,7 +126,7 @@ public class AbstractRequestMatcherRegistryTests { public void requestMatchersWhenPatternAndMvcPresentThenReturnMvcRequestMatcherType() { List requestMatchers = this.matcherRegistry.requestMatchers("/path"); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(MvcRequestMatcher.class); } @@ -134,7 +134,7 @@ public class AbstractRequestMatcherRegistryTests { public void requestMatchersWhenHttpMethodAndPatternAndMvcPresentThenReturnMvcRequestMatcherType() { List requestMatchers = this.matcherRegistry.requestMatchers(HttpMethod.GET, "/path"); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(MvcRequestMatcher.class); } @@ -142,7 +142,7 @@ public class AbstractRequestMatcherRegistryTests { public void requestMatchersWhenHttpMethodAndMvcPresentThenReturnMvcRequestMatcherType() { List requestMatchers = this.matcherRegistry.requestMatchers(HttpMethod.GET); assertThat(requestMatchers).isNotEmpty(); - assertThat(requestMatchers.size()).isEqualTo(1); + assertThat(requestMatchers).hasSize(1); assertThat(requestMatchers.get(0)).isExactlyInstanceOf(MvcRequestMatcher.class); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java index bf94a98ee3..91594582e5 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java @@ -84,10 +84,10 @@ public class DefaultFiltersTests { this.spring.register(NullWebInvocationPrivilegeEvaluatorConfig.class, UserDetailsServiceConfig.class); List filterChains = this.spring.getContext().getBean(FilterChainProxy.class) .getFilterChains(); - assertThat(filterChains.size()).isEqualTo(1); + assertThat(filterChains).hasSize(1); DefaultSecurityFilterChain filterChain = (DefaultSecurityFilterChain) filterChains.get(0); assertThat(filterChain.getRequestMatcher()).isInstanceOf(AnyRequestMatcher.class); - assertThat(filterChain.getFilters().size()).isEqualTo(1); + assertThat(filterChain.getFilters()).hasSize(1); long filter = filterChain.getFilters().stream() .filter((it) -> it instanceof UsernamePasswordAuthenticationFilter).count(); assertThat(filter).isEqualTo(1); @@ -98,23 +98,23 @@ public class DefaultFiltersTests { this.spring.register(FilterChainProxyBuilderIgnoringConfig.class, UserDetailsServiceConfig.class); List filterChains = this.spring.getContext().getBean(FilterChainProxy.class) .getFilterChains(); - assertThat(filterChains.size()).isEqualTo(2); + assertThat(filterChains).hasSize(2); DefaultSecurityFilterChain firstFilter = (DefaultSecurityFilterChain) filterChains.get(0); DefaultSecurityFilterChain secondFilter = (DefaultSecurityFilterChain) filterChains.get(1); assertThat(firstFilter.getFilters().isEmpty()).isEqualTo(true); assertThat(secondFilter.getRequestMatcher()).isInstanceOf(AnyRequestMatcher.class); - List> classes = secondFilter.getFilters().stream().map(Filter::getClass) + List> classes = secondFilter.getFilters().stream().map(Filter::getClass) .collect(Collectors.toList()); - assertThat(classes.contains(WebAsyncManagerIntegrationFilter.class)).isTrue(); - assertThat(classes.contains(SecurityContextHolderFilter.class)).isTrue(); - assertThat(classes.contains(HeaderWriterFilter.class)).isTrue(); - assertThat(classes.contains(LogoutFilter.class)).isTrue(); - assertThat(classes.contains(CsrfFilter.class)).isTrue(); - assertThat(classes.contains(RequestCacheAwareFilter.class)).isTrue(); - assertThat(classes.contains(SecurityContextHolderAwareRequestFilter.class)).isTrue(); - assertThat(classes.contains(AnonymousAuthenticationFilter.class)).isTrue(); - assertThat(classes.contains(ExceptionTranslationFilter.class)).isTrue(); - assertThat(classes.contains(FilterSecurityInterceptor.class)).isTrue(); + assertThat(classes).contains(WebAsyncManagerIntegrationFilter.class); + assertThat(classes).contains(SecurityContextHolderFilter.class); + assertThat(classes).contains(HeaderWriterFilter.class); + assertThat(classes).contains(LogoutFilter.class); + assertThat(classes).contains(CsrfFilter.class); + assertThat(classes).contains(RequestCacheAwareFilter.class); + assertThat(classes).contains(SecurityContextHolderAwareRequestFilter.class); + assertThat(classes).contains(AnonymousAuthenticationFilter.class); + assertThat(classes).contains(ExceptionTranslationFilter.class); + assertThat(classes).contains(FilterSecurityInterceptor.class); } @Test diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java index 7a635d8ff8..370407996d 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java @@ -27,7 +27,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import net.shibboleth.utilities.java.support.xml.SerializeSupport; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -412,7 +411,7 @@ public class Saml2LoginConfigurerTests { // assertions Authentication authentication = this.securityContextRepository .loadContext(new HttpRequestResponseHolder(this.request, this.response)).getAuthentication(); - Assertions.assertNotNull(authentication, "Expected a valid authentication object."); + assertThat(authentication).as("Expected a valid authentication object.").isNotNull(); assertThat(authentication.getAuthorities()).hasSize(1); assertThat(authentication.getAuthorities()).first().isInstanceOf(SimpleGrantedAuthority.class) .hasToString(expected); diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java index f8f651c782..0006f930dd 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java @@ -286,8 +286,8 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { private void assertHandshake(HttpServletRequest request) { TestHandshakeHandler handshakeHandler = this.context.getBean(TestHandshakeHandler.class); assertThatCsrfToken(handshakeHandler.attributes.get(CsrfToken.class.getName())).isEqualTo(this.token); - assertThat(handshakeHandler.attributes.get(this.sessionAttr)) - .isEqualTo(request.getSession().getAttribute(this.sessionAttr)); + assertThat(handshakeHandler.attributes).containsEntry(this.sessionAttr, + request.getSession().getAttribute(this.sessionAttr)); } private HttpRequestHandler handler(HttpServletRequest request) throws Exception { diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/WebSocketMessageBrokerSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/WebSocketMessageBrokerSecurityConfigurationTests.java index 4eb5a74c17..399c27cc90 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/WebSocketMessageBrokerSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/WebSocketMessageBrokerSecurityConfigurationTests.java @@ -371,8 +371,8 @@ public class WebSocketMessageBrokerSecurityConfigurationTests { private void assertHandshake(HttpServletRequest request) { TestHandshakeHandler handshakeHandler = this.context.getBean(TestHandshakeHandler.class); assertThatCsrfToken(handshakeHandler.attributes.get(CsrfToken.class.getName())).isEqualTo(this.token); - assertThat(handshakeHandler.attributes.get(this.sessionAttr)) - .isEqualTo(request.getSession().getAttribute(this.sessionAttr)); + assertThat(handshakeHandler.attributes).containsEntry(this.sessionAttr, + request.getSession().getAttribute(this.sessionAttr)); } private HttpRequestHandler handler(HttpServletRequest request) throws Exception { diff --git a/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java b/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java index 955b030417..8d61a64743 100644 --- a/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java @@ -418,7 +418,7 @@ public class MiscHttpConfigTests { this.spring.configLocations(xml("DeleteCookies")).autowire(); MvcResult result = this.mvc.perform(post("/logout").with(csrf())).andReturn(); List values = result.getResponse().getHeaders("Set-Cookie"); - assertThat(values.size()).isEqualTo(2); + assertThat(values).hasSize(2); assertThat(values).extracting((value) -> value.split("=")[0]).contains("JSESSIONID", "mycookie"); } diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java index 18e79ca1eb..91a616415b 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java @@ -16,7 +16,6 @@ package org.springframework.security.access.intercept; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.security.authentication.BadCredentialsException; @@ -50,7 +49,7 @@ public class RunAsImplAuthenticationProviderTests { RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider(); provider.setKey("my_password"); Authentication result = provider.authenticate(token); - Assertions.assertTrue(result instanceof RunAsUserToken, "Should have returned RunAsUserToken"); + assertThat(result instanceof RunAsUserToken).as("Should have returned RunAsUserToken").isTrue(); RunAsUserToken resultCast = (RunAsUserToken) result; assertThat(resultCast.getKeyHash()).isEqualTo("my_password".hashCode()); } diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java index cd877b09cd..16dc6a5c77 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java @@ -66,9 +66,9 @@ public class RunAsManagerImplTests { assertThat(result.getPrincipal()).isEqualTo(inputToken.getPrincipal()); assertThat(result.getCredentials()).isEqualTo(inputToken.getCredentials()); Set authorities = AuthorityUtils.authorityListToSet(result.getAuthorities()); - assertThat(authorities.contains("FOOBAR_RUN_AS_SOMETHING")).isTrue(); - assertThat(authorities.contains("ONE")).isTrue(); - assertThat(authorities.contains("TWO")).isTrue(); + assertThat(authorities).contains("FOOBAR_RUN_AS_SOMETHING"); + assertThat(authorities).contains("ONE"); + assertThat(authorities).contains("TWO"); RunAsUserToken resultCast = (RunAsUserToken) result; assertThat(resultCast.getKeyHash()).isEqualTo("my_password".hashCode()); } @@ -87,9 +87,9 @@ public class RunAsManagerImplTests { assertThat(result.getPrincipal()).isEqualTo(inputToken.getPrincipal()); assertThat(result.getCredentials()).isEqualTo(inputToken.getCredentials()); Set authorities = AuthorityUtils.authorityListToSet(result.getAuthorities()); - assertThat(authorities.contains("ROLE_RUN_AS_SOMETHING")).isTrue(); - assertThat(authorities.contains("ROLE_ONE")).isTrue(); - assertThat(authorities.contains("ROLE_TWO")).isTrue(); + assertThat(authorities).contains("ROLE_RUN_AS_SOMETHING"); + assertThat(authorities).contains("ROLE_ONE"); + assertThat(authorities).contains("ROLE_TWO"); RunAsUserToken resultCast = (RunAsUserToken) result; assertThat(resultCast.getKeyHash()).isEqualTo("my_password".hashCode()); } diff --git a/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java index c5206cc69e..3e16a8ad20 100644 --- a/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java @@ -50,7 +50,7 @@ public class DelegatingMethodSecurityMetadataSourceTests { sources.add(delegate); this.mds = new DelegatingMethodSecurityMetadataSource(sources); assertThat(this.mds.getMethodSecurityMetadataSources()).isSameAs(sources); - assertThat(this.mds.getAllConfigAttributes().isEmpty()).isTrue(); + assertThat(this.mds.getAllConfigAttributes()).isEmpty(); MethodInvocation mi = new SimpleMethodInvocation(null, String.class.getMethod("toString")); assertThat(this.mds.getAttributes(mi)).isEqualTo(Collections.emptyList()); // Exercise the cached case @@ -68,7 +68,7 @@ public class DelegatingMethodSecurityMetadataSourceTests { sources.add(delegate); this.mds = new DelegatingMethodSecurityMetadataSource(sources); assertThat(this.mds.getMethodSecurityMetadataSources()).isSameAs(sources); - assertThat(this.mds.getAllConfigAttributes().isEmpty()).isTrue(); + assertThat(this.mds.getAllConfigAttributes()).isEmpty(); MethodInvocation mi = new SimpleMethodInvocation("", toString); assertThat(this.mds.getAttributes(mi)).isSameAs(attributes); // Exercise the cached case diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java index 79a66e8ed4..bb0c354408 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java @@ -89,7 +89,7 @@ public class InMemoryConfigurationTests { public void mappedNonnullDefault() { InMemoryConfiguration configuration = new InMemoryConfiguration(this.mappedEntries, this.defaultEntries); assertThat(this.defaultEntries).isEqualTo(configuration.getAppConfigurationEntry("missing")); - assertThat(this.mappedEntries.get("name")).isEqualTo(configuration.getAppConfigurationEntry("name")); + assertThat(this.mappedEntries).containsEntry("name", configuration.getAppConfigurationEntry("name")); } @Test diff --git a/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java b/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java index c285e8f6eb..47b95ce833 100644 --- a/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java @@ -37,11 +37,11 @@ public class AuthorityUtilsTests { List authorityArray = AuthorityUtils .commaSeparatedStringToAuthorityList(" ROLE_A, B, C, ROLE_D\n,\n E "); Set authorities = AuthorityUtils.authorityListToSet(authorityArray); - assertThat(authorities.contains("B")).isTrue(); - assertThat(authorities.contains("C")).isTrue(); - assertThat(authorities.contains("E")).isTrue(); - assertThat(authorities.contains("ROLE_A")).isTrue(); - assertThat(authorities.contains("ROLE_D")).isTrue(); + assertThat(authorities).contains("B"); + assertThat(authorities).contains("C"); + assertThat(authorities).contains("E"); + assertThat(authorities).contains("ROLE_A"); + assertThat(authorities).contains("ROLE_D"); } @Test diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java index 618acbe3d8..648ec7fa71 100644 --- a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java @@ -45,8 +45,8 @@ public class SimpleAuthoritiesMapperTests { SimpleAuthorityMapper mapper = new SimpleAuthorityMapper(); Set mapped = AuthorityUtils .authorityListToSet(mapper.mapAuthorities(AuthorityUtils.createAuthorityList("AaA", "ROLE_bbb"))); - assertThat(mapped.contains("ROLE_AaA")).isTrue(); - assertThat(mapped.contains("ROLE_bbb")).isTrue(); + assertThat(mapped).contains("ROLE_AaA"); + assertThat(mapped).contains("ROLE_bbb"); } @Test @@ -56,19 +56,19 @@ public class SimpleAuthoritiesMapperTests { List toMap = AuthorityUtils.createAuthorityList("AaA", "Bbb"); Set mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap)); assertThat(mapped).hasSize(2); - assertThat(mapped.contains("AaA")).isTrue(); - assertThat(mapped.contains("Bbb")).isTrue(); + assertThat(mapped).contains("AaA"); + assertThat(mapped).contains("Bbb"); mapper.setConvertToLowerCase(true); mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap)); assertThat(mapped).hasSize(2); - assertThat(mapped.contains("aaa")).isTrue(); - assertThat(mapped.contains("bbb")).isTrue(); + assertThat(mapped).contains("aaa"); + assertThat(mapped).contains("bbb"); mapper.setConvertToLowerCase(false); mapper.setConvertToUpperCase(true); mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap)); assertThat(mapped).hasSize(2); - assertThat(mapped.contains("AAA")).isTrue(); - assertThat(mapped.contains("BBB")).isTrue(); + assertThat(mapped).contains("AAA"); + assertThat(mapped).contains("BBB"); } @Test @@ -86,7 +86,7 @@ public class SimpleAuthoritiesMapperTests { mapper.setDefaultAuthority("ROLE_USER"); Set mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(AuthorityUtils.NO_AUTHORITIES)); assertThat(mapped).hasSize(1); - assertThat(mapped.contains("ROLE_USER")).isTrue(); + assertThat(mapped).contains("ROLE_USER"); } } diff --git a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java index ecd563b946..9e5e2ecf47 100644 --- a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java +++ b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java @@ -97,8 +97,8 @@ public class SessionRegistryImplTests { this.sessionRegistry.registerNewSession(sessionId2, principal1); this.sessionRegistry.registerNewSession(sessionId3, principal2); assertThat(this.sessionRegistry.getAllPrincipals()).hasSize(2); - assertThat(this.sessionRegistry.getAllPrincipals().contains(principal1)).isTrue(); - assertThat(this.sessionRegistry.getAllPrincipals().contains(principal2)).isTrue(); + assertThat(this.sessionRegistry.getAllPrincipals()).contains(principal1); + assertThat(this.sessionRegistry.getAllPrincipals()).contains(principal2); } @Test diff --git a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java index b7594081dd..f55953188c 100644 --- a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java +++ b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java @@ -189,7 +189,7 @@ public class JdbcUserDetailsManagerTests { public void userExistsReturnsTrueForExistingUsername() { insertJoe(); assertThat(this.manager.userExists("joe")).isTrue(); - assertThat(this.cache.getUserMap().containsKey("joe")).isTrue(); + assertThat(this.cache.getUserMap()).containsKey("joe"); } @Test @@ -251,7 +251,7 @@ public class JdbcUserDetailsManagerTests { UserDetails newJoe = this.manager.loadUserByUsername("joe"); assertThat(newJoe.getPassword()).isEqualTo("password"); assertThat(SecurityContextHolder.getContext().getAuthentication().getCredentials()).isEqualTo("password"); - assertThat(this.cache.getUserMap().containsKey("joe")).isTrue(); + assertThat(this.cache.getUserMap()).containsKey("joe"); } @Test diff --git a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java index ea0349b2e1..2d895b346a 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java @@ -390,7 +390,7 @@ public class BCryptTests { Arrays.fill(ba, (byte) 0); ba[i] = (byte) b; String s = encode_base64(ba, 3); - assertThat(s.length()).isEqualTo(4); + assertThat(s).hasSize(4); byte[] decoded = BCrypt.decode_base64(s, 3); assertThat(decoded).isEqualTo(ba); } diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java index 66cc64b30e..a37c83092c 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java @@ -20,7 +20,6 @@ import java.security.SecureRandom; import java.util.Random; import java.util.UUID; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -29,6 +28,8 @@ import org.springframework.security.crypto.encrypt.AesBytesEncryptor.CipherAlgor import org.springframework.security.crypto.keygen.BytesKeyGenerator; import org.springframework.security.crypto.keygen.KeyGenerators; +import static org.assertj.core.api.Assertions.assertThat; + public class BouncyCastleAesBytesEncryptorEquivalencyTests { private byte[] testData; @@ -96,11 +97,11 @@ public class BouncyCastleAesBytesEncryptorEquivalencyTests { // and can decrypt back to the original input byte[] leftEncrypted = left.encrypt(this.testData); byte[] rightEncrypted = right.encrypt(this.testData); - Assertions.assertArrayEquals(leftEncrypted, rightEncrypted); + assertThat(rightEncrypted).containsExactly(leftEncrypted); byte[] leftDecrypted = left.decrypt(leftEncrypted); byte[] rightDecrypted = right.decrypt(rightEncrypted); - Assertions.assertArrayEquals(this.testData, leftDecrypted); - Assertions.assertArrayEquals(this.testData, rightDecrypted); + assertThat(leftDecrypted).containsExactly(this.testData); + assertThat(rightDecrypted).containsExactly(this.testData); } } @@ -114,8 +115,8 @@ public class BouncyCastleAesBytesEncryptorEquivalencyTests { byte[] rightEncrypted = right.encrypt(this.testData); byte[] leftDecrypted = left.decrypt(rightEncrypted); byte[] rightDecrypted = right.decrypt(leftEncrypted); - Assertions.assertArrayEquals(this.testData, leftDecrypted); - Assertions.assertArrayEquals(this.testData, rightDecrypted); + assertThat(leftDecrypted).containsExactly(this.testData); + assertThat(rightDecrypted).containsExactly(this.testData); } } diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java index 2b5ec62348..792c7c89df 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java @@ -20,13 +20,13 @@ import java.security.SecureRandom; import java.util.UUID; import org.bouncycastle.util.Arrays; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.security.crypto.codec.Hex; import org.springframework.security.crypto.keygen.KeyGenerators; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; public class BouncyCastleAesBytesEncryptorTests { @@ -64,11 +64,11 @@ public class BouncyCastleAesBytesEncryptorTests { private void generatesDifferentCipherTexts(BytesEncryptor bcEncryptor) { byte[] encrypted1 = bcEncryptor.encrypt(this.testData); byte[] encrypted2 = bcEncryptor.encrypt(this.testData); - Assertions.assertFalse(Arrays.areEqual(encrypted1, encrypted2)); + assertThat(Arrays.areEqual(encrypted1, encrypted2)).isFalse(); byte[] decrypted1 = bcEncryptor.decrypt(encrypted1); byte[] decrypted2 = bcEncryptor.decrypt(encrypted2); - Assertions.assertArrayEquals(this.testData, decrypted1); - Assertions.assertArrayEquals(this.testData, decrypted2); + assertThat(decrypted1).containsExactly(this.testData); + assertThat(decrypted2).containsExactly(this.testData); } @Test diff --git a/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java b/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java index 517a01fb04..dcf44e34ca 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java @@ -60,7 +60,7 @@ public class KeyGeneratorsTests { public void string() { StringKeyGenerator keyGenerator = KeyGenerators.string(); String hexStringKey = keyGenerator.generateKey(); - assertThat(hexStringKey.length()).isEqualTo(16); + assertThat(hexStringKey).hasSize(16); assertThat(Hex.decode(hexStringKey)).hasSize(8); String hexStringKey2 = keyGenerator.generateKey(); assertThat(hexStringKey.equals(hexStringKey2)).isFalse(); diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/Pbkdf2PasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/Pbkdf2PasswordEncoderTests.java index 487d312e85..5c62fff4cf 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/password/Pbkdf2PasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/password/Pbkdf2PasswordEncoderTests.java @@ -39,8 +39,8 @@ public class Pbkdf2PasswordEncoderTests { // encode output is an hex coded String so with 2 chars per encoding result byte // (ie. 1 char for 4 bits). // The encoding result size is : (saltLength * 8) bits + hashWith bits. - assertThat(this.encoder.encode("password").length()).isEqualTo((8 * 8 + 256) / 4); - assertThat(this.encoderSalt16.encode("password").length()).isEqualTo((16 * 8 + 256) / 4); + assertThat(this.encoder.encode("password")).hasSize((8 * 8 + 256) / 4); + assertThat(this.encoderSalt16.encode("password")).hasSize((16 * 8 + 256) / 4); } @Test diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java index 3257694f4f..ee450f4bc2 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java @@ -104,9 +104,9 @@ public class SpringSecurityLdapTemplateITests { new String[] { param }, "ou"); assertThat(values).as("Expected 3 results from search").hasSize(3); - assertThat(values.contains("developer")).isTrue(); - assertThat(values.contains("manager")).isTrue(); - assertThat(values.contains("submanager")).isTrue(); + assertThat(values).contains("developer"); + assertThat(values).contains("manager"); + assertThat(values).contains("submanager"); } @Test @@ -149,7 +149,7 @@ public class SpringSecurityLdapTemplateITests { } protected void assertAttributeValue(Map> record, String attributeName, String... values) { - assertThat(record.containsKey(attributeName)).isTrue(); + assertThat(record).containsKey(attributeName); assertThat(record.get(attributeName)).hasSize(values.length); for (int i = 0; i < values.length; i++) { assertThat(record.get(attributeName).get(i)).isEqualTo(values[i]); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorGetGrantedAuthoritiesTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorGetGrantedAuthoritiesTests.java index 9321ef16c6..95181b7651 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorGetGrantedAuthoritiesTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorGetGrantedAuthoritiesTests.java @@ -72,8 +72,8 @@ public class DefaultLdapAuthoritiesPopulatorGetGrantedAuthoritiesTests { assertThat(authorities).as("Should have 1 role").hasSize(2); - assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue(); - assertThat(authorities.contains("ROLE_")).isTrue(); + assertThat(authorities).contains("ROLE_DEVELOPER"); + assertThat(authorities).contains("ROLE_"); } @Configuration diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java index 1761a6c4ae..0ee366f7f5 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java @@ -68,7 +68,7 @@ public class DefaultLdapAuthoritiesPopulatorTests { Collection authorities = this.populator.getGrantedAuthorities(ctx, "notfound"); assertThat(authorities).hasSize(1); - assertThat(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER")).isTrue(); + assertThat(AuthorityUtils.authorityListToSet(authorities)).contains("ROLE_USER"); } @Test @@ -79,7 +79,7 @@ public class DefaultLdapAuthoritiesPopulatorTests { Collection authorities = this.populator .getGrantedAuthorities(new DirContextAdapter(new DistinguishedName("cn=notused")), "notused"); assertThat(authorities).hasSize(1); - assertThat(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER")).isTrue(); + assertThat(AuthorityUtils.authorityListToSet(authorities)).contains("ROLE_USER"); } @Test @@ -98,8 +98,8 @@ public class DefaultLdapAuthoritiesPopulatorTests { assertThat(authorities).as("Should have 2 roles").hasSize(2); - assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue(); - assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); + assertThat(authorities).contains("ROLE_DEVELOPER"); + assertThat(authorities).contains("ROLE_MANAGER"); } @Test @@ -115,7 +115,7 @@ public class DefaultLdapAuthoritiesPopulatorTests { .authorityListToSet(this.populator.getGrantedAuthorities(ctx, "manager")); assertThat(authorities).as("Should have 1 role").hasSize(1); - assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); + assertThat(authorities).contains("ROLE_MANAGER"); } @Test @@ -130,8 +130,8 @@ public class DefaultLdapAuthoritiesPopulatorTests { .authorityListToSet(this.populator.getGrantedAuthorities(ctx, "manager")); assertThat(authorities).as("Should have 2 roles").hasSize(2); - assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); - assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue(); + assertThat(authorities).contains("ROLE_MANAGER"); + assertThat(authorities).contains("ROLE_DEVELOPER"); } @Test @@ -147,9 +147,9 @@ public class DefaultLdapAuthoritiesPopulatorTests { .authorityListToSet(this.populator.getGrantedAuthorities(ctx, "manager")); assertThat(authorities).as("Should have 3 roles").hasSize(3); - assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); - assertThat(authorities.contains("ROLE_SUBMANAGER")).isTrue(); - assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue(); + assertThat(authorities).contains("ROLE_MANAGER"); + assertThat(authorities).contains("ROLE_SUBMANAGER"); + assertThat(authorities).contains("ROLE_DEVELOPER"); } @Test @@ -164,7 +164,7 @@ public class DefaultLdapAuthoritiesPopulatorTests { Collection authorities = this.populator .getGrantedAuthorities(new DirContextAdapter(new DistinguishedName("cn=notused")), "notused"); assertThat(authorities).hasSize(1); - assertThat(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_EXTRA")).isTrue(); + assertThat(AuthorityUtils.authorityListToSet(authorities)).contains("ROLE_EXTRA"); } @Test @@ -180,7 +180,7 @@ public class DefaultLdapAuthoritiesPopulatorTests { .authorityListToSet(this.populator.getGrantedAuthorities(ctx, "notused")); assertThat(authorities).as("Should have 1 role").hasSize(1); - assertThat(authorities.contains("ROLE_MANAGER")).isTrue(); + assertThat(authorities).contains("ROLE_MANAGER"); } @Test diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java index b505bfd400..56fb6820a4 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java @@ -128,14 +128,14 @@ public class NestedLdapAuthoritiesPopulatorTests { LdapAuthority[] ldapAuthorities = authorities.toArray(new LdapAuthority[0]); assertThat(ldapAuthorities).hasSize(5); // groovy-developers group - assertThat(ldapAuthorities[0].getAttributes().containsKey("member")).isTrue(); + assertThat(ldapAuthorities[0].getAttributes()).containsKey("member"); assertThat(ldapAuthorities[0].getAttributes().get("member")).isNotNull(); assertThat(ldapAuthorities[0].getAttributes().get("member")).hasSize(3); assertThat(ldapAuthorities[0].getFirstAttributeValue("member")) .isEqualTo("cn=groovy-developers,ou=jdeveloper,dc=springframework,dc=org"); // java group - assertThat(ldapAuthorities[1].getAttributes().containsKey("member")).isTrue(); + assertThat(ldapAuthorities[1].getAttributes()).containsKey("member"); assertThat(ldapAuthorities[1].getAttributes().get("member")).isNotNull(); assertThat(ldapAuthorities[1].getAttributes().get("member")).hasSize(3); assertThat(this.groovyDevelopers.getDn()).isEqualTo(ldapAuthorities[1].getFirstAttributeValue("member")); diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java index a1279c3471..a572c61765 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java @@ -46,7 +46,7 @@ public class InetOrgPersonTests { InetOrgPerson p2 = (InetOrgPerson) essence.createUserDetails(); Set set = new HashSet<>(); set.add(p); - assertThat(set.contains(p2)).isTrue(); + assertThat(set).contains(p2); } @Test diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java index 9bb5593703..10594fc8c8 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java @@ -60,7 +60,7 @@ public class LdapUserDetailsServiceTests { UserDetails user = service.loadUserByUsername("doesntmatterwegetjoeanyway"); Set authorities = AuthorityUtils.authorityListToSet(user.getAuthorities()); assertThat(authorities).hasSize(1); - assertThat(authorities.contains("ROLE_FROM_POPULATOR")).isTrue(); + assertThat(authorities).contains("ROLE_FROM_POPULATOR"); } @Test diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java index b2912790af..486dda34c2 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java @@ -47,7 +47,7 @@ public class UserDetailsServiceLdapAuthoritiesPopulatorTests { UserDetailsServiceLdapAuthoritiesPopulator populator = new UserDetailsServiceLdapAuthoritiesPopulator(uds); Collection auths = populator.getGrantedAuthorities(new DirContextAdapter(), "joe"); assertThat(auths).hasSize(1); - assertThat(AuthorityUtils.authorityListToSet(auths).contains("ROLE_USER")).isTrue(); + assertThat(AuthorityUtils.authorityListToSet(auths)).contains("ROLE_USER"); } } diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java index 608b3216ae..b13bdab5dc 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java @@ -113,7 +113,7 @@ public class SimpDestinationMessageMatcherTests { this.matcher = new SimpDestinationMessageMatcher("/topics/{topic}/**"); this.messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/topics/someTopic/sub1"); this.messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE); - assertThat(this.matcher.extractPathVariables(this.messageBuilder.build()).get("topic")).isEqualTo("someTopic"); + assertThat(this.matcher.extractPathVariables(this.messageBuilder.build())).containsEntry("topic", "someTopic"); } @Test diff --git a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java index 760fe3aa1b..09ad468728 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java @@ -75,7 +75,7 @@ public class CsrfTokenHandshakeInterceptorTests { CsrfToken token = new DefaultCsrfToken("header", "param", "token"); this.httpRequest.setAttribute(DeferredCsrfToken.class.getName(), new TestDeferredCsrfToken(token)); this.interceptor.beforeHandshake(this.request, this.response, this.wsHandler, this.attributes); - assertThat(this.attributes.keySet()).containsOnly(CsrfToken.class.getName()); + assertThat(this.attributes).containsOnlyKeys(CsrfToken.class.getName()); CsrfToken csrfToken = (CsrfToken) this.attributes.get(CsrfToken.class.getName()); assertThat(csrfToken.getHeaderName()).isEqualTo(token.getHeaderName()); assertThat(csrfToken.getParameterName()).isEqualTo(token.getParameterName()); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultAuthorizationCodeTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultAuthorizationCodeTokenResponseClientTests.java index c12b28fcfd..7fca0a02ce 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultAuthorizationCodeTokenResponseClientTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultAuthorizationCodeTokenResponseClientTests.java @@ -130,7 +130,7 @@ public class DefaultAuthorizationCodeTokenResponseClientTests { assertThat(accessTokenResponse.getAccessToken().getExpiresAt()).isBetween(expiresAtBefore, expiresAtAfter); assertThat(accessTokenResponse.getAccessToken().getScopes()).containsExactly("read", "write"); assertThat(accessTokenResponse.getRefreshToken().getTokenValue()).isEqualTo("refresh-token-1234"); - assertThat(accessTokenResponse.getAdditionalParameters().size()).isEqualTo(2); + assertThat(accessTokenResponse.getAdditionalParameters()).hasSize(2); assertThat(accessTokenResponse.getAdditionalParameters()).containsEntry("custom_parameter_1", "custom-value-1"); assertThat(accessTokenResponse.getAdditionalParameters()).containsEntry("custom_parameter_2", "custom-value-2"); } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultClientCredentialsTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultClientCredentialsTokenResponseClientTests.java index aa7c199404..4ed2689187 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultClientCredentialsTokenResponseClientTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/DefaultClientCredentialsTokenResponseClientTests.java @@ -132,7 +132,7 @@ public class DefaultClientCredentialsTokenResponseClientTests { assertThat(accessTokenResponse.getAccessToken().getExpiresAt()).isBetween(expiresAtBefore, expiresAtAfter); assertThat(accessTokenResponse.getAccessToken().getScopes()).containsExactly("read", "write"); assertThat(accessTokenResponse.getRefreshToken()).isNull(); - assertThat(accessTokenResponse.getAdditionalParameters().size()).isEqualTo(2); + assertThat(accessTokenResponse.getAdditionalParameters()).hasSize(2); assertThat(accessTokenResponse.getAdditionalParameters()).containsEntry("custom_parameter_1", "custom-value-1"); assertThat(accessTokenResponse.getAdditionalParameters()).containsEntry("custom_parameter_2", "custom-value-2"); } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/NimbusJwtClientAuthenticationParametersConverterTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/NimbusJwtClientAuthenticationParametersConverterTests.java index 4770fe3b2e..6d05316a6a 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/NimbusJwtClientAuthenticationParametersConverterTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/NimbusJwtClientAuthenticationParametersConverterTests.java @@ -140,8 +140,8 @@ public class NimbusJwtClientAuthenticationParametersConverterTests { NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withPublicKey(rsaJwk.toRSAPublicKey()).build(); Jwt jws = jwtDecoder.decode(encodedJws); - assertThat(jws.getHeaders().get(JoseHeaderNames.ALG)).isEqualTo(SignatureAlgorithm.RS256.getName()); - assertThat(jws.getHeaders().get(JoseHeaderNames.KID)).isEqualTo(rsaJwk.getKeyID()); + assertThat(jws.getHeaders()).containsEntry(JoseHeaderNames.ALG, SignatureAlgorithm.RS256.getName()); + assertThat(jws.getHeaders()).containsEntry(JoseHeaderNames.KID, rsaJwk.getKeyID()); assertThat(jws.getClaim(JwtClaimNames.ISS)).isEqualTo(clientRegistration.getClientId()); assertThat(jws.getSubject()).isEqualTo(clientRegistration.getClientId()); assertThat(jws.getAudience()) @@ -174,8 +174,8 @@ public class NimbusJwtClientAuthenticationParametersConverterTests { NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withSecretKey(secretJwk.toSecretKey()).build(); Jwt jws = jwtDecoder.decode(encodedJws); - assertThat(jws.getHeaders().get(JoseHeaderNames.ALG)).isEqualTo(MacAlgorithm.HS256.getName()); - assertThat(jws.getHeaders().get(JoseHeaderNames.KID)).isEqualTo(secretJwk.getKeyID()); + assertThat(jws.getHeaders()).containsEntry(JoseHeaderNames.ALG, MacAlgorithm.HS256.getName()); + assertThat(jws.getHeaders()).containsEntry(JoseHeaderNames.KID, secretJwk.getKeyID()); assertThat(jws.getClaim(JwtClaimNames.ISS)).isEqualTo(clientRegistration.getClientId()); assertThat(jws.getSubject()).isEqualTo(clientRegistration.getClientId()); assertThat(jws.getAudience()) @@ -217,9 +217,9 @@ public class NimbusJwtClientAuthenticationParametersConverterTests { NimbusJwtDecoder jwtDecoder = NimbusJwtDecoder.withSecretKey(secretJwk.toSecretKey()).build(); Jwt jws = jwtDecoder.decode(encodedJws); - assertThat(jws.getHeaders().get(JoseHeaderNames.ALG)).isEqualTo(MacAlgorithm.HS256.getName()); - assertThat(jws.getHeaders().get(JoseHeaderNames.KID)).isEqualTo(secretJwk.getKeyID()); - assertThat(jws.getHeaders().get(headerName)).isEqualTo(headerValue); + assertThat(jws.getHeaders()).containsEntry(JoseHeaderNames.ALG, MacAlgorithm.HS256.getName()); + assertThat(jws.getHeaders()).containsEntry(JoseHeaderNames.KID, secretJwk.getKeyID()); + assertThat(jws.getHeaders()).containsEntry(headerName, headerValue); assertThat(jws.getClaim(JwtClaimNames.ISS)).isEqualTo(clientRegistration.getClientId()); assertThat(jws.getSubject()).isEqualTo(clientRegistration.getClientId()); assertThat(jws.getAudience()) diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java index e3f59024da..71b0aad3e9 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java @@ -117,7 +117,7 @@ public class WebClientReactiveAuthorizationCodeTokenResponseClientTests { assertThat(accessTokenResponse.getAccessToken().getExpiresAt()).isBetween(expiresAtBefore, expiresAtAfter); assertThat(accessTokenResponse.getAccessToken().getScopes()).containsExactly("openid", "profile"); assertThat(accessTokenResponse.getRefreshToken().getTokenValue()).isEqualTo("refresh-token-1234"); - assertThat(accessTokenResponse.getAdditionalParameters().size()).isEqualTo(2); + assertThat(accessTokenResponse.getAdditionalParameters()).hasSize(2); assertThat(accessTokenResponse.getAdditionalParameters()).containsEntry("custom_parameter_1", "custom-value-1"); assertThat(accessTokenResponse.getAdditionalParameters()).containsEntry("custom_parameter_2", "custom-value-2"); } diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java index e0fdef9c24..90c67d3557 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java @@ -234,7 +234,7 @@ public class OidcUserServiceTests { .loadUser(new OidcUserRequest(clientRegistration, this.accessToken, this.idToken)); assertThat(user.getIdToken()).isNotNull(); assertThat(user.getUserInfo()).isNotNull(); - assertThat(user.getUserInfo().getClaims().size()).isEqualTo(6); + assertThat(user.getUserInfo().getClaims()).hasSize(6); assertThat(user.getIdToken()).isEqualTo(this.idToken); assertThat(user.getName()).isEqualTo("subject1"); assertThat(user.getUserInfo().getSubject()).isEqualTo("subject1"); @@ -243,7 +243,7 @@ public class OidcUserServiceTests { assertThat(user.getUserInfo().getFamilyName()).isEqualTo("last"); assertThat(user.getUserInfo().getPreferredUsername()).isEqualTo("user1"); assertThat(user.getUserInfo().getEmail()).isEqualTo("user1@example.com"); - assertThat(user.getAuthorities().size()).isEqualTo(3); + assertThat(user.getAuthorities()).hasSize(3); assertThat(user.getAuthorities().iterator().next()).isInstanceOf(OidcUserAuthority.class); OidcUserAuthority userAuthority = (OidcUserAuthority) user.getAuthorities().iterator().next(); assertThat(userAuthority.getAuthority()).isEqualTo("OIDC_USER"); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultOAuth2UserServiceTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultOAuth2UserServiceTests.java index f8e29740ab..7c4ef3e96a 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultOAuth2UserServiceTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultOAuth2UserServiceTests.java @@ -144,14 +144,14 @@ public class DefaultOAuth2UserServiceTests { .userInfoAuthenticationMethod(AuthenticationMethod.HEADER).userNameAttributeName("user-name").build(); OAuth2User user = this.userService.loadUser(new OAuth2UserRequest(clientRegistration, this.accessToken)); assertThat(user.getName()).isEqualTo("user1"); - assertThat(user.getAttributes().size()).isEqualTo(6); + assertThat(user.getAttributes()).hasSize(6); assertThat((String) user.getAttribute("user-name")).isEqualTo("user1"); assertThat((String) user.getAttribute("first-name")).isEqualTo("first"); assertThat((String) user.getAttribute("last-name")).isEqualTo("last"); assertThat((String) user.getAttribute("middle-name")).isEqualTo("middle"); assertThat((String) user.getAttribute("address")).isEqualTo("address"); assertThat((String) user.getAttribute("email")).isEqualTo("user1@example.com"); - assertThat(user.getAuthorities().size()).isEqualTo(1); + assertThat(user.getAuthorities()).hasSize(1); assertThat(user.getAuthorities().iterator().next()).isInstanceOf(OAuth2UserAuthority.class); OAuth2UserAuthority userAuthority = (OAuth2UserAuthority) user.getAuthorities().iterator().next(); assertThat(userAuthority.getAuthority()).isEqualTo("OAUTH2_USER"); diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserServiceTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserServiceTests.java index f8cfb57028..acd3c44609 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserServiceTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultReactiveOAuth2UserServiceTests.java @@ -131,14 +131,14 @@ public class DefaultReactiveOAuth2UserServiceTests { enqueueApplicationJsonBody(userInfoResponse); OAuth2User user = this.userService.loadUser(oauth2UserRequest()).block(); assertThat(user.getName()).isEqualTo("user1"); - assertThat(user.getAttributes().size()).isEqualTo(6); + assertThat(user.getAttributes()).hasSize(6); assertThat((String) user.getAttribute("id")).isEqualTo("user1"); assertThat((String) user.getAttribute("first-name")).isEqualTo("first"); assertThat((String) user.getAttribute("last-name")).isEqualTo("last"); assertThat((String) user.getAttribute("middle-name")).isEqualTo("middle"); assertThat((String) user.getAttribute("address")).isEqualTo("address"); assertThat((String) user.getAttribute("email")).isEqualTo("user1@example.com"); - assertThat(user.getAuthorities().size()).isEqualTo(1); + assertThat(user.getAuthorities()).hasSize(1); assertThat(user.getAuthorities().iterator().next()).isInstanceOf(OAuth2UserAuthority.class); OAuth2UserAuthority userAuthority = (OAuth2UserAuthority) user.getAuthorities().iterator().next(); assertThat(userAuthority.getAuthority()).isEqualTo("OAUTH2_USER"); diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java index 873c374653..78cfce0655 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/converter/ClaimTypeConverterTests.java @@ -139,15 +139,15 @@ public class ClaimTypeConverterTests { claims.put(JSON_ARRAY_CLAIM, jsonArray); claims.put(JSON_OBJECT_CLAIM, jsonObject); claims = this.claimTypeConverter.convert(claims); - assertThat(claims.get(STRING_CLAIM)).isEqualTo("true"); - assertThat(claims.get(BOOLEAN_CLAIM)).isEqualTo(Boolean.TRUE); - assertThat(claims.get(INSTANT_CLAIM)).isEqualTo(instant); - assertThat(claims.get(URL_CLAIM)).isEqualTo(url); - assertThat(claims.get(COLLECTION_STRING_CLAIM)).isEqualTo(listString); - assertThat(claims.get(LIST_STRING_CLAIM)).isEqualTo(listString); - assertThat(claims.get(MAP_STRING_OBJECT_CLAIM)).isEqualTo(mapStringObject); - assertThat(claims.get(JSON_ARRAY_CLAIM)).isEqualTo(jsonArrayListString); - assertThat(claims.get(JSON_OBJECT_CLAIM)).isEqualTo(jsonObjectMap); + assertThat(claims).containsEntry(STRING_CLAIM, "true"); + assertThat(claims).containsEntry(BOOLEAN_CLAIM, Boolean.TRUE); + assertThat(claims).containsEntry(INSTANT_CLAIM, instant); + assertThat(claims).containsEntry(URL_CLAIM, url); + assertThat(claims).containsEntry(COLLECTION_STRING_CLAIM, listString); + assertThat(claims).containsEntry(LIST_STRING_CLAIM, listString); + assertThat(claims).containsEntry(MAP_STRING_OBJECT_CLAIM, mapStringObject); + assertThat(claims).containsEntry(JSON_ARRAY_CLAIM, jsonArrayListString); + assertThat(claims).containsEntry(JSON_OBJECT_CLAIM, jsonObjectMap); } @Test diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultMapOAuth2AccessTokenResponseConverterTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultMapOAuth2AccessTokenResponseConverterTests.java index 7b07619d58..198c5bf066 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultMapOAuth2AccessTokenResponseConverterTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultMapOAuth2AccessTokenResponseConverterTests.java @@ -22,7 +22,6 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -30,6 +29,8 @@ import org.springframework.core.convert.converter.Converter; import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2RefreshToken; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link DefaultMapOAuth2AccessTokenResponseConverter}. * @@ -56,24 +57,24 @@ public class DefaultMapOAuth2AccessTokenResponseConverterTests { map.put("custom_parameter_2", "custom-value-2"); OAuth2AccessTokenResponse converted = this.messageConverter.convert(map); OAuth2AccessToken accessToken = converted.getAccessToken(); - Assertions.assertNotNull(accessToken); - Assertions.assertEquals("access-token-1234", accessToken.getTokenValue()); - Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType()); + assertThat(accessToken).isNotNull(); + assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234"); + assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER); Set scopes = accessToken.getScopes(); - Assertions.assertNotNull(scopes); - Assertions.assertEquals(2, scopes.size()); - Assertions.assertTrue(scopes.contains("read")); - Assertions.assertTrue(scopes.contains("write")); - Assertions.assertEquals(3600, - Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()); + assertThat(scopes).isNotNull(); + assertThat(scopes).hasSize(2); + assertThat(scopes).contains("read"); + assertThat(scopes).contains("write"); + assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()) + .isEqualTo(3600); OAuth2RefreshToken refreshToken = converted.getRefreshToken(); - Assertions.assertNotNull(refreshToken); - Assertions.assertEquals("refresh-token-1234", refreshToken.getTokenValue()); + assertThat(refreshToken).isNotNull(); + assertThat(refreshToken.getTokenValue()).isEqualTo("refresh-token-1234"); Map additionalParameters = converted.getAdditionalParameters(); - Assertions.assertNotNull(additionalParameters); - Assertions.assertEquals(2, additionalParameters.size()); - Assertions.assertEquals("custom-value-1", additionalParameters.get("custom_parameter_1")); - Assertions.assertEquals("custom-value-2", additionalParameters.get("custom_parameter_2")); + assertThat(additionalParameters).isNotNull(); + assertThat(additionalParameters).hasSize(2); + assertThat(additionalParameters).containsEntry("custom_parameter_1", "custom-value-1"); + assertThat(additionalParameters).containsEntry("custom_parameter_2", "custom-value-2"); } @Test @@ -83,19 +84,18 @@ public class DefaultMapOAuth2AccessTokenResponseConverterTests { map.put("token_type", "bearer"); OAuth2AccessTokenResponse converted = this.messageConverter.convert(map); OAuth2AccessToken accessToken = converted.getAccessToken(); - Assertions.assertNotNull(accessToken); - Assertions.assertEquals("access-token-1234", accessToken.getTokenValue()); - Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType()); + assertThat(accessToken).isNotNull(); + assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234"); + assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER); Set scopes = accessToken.getScopes(); - Assertions.assertNotNull(scopes); - Assertions.assertEquals(0, scopes.size()); - Assertions.assertEquals(1, - Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()); + assertThat(scopes).isNotNull(); + assertThat(scopes).isEmpty(); + assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()).isEqualTo(1); OAuth2RefreshToken refreshToken = converted.getRefreshToken(); - Assertions.assertNull(refreshToken); + assertThat(refreshToken).isNull(); Map additionalParameters = converted.getAdditionalParameters(); - Assertions.assertNotNull(additionalParameters); - Assertions.assertEquals(0, additionalParameters.size()); + assertThat(additionalParameters).isNotNull(); + assertThat(additionalParameters).isEmpty(); } @Test @@ -106,19 +106,18 @@ public class DefaultMapOAuth2AccessTokenResponseConverterTests { map.put("expires_in", "2100-01-01-abc"); OAuth2AccessTokenResponse converted = this.messageConverter.convert(map); OAuth2AccessToken accessToken = converted.getAccessToken(); - Assertions.assertNotNull(accessToken); - Assertions.assertEquals("access-token-1234", accessToken.getTokenValue()); - Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType()); + assertThat(accessToken).isNotNull(); + assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234"); + assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER); Set scopes = accessToken.getScopes(); - Assertions.assertNotNull(scopes); - Assertions.assertEquals(0, scopes.size()); - Assertions.assertEquals(1, - Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()); + assertThat(scopes).isNotNull(); + assertThat(scopes).isEmpty(); + assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()).isEqualTo(1); OAuth2RefreshToken refreshToken = converted.getRefreshToken(); - Assertions.assertNull(refreshToken); + assertThat(refreshToken).isNull(); Map additionalParameters = converted.getAdditionalParameters(); - Assertions.assertNotNull(additionalParameters); - Assertions.assertEquals(0, additionalParameters.size()); + assertThat(additionalParameters).isNotNull(); + assertThat(additionalParameters).isEmpty(); } // gh-9685 @@ -130,11 +129,11 @@ public class DefaultMapOAuth2AccessTokenResponseConverterTests { map.put("expires_in", 3600); OAuth2AccessTokenResponse converted = this.messageConverter.convert(map); OAuth2AccessToken accessToken = converted.getAccessToken(); - Assertions.assertNotNull(accessToken); - Assertions.assertEquals("access-token-1234", accessToken.getTokenValue()); - Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType()); - Assertions.assertEquals(3600, - Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()); + assertThat(accessToken).isNotNull(); + assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234"); + assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER); + assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()) + .isEqualTo(3600); } // gh-9685 @@ -153,24 +152,24 @@ public class DefaultMapOAuth2AccessTokenResponseConverterTests { map.put("custom_parameter_2", "custom-value-2"); OAuth2AccessTokenResponse converted = this.messageConverter.convert(map); OAuth2AccessToken accessToken = converted.getAccessToken(); - Assertions.assertNotNull(accessToken); - Assertions.assertEquals("access-token-1234", accessToken.getTokenValue()); - Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType()); + assertThat(accessToken).isNotNull(); + assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234"); + assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER); Set scopes = accessToken.getScopes(); - Assertions.assertNotNull(scopes); - Assertions.assertEquals(2, scopes.size()); - Assertions.assertTrue(scopes.contains("read")); - Assertions.assertTrue(scopes.contains("write")); - Assertions.assertEquals(3600, - Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()); + assertThat(scopes).isNotNull(); + assertThat(scopes).hasSize(2); + assertThat(scopes).contains("read"); + assertThat(scopes).contains("write"); + assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()) + .isEqualTo(3600); OAuth2RefreshToken refreshToken = converted.getRefreshToken(); - Assertions.assertNotNull(refreshToken); - Assertions.assertEquals("refresh-token-1234", refreshToken.getTokenValue()); + assertThat(refreshToken).isNotNull(); + assertThat(refreshToken.getTokenValue()).isEqualTo("refresh-token-1234"); Map additionalParameters = converted.getAdditionalParameters(); - Assertions.assertNotNull(additionalParameters); - Assertions.assertEquals(2, additionalParameters.size()); - Assertions.assertEquals(nestedObject, additionalParameters.get("custom_parameter_1")); - Assertions.assertEquals("custom-value-2", additionalParameters.get("custom_parameter_2")); + assertThat(additionalParameters).isNotNull(); + assertThat(additionalParameters).hasSize(2); + assertThat(additionalParameters).containsEntry("custom_parameter_1", nestedObject); + assertThat(additionalParameters).containsEntry("custom_parameter_2", "custom-value-2"); } } diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultOAuth2AccessTokenResponseMapConverterTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultOAuth2AccessTokenResponseMapConverterTests.java index 0d58ddaea4..69a9ab3d95 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultOAuth2AccessTokenResponseMapConverterTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultOAuth2AccessTokenResponseMapConverterTests.java @@ -22,13 +22,14 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.core.convert.converter.Converter; import org.springframework.security.oauth2.core.OAuth2AccessToken; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link DefaultOAuth2AccessTokenResponseMapConverter}. * @@ -61,14 +62,14 @@ public class DefaultOAuth2AccessTokenResponseMapConverterTests { .build(); // @formatter:on Map result = this.messageConverter.convert(build); - Assertions.assertEquals(7, result.size()); - Assertions.assertEquals("access-token-value-1234", result.get("access_token")); - Assertions.assertEquals("refresh-token-value-1234", result.get("refresh_token")); - Assertions.assertEquals("read write", result.get("scope")); - Assertions.assertEquals("Bearer", result.get("token_type")); - Assertions.assertNotNull(result.get("expires_in")); - Assertions.assertEquals("custom-value-1", result.get("custom_parameter_1")); - Assertions.assertEquals("custom-value-2", result.get("custom_parameter_2")); + assertThat(result).hasSize(7); + assertThat(result).containsEntry("access_token", "access-token-value-1234"); + assertThat(result).containsEntry("refresh_token", "refresh-token-value-1234"); + assertThat(result).containsEntry("scope", "read write"); + assertThat(result).containsEntry("token_type", "Bearer"); + assertThat(result.get("expires_in")).isNotNull(); + assertThat(result).containsEntry("custom_parameter_1", "custom-value-1"); + assertThat(result).containsEntry("custom_parameter_2", "custom-value-2"); } @Test @@ -79,10 +80,10 @@ public class DefaultOAuth2AccessTokenResponseMapConverterTests { .build(); // @formatter:on Map result = this.messageConverter.convert(build); - Assertions.assertEquals(3, result.size()); - Assertions.assertEquals("access-token-value-1234", result.get("access_token")); - Assertions.assertEquals("Bearer", result.get("token_type")); - Assertions.assertNotNull(result.get("expires_in")); + assertThat(result).hasSize(3); + assertThat(result).containsEntry("access_token", "access-token-value-1234"); + assertThat(result).containsEntry("token_type", "Bearer"); + assertThat(result.get("expires_in")).isNotNull(); } // gh-9685 @@ -107,14 +108,14 @@ public class DefaultOAuth2AccessTokenResponseMapConverterTests { .build(); // @formatter:on Map result = this.messageConverter.convert(build); - Assertions.assertEquals(7, result.size()); - Assertions.assertEquals("access-token-value-1234", result.get("access_token")); - Assertions.assertEquals("refresh-token-value-1234", result.get("refresh_token")); - Assertions.assertEquals("read write", result.get("scope")); - Assertions.assertEquals("Bearer", result.get("token_type")); - Assertions.assertNotNull(result.get("expires_in")); - Assertions.assertEquals(nestedObject, result.get("custom_parameter_1")); - Assertions.assertEquals("custom-value-2", result.get("custom_parameter_2")); + assertThat(result).hasSize(7); + assertThat(result).containsEntry("access_token", "access-token-value-1234"); + assertThat(result).containsEntry("refresh_token", "refresh-token-value-1234"); + assertThat(result).containsEntry("scope", "read write"); + assertThat(result).containsEntry("token_type", "Bearer"); + assertThat(result.get("expires_in")).isNotNull(); + assertThat(result).containsEntry("custom_parameter_1", nestedObject); + assertThat(result).containsEntry("custom_parameter_2", "custom-value-2"); } } diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcIdTokenBuilderTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcIdTokenBuilderTests.java index 2027f75196..8cbe9e3224 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcIdTokenBuilderTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcIdTokenBuilderTests.java @@ -41,11 +41,11 @@ public class OidcIdTokenBuilderTests { .build(); // @formatter:on assertThat(first.getClaims()).hasSize(1); - assertThat(first.getClaims().get("TEST_CLAIM_1")).isEqualTo("C1"); + assertThat(first.getClaims()).containsEntry("TEST_CLAIM_1", "C1"); assertThat(first.getTokenValue()).isEqualTo("V1"); assertThat(second.getClaims()).hasSize(2); - assertThat(second.getClaims().get("TEST_CLAIM_1")).isEqualTo("C2"); - assertThat(second.getClaims().get("TEST_CLAIM_2")).isEqualTo("C3"); + assertThat(second.getClaims()).containsEntry("TEST_CLAIM_1", "C2"); + assertThat(second.getClaims()).containsEntry("TEST_CLAIM_2", "C3"); assertThat(second.getTokenValue()).isEqualTo("V2"); } diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcUserInfoBuilderTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcUserInfoBuilderTests.java index 50d7f56b1c..c41c9e03a5 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcUserInfoBuilderTests.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/oidc/OidcUserInfoBuilderTests.java @@ -38,10 +38,10 @@ public class OidcUserInfoBuilderTests { .build(); // @formatter:on assertThat(first.getClaims()).hasSize(1); - assertThat(first.getClaims().get("TEST_CLAIM_1")).isEqualTo("C1"); + assertThat(first.getClaims()).containsEntry("TEST_CLAIM_1", "C1"); assertThat(second.getClaims()).hasSize(2); - assertThat(second.getClaims().get("TEST_CLAIM_1")).isEqualTo("C2"); - assertThat(second.getClaims().get("TEST_CLAIM_2")).isEqualTo("C3"); + assertThat(second.getClaims()).containsEntry("TEST_CLAIM_1", "C2"); + assertThat(second.getClaims()).containsEntry("TEST_CLAIM_2", "C3"); } @Test diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtBuilderTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtBuilderTests.java index 4d521ed906..61653c21c7 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtBuilderTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtBuilderTests.java @@ -47,16 +47,16 @@ public class JwtBuilderTests { .build(); // @formatter:on assertThat(first.getHeaders()).hasSize(1); - assertThat(first.getHeaders().get("TEST_HEADER_1")).isEqualTo("H1"); + assertThat(first.getHeaders()).containsEntry("TEST_HEADER_1", "H1"); assertThat(first.getClaims()).hasSize(1); - assertThat(first.getClaims().get("TEST_CLAIM_1")).isEqualTo("C1"); + assertThat(first.getClaims()).containsEntry("TEST_CLAIM_1", "C1"); assertThat(first.getTokenValue()).isEqualTo("V1"); assertThat(second.getHeaders()).hasSize(2); - assertThat(second.getHeaders().get("TEST_HEADER_1")).isEqualTo("H2"); - assertThat(second.getHeaders().get("TEST_HEADER_2")).isEqualTo("H3"); + assertThat(second.getHeaders()).containsEntry("TEST_HEADER_1", "H2"); + assertThat(second.getHeaders()).containsEntry("TEST_HEADER_2", "H3"); assertThat(second.getClaims()).hasSize(2); - assertThat(second.getClaims().get("TEST_CLAIM_1")).isEqualTo("C2"); - assertThat(second.getClaims().get("TEST_CLAIM_2")).isEqualTo("C3"); + assertThat(second.getClaims()).containsEntry("TEST_CLAIM_1", "C2"); + assertThat(second.getClaims()).containsEntry("TEST_CLAIM_2", "C3"); assertThat(second.getTokenValue()).isEqualTo("V2"); } diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java index a43989c868..9da90cfd0d 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimValidatorTests.java @@ -50,7 +50,7 @@ public class JwtClaimValidatorTests { public void validateWhenClaimFailsTheTestThenReturnsFailure() { Jwt jwt = TestJwts.jwt().claim(JwtClaimNames.ISS, "http://abc").build(); Collection details = this.validator.validate(jwt).getErrors(); - assertThat(this.validator.validate(jwt).getErrors().isEmpty()).isFalse(); + assertThat(this.validator.validate(jwt).getErrors()).isNotEmpty(); assertThat(details).allMatch((error) -> Objects.equals(error.getErrorCode(), OAuth2ErrorCodes.INVALID_TOKEN)); } diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverterTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverterTests.java index 11d4b105ec..89e1ddd89d 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverterTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/MappedJwtClaimSetConverterTests.java @@ -53,7 +53,7 @@ public class MappedJwtClaimSetConverterTests { .withDefaults(Collections.singletonMap(JwtClaimNames.EXP, expiresAtConverter)); Map source = new HashMap<>(); Map target = converter.convert(source); - assertThat(target.get(JwtClaimNames.IAT)).isEqualTo(Instant.ofEpochMilli(at.toEpochMilli()).minusSeconds(1)); + assertThat(target).containsEntry(JwtClaimNames.IAT, Instant.ofEpochMilli(at.toEpochMilli()).minusSeconds(1)); } @Test @@ -61,8 +61,8 @@ public class MappedJwtClaimSetConverterTests { MappedJwtClaimSetConverter converter = MappedJwtClaimSetConverter.withDefaults(Collections.emptyMap()); Map source = Collections.singletonMap(JwtClaimNames.EXP, 1000000000L); Map target = converter.convert(source); - assertThat(target.get(JwtClaimNames.EXP)).isEqualTo(Instant.ofEpochSecond(1000000000L)); - assertThat(target.get(JwtClaimNames.IAT)).isEqualTo(Instant.ofEpochSecond(1000000000L).minusSeconds(1)); + assertThat(target).containsEntry(JwtClaimNames.EXP, Instant.ofEpochSecond(1000000000L)); + assertThat(target).containsEntry(JwtClaimNames.IAT, Instant.ofEpochSecond(1000000000L).minusSeconds(1)); } @Test @@ -71,11 +71,11 @@ public class MappedJwtClaimSetConverterTests { Map source = Collections.singletonMap(JwtClaimNames.AUD, "audience"); Map target = converter.convert(source); assertThat(target.get(JwtClaimNames.AUD)).isInstanceOf(Collection.class); - assertThat(target.get(JwtClaimNames.AUD)).isEqualTo(Arrays.asList("audience")); + assertThat(target).containsEntry(JwtClaimNames.AUD, Arrays.asList("audience")); source = Collections.singletonMap(JwtClaimNames.AUD, Arrays.asList("one", "two")); target = converter.convert(source); assertThat(target.get(JwtClaimNames.AUD)).isInstanceOf(Collection.class); - assertThat(target.get(JwtClaimNames.AUD)).isEqualTo(Arrays.asList("one", "two")); + assertThat(target).containsEntry(JwtClaimNames.AUD, Arrays.asList("one", "two")); } @Test @@ -90,13 +90,13 @@ public class MappedJwtClaimSetConverterTests { source.put(JwtClaimNames.NBF, 1000000000); source.put(JwtClaimNames.SUB, 1234); Map target = converter.convert(source); - assertThat(target.get(JwtClaimNames.JTI)).isEqualTo("1"); - assertThat(target.get(JwtClaimNames.AUD)).isEqualTo(Arrays.asList("audience")); - assertThat(target.get(JwtClaimNames.EXP)).isEqualTo(Instant.ofEpochSecond(2000000000L)); - assertThat(target.get(JwtClaimNames.IAT)).isEqualTo(Instant.ofEpochSecond(1000000000L)); - assertThat(target.get(JwtClaimNames.ISS)).isEqualTo("https://any.url"); - assertThat(target.get(JwtClaimNames.NBF)).isEqualTo(Instant.ofEpochSecond(1000000000L)); - assertThat(target.get(JwtClaimNames.SUB)).isEqualTo("1234"); + assertThat(target).containsEntry(JwtClaimNames.JTI, "1"); + assertThat(target).containsEntry(JwtClaimNames.AUD, Arrays.asList("audience")); + assertThat(target).containsEntry(JwtClaimNames.EXP, Instant.ofEpochSecond(2000000000L)); + assertThat(target).containsEntry(JwtClaimNames.IAT, Instant.ofEpochSecond(1000000000L)); + assertThat(target).containsEntry(JwtClaimNames.ISS, "https://any.url"); + assertThat(target).containsEntry(JwtClaimNames.NBF, Instant.ofEpochSecond(1000000000L)); + assertThat(target).containsEntry(JwtClaimNames.SUB, "1234"); } @Test @@ -114,13 +114,13 @@ public class MappedJwtClaimSetConverterTests { source.put(JwtClaimNames.NBF, "1000000000"); source.put(JwtClaimNames.SUB, 2345); Map target = converter.convert(source); - assertThat(target.get(JwtClaimNames.JTI)).isEqualTo("1"); - assertThat(target.get(JwtClaimNames.AUD)).isEqualTo(Arrays.asList("audience")); - assertThat(target.get(JwtClaimNames.EXP)).isEqualTo(Instant.ofEpochSecond(2000000000L)); - assertThat(target.get(JwtClaimNames.IAT)).isEqualTo(Instant.ofEpochSecond(1000000000L)); - assertThat(target.get(JwtClaimNames.ISS)).isEqualTo("https://any.url"); - assertThat(target.get(JwtClaimNames.NBF)).isEqualTo(Instant.ofEpochSecond(1000000000L)); - assertThat(target.get(JwtClaimNames.SUB)).isEqualTo("1234"); + assertThat(target).containsEntry(JwtClaimNames.JTI, "1"); + assertThat(target).containsEntry(JwtClaimNames.AUD, Arrays.asList("audience")); + assertThat(target).containsEntry(JwtClaimNames.EXP, Instant.ofEpochSecond(2000000000L)); + assertThat(target).containsEntry(JwtClaimNames.IAT, Instant.ofEpochSecond(1000000000L)); + assertThat(target).containsEntry(JwtClaimNames.ISS, "https://any.url"); + assertThat(target).containsEntry(JwtClaimNames.NBF, Instant.ofEpochSecond(1000000000L)); + assertThat(target).containsEntry(JwtClaimNames.SUB, "1234"); } // gh-10135 @@ -149,7 +149,7 @@ public class MappedJwtClaimSetConverterTests { given(claimConverter.convert(any())).willReturn("custom-value"); Map source = new HashMap<>(); Map target = converter.convert(source); - assertThat(target.get("custom-claim")).isEqualTo("custom-value"); + assertThat(target).containsEntry("custom-claim", "custom-value"); } @Test @@ -167,13 +167,13 @@ public class MappedJwtClaimSetConverterTests { source.put(JwtClaimNames.NBF, new Object()); source.put(JwtClaimNames.SUB, new Object()); Map target = converter.convert(source); - assertThat(target.get(JwtClaimNames.JTI)).isEqualTo(source.get(JwtClaimNames.JTI)); - assertThat(target.get(JwtClaimNames.AUD)).isEqualTo(source.get(JwtClaimNames.AUD)); - assertThat(target.get(JwtClaimNames.EXP)).isEqualTo(source.get(JwtClaimNames.EXP)); - assertThat(target.get(JwtClaimNames.IAT)).isEqualTo(source.get(JwtClaimNames.IAT)); - assertThat(target.get(JwtClaimNames.ISS)).isEqualTo(source.get(JwtClaimNames.ISS)); - assertThat(target.get(JwtClaimNames.NBF)).isEqualTo(source.get(JwtClaimNames.NBF)); - assertThat(target.get(JwtClaimNames.SUB)).isEqualTo("1234"); + assertThat(target).containsEntry(JwtClaimNames.JTI, source.get(JwtClaimNames.JTI)); + assertThat(target).containsEntry(JwtClaimNames.AUD, source.get(JwtClaimNames.AUD)); + assertThat(target).containsEntry(JwtClaimNames.EXP, source.get(JwtClaimNames.EXP)); + assertThat(target).containsEntry(JwtClaimNames.IAT, source.get(JwtClaimNames.IAT)); + assertThat(target).containsEntry(JwtClaimNames.ISS, source.get(JwtClaimNames.ISS)); + assertThat(target).containsEntry(JwtClaimNames.NBF, source.get(JwtClaimNames.NBF)); + assertThat(target).containsEntry(JwtClaimNames.SUB, "1234"); } @Test @@ -195,7 +195,7 @@ public class MappedJwtClaimSetConverterTests { MappedJwtClaimSetConverter converter = MappedJwtClaimSetConverter.withDefaults(Collections.emptyMap()); Map nonUriIssuer = Collections.singletonMap(JwtClaimNames.ISS, "issuer"); Map target = converter.convert(nonUriIssuer); - assertThat(target.get(JwtClaimNames.ISS)).isEqualTo("issuer"); + assertThat(target).containsEntry(JwtClaimNames.ISS, "issuer"); } // gh-6073 @@ -204,7 +204,7 @@ public class MappedJwtClaimSetConverterTests { MappedJwtClaimSetConverter converter = MappedJwtClaimSetConverter.withDefaults(Collections.emptyMap()); Map issuer = Collections.singletonMap(JwtClaimNames.ISS, new URL("https://issuer")); Map target = converter.convert(issuer); - assertThat(target.get(JwtClaimNames.ISS)).isEqualTo("https://issuer"); + assertThat(target).containsEntry(JwtClaimNames.ISS, "https://issuer"); } @Test diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJweEncoderTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJweEncoderTests.java index cfb1d7cd11..87f5f406e9 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJweEncoderTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJweEncoderTests.java @@ -100,11 +100,11 @@ public class NimbusJweEncoderTests { // @formatter:on Jwt encodedJwe = this.jweEncoder.encode(JwtEncoderParameters.from(jwtClaimsSet)); - assertThat(encodedJwe.getHeaders().get(JoseHeaderNames.ALG)).isEqualTo(DEFAULT_JWE_HEADER.getAlgorithm()); - assertThat(encodedJwe.getHeaders().get("enc")).isEqualTo(DEFAULT_JWE_HEADER.getHeader("enc")); + assertThat(encodedJwe.getHeaders()).containsEntry(JoseHeaderNames.ALG, DEFAULT_JWE_HEADER.getAlgorithm()); + assertThat(encodedJwe.getHeaders()).containsEntry("enc", DEFAULT_JWE_HEADER.getHeader("enc")); assertThat(encodedJwe.getHeaders().get(JoseHeaderNames.JKU)).isNull(); assertThat(encodedJwe.getHeaders().get(JoseHeaderNames.JWK)).isNull(); - assertThat(encodedJwe.getHeaders().get(JoseHeaderNames.KID)).isEqualTo(rsaJwk.getKeyID()); + assertThat(encodedJwe.getHeaders()).containsEntry(JoseHeaderNames.KID, rsaJwk.getKeyID()); assertThat(encodedJwe.getHeaders().get(JoseHeaderNames.X5U)).isNull(); assertThat(encodedJwe.getHeaders().get(JoseHeaderNames.X5C)).isNull(); assertThat(encodedJwe.getHeaders().get(JoseHeaderNames.X5T)).isNull(); @@ -144,18 +144,18 @@ public class NimbusJweEncoderTests { // @formatter:on Jwt encodedJweNestedJws = this.jweEncoder.encode(JwtEncoderParameters.from(jwsHeader, jwtClaimsSet)); - assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.ALG)) - .isEqualTo(DEFAULT_JWE_HEADER.getAlgorithm()); - assertThat(encodedJweNestedJws.getHeaders().get("enc")).isEqualTo(DEFAULT_JWE_HEADER.getHeader("enc")); + assertThat(encodedJweNestedJws.getHeaders()).containsEntry(JoseHeaderNames.ALG, + DEFAULT_JWE_HEADER.getAlgorithm()); + assertThat(encodedJweNestedJws.getHeaders()).containsEntry("enc", DEFAULT_JWE_HEADER.getHeader("enc")); assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.JKU)).isNull(); assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.JWK)).isNull(); - assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.KID)).isEqualTo(rsaJwk.getKeyID()); + assertThat(encodedJweNestedJws.getHeaders()).containsEntry(JoseHeaderNames.KID, rsaJwk.getKeyID()); assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.X5U)).isNull(); assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.X5C)).isNull(); assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.X5T)).isNull(); assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.X5T_S256)).isNull(); assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.TYP)).isNull(); - assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.CTY)).isEqualTo("JWT"); + assertThat(encodedJweNestedJws.getHeaders()).containsEntry(JoseHeaderNames.CTY, "JWT"); assertThat(encodedJweNestedJws.getHeaders().get(JoseHeaderNames.CRIT)).isNull(); assertThat(encodedJweNestedJws.getIssuer()).isEqualTo(jwtClaimsSet.getIssuer()); diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java index 00e9efa832..7d7e451f97 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderTests.java @@ -248,8 +248,8 @@ public class NimbusJwtDecoderTests { given(claimSetConverter.convert(any(Map.class))).willReturn(Collections.singletonMap("custom", "value")); this.jwtDecoder.setClaimSetConverter(claimSetConverter); Jwt jwt = this.jwtDecoder.decode(SIGNED_JWT); - assertThat(jwt.getClaims().size()).isEqualTo(1); - assertThat(jwt.getClaims().get("custom")).isEqualTo("value"); + assertThat(jwt.getClaims()).hasSize(1); + assertThat(jwt.getClaims()).containsEntry("custom", "value"); } // gh-7885 diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtEncoderTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtEncoderTests.java index 60c99b13ce..56049886b0 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtEncoderTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusJwtEncoderTests.java @@ -144,7 +144,7 @@ public class NimbusJwtEncoderTests { Jwt encodedJws = this.jwtEncoder.encode(JwtEncoderParameters.from(jwtClaimsSet)); - assertThat(encodedJws.getHeaders().get(JoseHeaderNames.ALG)).isEqualTo(SignatureAlgorithm.RS256); + assertThat(encodedJws.getHeaders()).containsEntry(JoseHeaderNames.ALG, SignatureAlgorithm.RS256); } @Test @@ -165,7 +165,7 @@ public class NimbusJwtEncoderTests { Jwt encodedJws = this.jwtEncoder.encode(JwtEncoderParameters.from(jwsHeader, jwtClaimsSet)); - assertThat(encodedJws.getHeaders().get(JoseHeaderNames.KID)).isEqualTo(rsaJwk2.getKeyID()); + assertThat(encodedJws.getHeaders()).containsEntry(JoseHeaderNames.KID, rsaJwk2.getKeyID()); } @Test @@ -189,8 +189,8 @@ public class NimbusJwtEncoderTests { Jwt encodedJws = this.jwtEncoder.encode(JwtEncoderParameters.from(jwsHeader, jwtClaimsSet)); - assertThat(encodedJws.getHeaders().get(JoseHeaderNames.X5T_S256)) - .isEqualTo(rsaJwk1.getX509CertSHA256Thumbprint().toString()); + assertThat(encodedJws.getHeaders()).containsEntry(JoseHeaderNames.X5T_S256, + rsaJwk1.getX509CertSHA256Thumbprint().toString()); assertThat(encodedJws.getHeaders().get(JoseHeaderNames.KID)).isNull(); } @@ -230,15 +230,15 @@ public class NimbusJwtEncoderTests { Jwt encodedJws = this.jwtEncoder.encode(JwtEncoderParameters.from(jwsHeader, jwtClaimsSet)); - assertThat(encodedJws.getHeaders().get(JoseHeaderNames.ALG)).isEqualTo(jwsHeader.getAlgorithm()); + assertThat(encodedJws.getHeaders()).containsEntry(JoseHeaderNames.ALG, jwsHeader.getAlgorithm()); assertThat(encodedJws.getHeaders().get(JoseHeaderNames.JKU)).isNull(); assertThat(encodedJws.getHeaders().get(JoseHeaderNames.JWK)).isNull(); - assertThat(encodedJws.getHeaders().get(JoseHeaderNames.KID)).isEqualTo(rsaJwk.getKeyID()); + assertThat(encodedJws.getHeaders()).containsEntry(JoseHeaderNames.KID, rsaJwk.getKeyID()); assertThat(encodedJws.getHeaders().get(JoseHeaderNames.X5U)).isNull(); assertThat(encodedJws.getHeaders().get(JoseHeaderNames.X5C)).isNull(); assertThat(encodedJws.getHeaders().get(JoseHeaderNames.X5T)).isNull(); - assertThat(encodedJws.getHeaders().get(JoseHeaderNames.X5T_S256)) - .isEqualTo(rsaJwk.getX509CertSHA256Thumbprint().toString()); + assertThat(encodedJws.getHeaders()).containsEntry(JoseHeaderNames.X5T_S256, + rsaJwk.getX509CertSHA256Thumbprint().toString()); assertThat(encodedJws.getHeaders().get(JoseHeaderNames.TYP)).isNull(); assertThat(encodedJws.getHeaders().get(JoseHeaderNames.CTY)).isNull(); assertThat(encodedJws.getHeaders().get(JoseHeaderNames.CRIT)).isNull(); diff --git a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java index c65ae6ddd9..8015c73894 100644 --- a/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java +++ b/oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/NimbusReactiveJwtDecoderTests.java @@ -149,7 +149,7 @@ public class NimbusReactiveJwtDecoderTests { @Test public void decodeWhenMessageReadScopeThenSuccess() { Jwt jwt = this.decoder.decode(this.messageReadToken).block(); - assertThat(jwt.getClaims().get("scope")).isEqualTo("message:read"); + assertThat(jwt.getClaims()).containsEntry("scope", "message:read"); } @Test @@ -167,7 +167,7 @@ public class NimbusReactiveJwtDecoderTests { public void decodeWhenIssuedAtThenSuccess() { String withIssuedAt = "eyJraWQiOiJrZXktaWQtMSIsImFsZyI6IlJTMjU2In0.eyJzY29wZSI6IiIsImV4cCI6OTIyMzM3MjAwNjA5NjM3NSwiaWF0IjoxNTI5OTQyNDQ4fQ.LBzAJO-FR-uJDHST61oX4kimuQjz6QMJPW_mvEXRB6A-fMQWpfTQ089eboipAqsb33XnwWth9ELju9HMWLk0FjlWVVzwObh9FcoKelmPNR8mZIlFG-pAYGgSwi8HufyLabXHntFavBiFtqwp_z9clSOFK1RxWvt3lywEbGgtCKve0BXOjfKWiH1qe4QKGixH-NFxidvz8Qd5WbJwyb9tChC6ZKoKPv7Jp-N5KpxkY-O2iUtINvn4xOSactUsvKHgF8ZzZjvJGzG57r606OZXaNtoElQzjAPU5xDGg5liuEJzfBhvqiWCLRmSuZ33qwp3aoBnFgEw0B85gsNe3ggABg"; Jwt jwt = this.decoder.decode(withIssuedAt).block(); - assertThat(jwt.getClaims().get(JwtClaimNames.IAT)).isEqualTo(Instant.ofEpochSecond(1529942448L)); + assertThat(jwt.getClaims()).containsEntry(JwtClaimNames.IAT, Instant.ofEpochSecond(1529942448L)); } @Test @@ -267,8 +267,8 @@ public class NimbusReactiveJwtDecoderTests { this.decoder.setClaimSetConverter(claimSetConverter); given(claimSetConverter.convert(any(Map.class))).willReturn(Collections.singletonMap("custom", "value")); Jwt jwt = this.decoder.decode(this.messageReadToken).block(); - assertThat(jwt.getClaims().size()).isEqualTo(1); - assertThat(jwt.getClaims().get("custom")).isEqualTo("value"); + assertThat(jwt.getClaims()).hasSize(1); + assertThat(jwt.getClaims()).containsEntry("custom", "value"); verify(claimSetConverter).convert(any(Map.class)); } diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationsTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationsTests.java index 06148f183a..2aab7b6d9b 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationsTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationsTests.java @@ -248,7 +248,7 @@ public class RelyingPartyRegistrationsTests { public void collectionFromMetadataLocationCanHandleFederationMetadata() { Collection federationMetadataWithSkippedSPEntries = RelyingPartyRegistrations .collectionFromMetadataLocation("classpath:test-federated-metadata.xml"); - assertThat(federationMetadataWithSkippedSPEntries.size()).isEqualTo(1); + assertThat(federationMetadataWithSkippedSPEntries).hasSize(1); } @Test diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/authentication/Saml2WebSsoAuthenticationFilterTests.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/authentication/Saml2WebSsoAuthenticationFilterTests.java index 5787a74267..4237b890a9 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/authentication/Saml2WebSsoAuthenticationFilterTests.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/authentication/Saml2WebSsoAuthenticationFilterTests.java @@ -17,7 +17,6 @@ package org.springframework.security.saml2.provider.service.web.authentication; import jakarta.servlet.http.HttpServletResponse; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -45,6 +44,7 @@ import org.springframework.security.web.authentication.WebAuthenticationDetails; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.security.web.util.matcher.RequestMatcher; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.assertj.core.api.Assertions.assertThatNoException; @@ -92,7 +92,7 @@ public class Saml2WebSsoAuthenticationFilterTests { @Test public void requiresAuthenticationWhenHappyPathThenReturnsTrue() { - Assertions.assertTrue(this.filter.requiresAuthentication(this.request, this.response)); + assertThat(this.filter.requiresAuthentication(this.request, this.response)).isTrue(); } @Test @@ -100,7 +100,7 @@ public class Saml2WebSsoAuthenticationFilterTests { this.filter = new Saml2WebSsoAuthenticationFilter(this.repository, "/some/other/path/{registrationId}"); this.request.setPathInfo("/some/other/path/idp-registration-id"); this.request.setParameter(Saml2ParameterNames.SAML_RESPONSE, "xml-data-goes-here"); - Assertions.assertTrue(this.filter.requiresAuthentication(this.request, this.response)); + assertThat(this.filter.requiresAuthentication(this.request, this.response)).isTrue(); } @Test @@ -141,7 +141,7 @@ public class Saml2WebSsoAuthenticationFilterTests { this.filter.setAuthenticationDetailsSource(authenticationDetailsSource); this.request.setPathInfo("/some/other/path/idp-registration-id"); this.filter.attemptAuthentication(this.request, this.response); - Assertions.assertEquals(details, token.getDetails()); + assertThat(token.getDetails()).isEqualTo(details); } @Test diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java index 44213e8661..b3fac6d18f 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurerOpaqueTokenTests.java @@ -64,7 +64,7 @@ public class SecurityMockServerConfigurerOpaqueTokenTests extends AbstractMockSe BearerTokenAuthentication token = (BearerTokenAuthentication) context.getAuthentication(); assertThat(token.getAuthorities()).isNotEmpty(); assertThat(token.getToken()).isNotNull(); - assertThat(token.getTokenAttributes().get(OAuth2TokenIntrospectionClaimNames.SUB)).isEqualTo("user"); + assertThat(token.getTokenAttributes()).containsEntry(OAuth2TokenIntrospectionClaimNames.SUB, "user"); } @Test diff --git a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java index 8033a18975..fae8651960 100644 --- a/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java +++ b/test/src/test/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurersJwtTests.java @@ -63,7 +63,7 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon assertThat(token.getAuthorities()).isNotEmpty(); assertThat(token.getToken()).isNotNull(); assertThat(token.getToken().getSubject()).isEqualTo("user"); - assertThat(token.getToken().getHeaders().get("alg")).isEqualTo("none"); + assertThat(token.getToken().getHeaders()).containsEntry("alg", "none"); } @Test @@ -119,7 +119,7 @@ public class SecurityMockServerConfigurersJwtTests extends AbstractMockServerCon JwtAuthenticationToken retrievedToken = (JwtAuthenticationToken) context.getAuthentication(); assertThat(retrievedToken.getToken().getSubject()).isEqualTo("some_user"); assertThat(retrievedToken.getToken().getTokenValue()).isEqualTo("token"); - assertThat(retrievedToken.getToken().getHeaders().get("header1")).isEqualTo("value1"); + assertThat(retrievedToken.getToken().getHeaders()).containsEntry("header1", "value1"); } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsJwtTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsJwtTests.java index f5b12bc6c7..6b0cc44a85 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsJwtTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsJwtTests.java @@ -102,7 +102,7 @@ public class SecurityMockMvcRequestPostProcessorsJwtTests { assertThat(token.getAuthorities()).isNotEmpty(); assertThat(token.getToken()).isNotNull(); assertThat(token.getToken().getSubject()).isEqualTo("user"); - assertThat(token.getToken().getHeaders().get("alg")).isEqualTo("none"); + assertThat(token.getToken().getHeaders()).containsEntry("alg", "none"); } @Test @@ -158,7 +158,7 @@ public class SecurityMockMvcRequestPostProcessorsJwtTests { JwtAuthenticationToken retrievedToken = (JwtAuthenticationToken) context.getAuthentication(); assertThat(retrievedToken.getToken().getSubject()).isEqualTo("some_user"); assertThat(retrievedToken.getToken().getTokenValue()).isEqualTo("token"); - assertThat(retrievedToken.getToken().getHeaders().get("header1")).isEqualTo("value1"); + assertThat(retrievedToken.getToken().getHeaders()).containsEntry("header1", "value1"); } } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java index 4e135f2894..0d2e3775f7 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java @@ -42,7 +42,7 @@ public class PreAuthenticatedAuthenticationTokenTests { assertThat(token.getPrincipal()).isEqualTo(principal); assertThat(token.getCredentials()).isEqualTo(credentials); assertThat(token.getDetails()).isEqualTo(details); - assertThat(token.getAuthorities().isEmpty()).isTrue(); + assertThat(token.getAuthorities()).isEmpty(); } @Test @@ -53,7 +53,7 @@ public class PreAuthenticatedAuthenticationTokenTests { assertThat(token.getPrincipal()).isEqualTo(principal); assertThat(token.getCredentials()).isEqualTo(credentials); assertThat(token.getDetails()).isNull(); - assertThat(token.getAuthorities().isEmpty()).isTrue(); + assertThat(token.getAuthorities()).isEmpty(); } @Test diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java index 8e088aa253..a9cf5f40b7 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java @@ -95,10 +95,10 @@ public class JdbcTokenRepositoryImplTests { PersistentRememberMeToken token = new PersistentRememberMeToken("joeuser", "joesseries", "atoken", currentDate); this.repo.createNewToken(token); Map results = this.template.queryForMap("select * from persistent_logins"); - assertThat(results.get("last_used")).isEqualTo(currentDate); - assertThat(results.get("username")).isEqualTo("joeuser"); - assertThat(results.get("series")).isEqualTo("joesseries"); - assertThat(results.get("token")).isEqualTo("atoken"); + assertThat(results).containsEntry("last_used", currentDate); + assertThat(results).containsEntry("username", "joeuser"); + assertThat(results).containsEntry("series", "joesseries"); + assertThat(results).containsEntry("token", "atoken"); } @Test @@ -157,9 +157,9 @@ public class JdbcTokenRepositoryImplTests { this.repo.updateToken("joesseries", "newtoken", new Date()); Map results = this.template .queryForMap("select * from persistent_logins where series = 'joesseries'"); - assertThat(results.get("username")).isEqualTo("joeuser"); - assertThat(results.get("series")).isEqualTo("joesseries"); - assertThat(results.get("token")).isEqualTo("newtoken"); + assertThat(results).containsEntry("username", "joeuser"); + assertThat(results).containsEntry("series", "joesseries"); + assertThat(results).containsEntry("token", "newtoken"); Date lastUsed = (Date) results.get("last_used"); assertThat(lastUsed.getTime() > ts.getTime()).isTrue(); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java index 428752c94c..e7513f7d55 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java @@ -93,7 +93,7 @@ public class PersistentTokenBasedRememberMeServicesTests { this.services.processAutoLoginCookie(new String[] { "series", "token" }, new MockHttpServletRequest(), response); assertThat(this.repo.getStoredToken().getSeries()).isEqualTo("series"); - assertThat(this.repo.getStoredToken().getTokenValue().length()).isEqualTo(16); + assertThat(this.repo.getStoredToken().getTokenValue()).hasSize(16); String[] cookie = this.services.decodeCookie(response.getCookie("mycookiename").getValue()); assertThat(cookie[0]).isEqualTo("series"); assertThat(cookie[1]).isEqualTo(this.repo.getStoredToken().getTokenValue()); @@ -108,8 +108,8 @@ public class PersistentTokenBasedRememberMeServicesTests { MockHttpServletResponse response = new MockHttpServletResponse(); this.services.loginSuccess(new MockHttpServletRequest(), response, UsernamePasswordAuthenticationToken.unauthenticated("joe", "password")); - assertThat(this.repo.getStoredToken().getSeries().length()).isEqualTo(16); - assertThat(this.repo.getStoredToken().getTokenValue().length()).isEqualTo(16); + assertThat(this.repo.getStoredToken().getSeries()).hasSize(16); + assertThat(this.repo.getStoredToken().getTokenValue()).hasSize(16); String[] cookie = this.services.decodeCookie(response.getCookie("mycookiename").getValue()); assertThat(cookie[0]).isEqualTo(this.repo.getStoredToken().getSeries()); assertThat(cookie[1]).isEqualTo(this.repo.getStoredToken().getTokenValue()); diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java index 104c73f4fd..9507ed7563 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java @@ -38,16 +38,16 @@ public class DigestAuthUtilsTests { String unsplit = "username=\"rod\", invalidEntryThatHasNoEqualsSign, realm=\"Contacts Realm\", nonce=\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\", uri=\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\", response=\"38644211cf9ac3da63ab639807e2baff\", qop=auth, nc=00000004, cnonce=\"2b8d329a8571b99a\""; String[] headerEntries = StringUtils.commaDelimitedListToStringArray(unsplit); Map headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", "\""); - assertThat(headerMap.get("username")).isEqualTo("rod"); - assertThat(headerMap.get("realm")).isEqualTo("Contacts Realm"); - assertThat(headerMap.get("nonce")) - .isEqualTo("MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ=="); - assertThat(headerMap.get("uri")) - .isEqualTo("/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4"); - assertThat(headerMap.get("response")).isEqualTo("38644211cf9ac3da63ab639807e2baff"); - assertThat(headerMap.get("qop")).isEqualTo("auth"); - assertThat(headerMap.get("nc")).isEqualTo("00000004"); - assertThat(headerMap.get("cnonce")).isEqualTo("2b8d329a8571b99a"); + assertThat(headerMap).containsEntry("username", "rod"); + assertThat(headerMap).containsEntry("realm", "Contacts Realm"); + assertThat(headerMap).containsEntry("nonce", + "MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ=="); + assertThat(headerMap).containsEntry("uri", + "/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4"); + assertThat(headerMap).containsEntry("response", "38644211cf9ac3da63ab639807e2baff"); + assertThat(headerMap).containsEntry("qop", "auth"); + assertThat(headerMap).containsEntry("nc", "00000004"); + assertThat(headerMap).containsEntry("cnonce", "2b8d329a8571b99a"); assertThat(headerMap).hasSize(8); } @@ -56,16 +56,16 @@ public class DigestAuthUtilsTests { String unsplit = "username=\"rod\", realm=\"Contacts Realm\", nonce=\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\", uri=\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\", response=\"38644211cf9ac3da63ab639807e2baff\", qop=auth, nc=00000004, cnonce=\"2b8d329a8571b99a\""; String[] headerEntries = StringUtils.commaDelimitedListToStringArray(unsplit); Map headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", null); - assertThat(headerMap.get("username")).isEqualTo("\"rod\""); - assertThat(headerMap.get("realm")).isEqualTo("\"Contacts Realm\""); - assertThat(headerMap.get("nonce")) - .isEqualTo("\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\""); - assertThat(headerMap.get("uri")) - .isEqualTo("\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\""); - assertThat(headerMap.get("response")).isEqualTo("\"38644211cf9ac3da63ab639807e2baff\""); - assertThat(headerMap.get("qop")).isEqualTo("auth"); - assertThat(headerMap.get("nc")).isEqualTo("00000004"); - assertThat(headerMap.get("cnonce")).isEqualTo("\"2b8d329a8571b99a\""); + assertThat(headerMap).containsEntry("username", "\"rod\""); + assertThat(headerMap).containsEntry("realm", "\"Contacts Realm\""); + assertThat(headerMap).containsEntry("nonce", + "\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\""); + assertThat(headerMap).containsEntry("uri", + "\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\""); + assertThat(headerMap).containsEntry("response", "\"38644211cf9ac3da63ab639807e2baff\""); + assertThat(headerMap).containsEntry("qop", "auth"); + assertThat(headerMap).containsEntry("nc", "00000004"); + assertThat(headerMap).containsEntry("cnonce", "\"2b8d329a8571b99a\""); assertThat(headerMap).hasSize(8); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java index 1e9f557c0d..d362751721 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java @@ -93,8 +93,8 @@ public class DigestAuthenticationEntryPointTests { String header = response.getHeader("WWW-Authenticate").toString().substring(7); String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header); Map headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", "\""); - assertThat(headerMap.get("realm")).isEqualTo("hello"); - assertThat(headerMap.get("qop")).isEqualTo("auth"); + assertThat(headerMap).containsEntry("realm", "hello"); + assertThat(headerMap).containsEntry("qop", "auth"); assertThat(headerMap.get("stale")).isNull(); checkNonceValid(headerMap.get("nonce")); } @@ -116,9 +116,9 @@ public class DigestAuthenticationEntryPointTests { String header = response.getHeader("WWW-Authenticate").toString().substring(7); String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header); Map headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", "\""); - assertThat(headerMap.get("realm")).isEqualTo("hello"); - assertThat(headerMap.get("qop")).isEqualTo("auth"); - assertThat(headerMap.get("stale")).isEqualTo("true"); + assertThat(headerMap).containsEntry("realm", "hello"); + assertThat(headerMap).containsEntry("qop", "auth"); + assertThat(headerMap).containsEntry("stale", "true"); checkNonceValid(headerMap.get("nonce")); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java index cc14ce9132..56e0ea3f33 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java @@ -149,7 +149,7 @@ public class DigestAuthenticationFilterTests { String header = response.getHeader("WWW-Authenticate").toString().substring(7); String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header); Map headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", "\""); - assertThat(headerMap.get("stale")).isEqualTo("true"); + assertThat(headerMap).containsEntry("stale", "true"); } @Test diff --git a/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java index 906c96f4b2..b33c2fec79 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java @@ -47,7 +47,7 @@ public class CacheControlHeadersWriterTests { @Test public void writeHeaders() { this.writer.writeHeaders(this.request, this.response); - assertThat(this.response.getHeaderNames().size()).isEqualTo(3); + assertThat(this.response.getHeaderNames()).hasSize(3); assertThat(this.response.getHeaderValues("Cache-Control")) .containsOnly("no-cache, no-store, max-age=0, must-revalidate"); assertThat(this.response.getHeaderValues("Pragma")).containsOnly("no-cache"); diff --git a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java index 3b98e903fa..5eed0da2df 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java @@ -112,7 +112,7 @@ public class HstsHeaderWriterTests { public void writeHeadersInsecureRequestDoesNotWriteHeader() { this.request.setSecure(false); this.writer.writeHeaders(this.request, this.response); - assertThat(this.response.getHeaderNames().isEmpty()).isTrue(); + assertThat(this.response.getHeaderNames()).isEmpty(); } @Test diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java index f955ef4dcc..e27f42e7db 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java @@ -72,7 +72,7 @@ public class FrameOptionsHeaderWriterTests { public void writeHeadersAllowFromReturnsNull() { this.writer = new XFrameOptionsHeaderWriter(this.strategy); this.writer.writeHeaders(this.request, this.response); - assertThat(this.response.getHeaderNames().isEmpty()).isTrue(); + assertThat(this.response.getHeaderNames()).isEmpty(); } @Test diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java index f010a6521d..b38b97c680 100644 --- a/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java +++ b/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java @@ -45,7 +45,7 @@ public class DefaultSavedRequestTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.addHeader("If-None-Match", "somehashvalue"); DefaultSavedRequest saved = new DefaultSavedRequest(request, new MockPortResolver(8080, 8443)); - assertThat(saved.getHeaderValues("if-none-match").isEmpty()).isTrue(); + assertThat(saved.getHeaderValues("if-none-match")).isEmpty(); } // SEC-3082 diff --git a/web/src/test/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCacheTests.java b/web/src/test/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCacheTests.java index eded2e5a9b..2fe473cb72 100644 --- a/web/src/test/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCacheTests.java +++ b/web/src/test/java/org/springframework/security/web/server/savedrequest/CookieServerRequestCacheTests.java @@ -46,7 +46,7 @@ public class CookieServerRequestCacheTests { .from(MockServerHttpRequest.get("/secured/").accept(MediaType.TEXT_HTML)); this.cache.saveRequest(exchange).block(); MultiValueMap cookies = exchange.getResponse().getCookies(); - assertThat(cookies.size()).isEqualTo(1); + assertThat(cookies).hasSize(1); ResponseCookie cookie = cookies.getFirst("REDIRECT_URI"); assertThat(cookie).isNotNull(); String encodedRedirectUrl = Base64.getEncoder().encodeToString("/secured/".getBytes()); @@ -60,7 +60,7 @@ public class CookieServerRequestCacheTests { .from(MockServerHttpRequest.get("/secured/").queryParam("key", "value").accept(MediaType.TEXT_HTML)); this.cache.saveRequest(exchange).block(); MultiValueMap cookies = exchange.getResponse().getCookies(); - assertThat(cookies.size()).isEqualTo(1); + assertThat(cookies).hasSize(1); ResponseCookie cookie = cookies.getFirst("REDIRECT_URI"); assertThat(cookie).isNotNull(); String encodedRedirectUrl = Base64.getEncoder().encodeToString("/secured/?key=value".getBytes());