Skip to content

Commit 1d113fd

Browse files
timtebeekTeamModerne
timtebeek
and
TeamModerne
committed
refactor: AssertJ best practices
Use this link to re-run the recipe: https://app.moderne.io/recipes/builder/bGVuS?organizationId=RGVmYXVsdA%3D%3D Co-authored-by: Moderne <team@moderne.io>
1 parent 7b2cb59 commit 1d113fd

File tree

69 files changed

+336
-335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+336
-335
lines changed

‎acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void findOneChildren() {
112112
given(this.jdbcOperations.query(anyString(), eq(args), any(RowMapper.class))).willReturn(result);
113113
ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 1L);
114114
List<ObjectIdentity> objectIdentities = this.aclService.findChildren(objectIdentity);
115-
assertThat(objectIdentities.size()).isEqualTo(1);
115+
assertThat(objectIdentities).hasSize(1);
116116
assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("5577");
117117
}
118118

@@ -127,7 +127,7 @@ public void findNoChildren() {
127127
public void findChildrenWithoutIdType() {
128128
ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockLongIdDomainObject.class, 4711L);
129129
List<ObjectIdentity> objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity);
130-
assertThat(objectIdentities.size()).isEqualTo(1);
130+
assertThat(objectIdentities).hasSize(1);
131131
assertThat(objectIdentities.get(0).getType()).isEqualTo(MockUntypedIdDomainObject.class.getName());
132132
assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo(5000L);
133133
}
@@ -143,7 +143,7 @@ public void findChildrenForUnknownObject() {
143143
public void findChildrenOfIdTypeLong() {
144144
ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US-PAL");
145145
List<ObjectIdentity> objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity);
146-
assertThat(objectIdentities.size()).isEqualTo(2);
146+
assertThat(objectIdentities).hasSize(2);
147147
assertThat(objectIdentities.get(0).getType()).isEqualTo(MockLongIdDomainObject.class.getName());
148148
assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo(4711L);
149149
assertThat(objectIdentities.get(1).getType()).isEqualTo(MockLongIdDomainObject.class.getName());
@@ -155,7 +155,7 @@ public void findChildrenOfIdTypeString() {
155155
ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US");
156156
this.aclServiceIntegration.setAclClassIdSupported(true);
157157
List<ObjectIdentity> objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity);
158-
assertThat(objectIdentities.size()).isEqualTo(1);
158+
assertThat(objectIdentities).hasSize(1);
159159
assertThat(objectIdentities.get(0).getType()).isEqualTo("location");
160160
assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("US-PAL");
161161
}
@@ -165,7 +165,7 @@ public void findChildrenOfIdTypeUUID() {
165165
ObjectIdentity objectIdentity = new ObjectIdentityImpl(MockUntypedIdDomainObject.class, 5000L);
166166
this.aclServiceIntegration.setAclClassIdSupported(true);
167167
List<ObjectIdentity> objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity);
168-
assertThat(objectIdentities.size()).isEqualTo(1);
168+
assertThat(objectIdentities).hasSize(1);
169169
assertThat(objectIdentities.get(0).getType()).isEqualTo("costcenter");
170170
assertThat(objectIdentities.get(0).getIdentifier())
171171
.isEqualTo(UUID.fromString("25d93b3f-c3aa-4814-9d5e-c7c96ced7762"));
@@ -186,7 +186,7 @@ public void findChildrenWhenObjectIdentityGeneratorSetThenUsed() {
186186
ObjectIdentity objectIdentity = new ObjectIdentityImpl("location", "US");
187187
this.aclServiceIntegration.setAclClassIdSupported(true);
188188
List<ObjectIdentity> objectIdentities = this.aclServiceIntegration.findChildren(objectIdentity);
189-
assertThat(objectIdentities.size()).isEqualTo(1);
189+
assertThat(objectIdentities).hasSize(1);
190190
assertThat(objectIdentities.get(0).getType()).isEqualTo("location");
191191
assertThat(objectIdentities.get(0).getIdentifier()).isEqualTo("prefix:US-PAL");
192192
}

‎acl/src/test/java/org/springframework/security/acls/sid/SidTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ public void testGetters() {
120120
PrincipalSid principalSid = new PrincipalSid(authentication);
121121
GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
122122
GrantedAuthoritySid gaSid = new GrantedAuthoritySid(ga);
123-
assertThat("johndoe".equals(principalSid.getPrincipal())).isTrue();
123+
assertThat("johndoe").isEqualTo(principalSid.getPrincipal());
124124
assertThat("scott".equals(principalSid.getPrincipal())).isFalse();
125-
assertThat("ROLE_TEST".equals(gaSid.getGrantedAuthority())).isTrue();
125+
assertThat("ROLE_TEST").isEqualTo(gaSid.getGrantedAuthority());
126126
assertThat("ROLE_TEST2".equals(gaSid.getGrantedAuthority())).isFalse();
127127
}
128128

‎aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ public void postFilterIsApplied() {
143143
SecurityContextHolder.getContext().setAuthentication(this.anne);
144144
List<String> objects = this.prePostSecured.postFilterMethod();
145145
assertThat(objects).hasSize(2);
146-
assertThat(objects.contains("apple")).isTrue();
147-
assertThat(objects.contains("aubergine")).isTrue();
146+
assertThat(objects).contains("apple");
147+
assertThat(objects).contains("aubergine");
148148
}
149149

150150
private void configureForElAnnotations() {

‎config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void userServiceReturnsExpectedData() {
8787

8888
Set<String> authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities());
8989
assertThat(authorities).hasSize(3);
90-
assertThat(authorities.contains("ROLE_DEVELOPERS")).isTrue();
90+
assertThat(authorities).contains("ROLE_DEVELOPERS");
9191
}
9292

9393
@Test
@@ -128,7 +128,7 @@ public void differentGroupRoleAttributeWorksAsExpected() {
128128

129129
Set<String> authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities());
130130
assertThat(authorities).hasSize(3);
131-
assertThat(authorities.contains("ROLE_DEVELOPER")).isTrue();
131+
assertThat(authorities).contains("ROLE_DEVELOPER");
132132

133133
}
134134

‎config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurerTests.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
package org.springframework.security.config.annotation.authentication.configurers.provisioning;
1818

1919
import java.util.Arrays;
20+
import java.util.Optional;
2021

2122
import org.junit.jupiter.api.BeforeEach;
2223
import org.junit.jupiter.api.Test;
2324

2425
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
26+
import org.springframework.security.core.GrantedAuthority;
2527
import org.springframework.security.core.authority.SimpleGrantedAuthority;
2628
import org.springframework.security.core.userdetails.UserDetails;
2729
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
@@ -73,7 +75,7 @@ public void authoritiesWithGrantedAuthorityWorks() {
7375
.authorities(authority)
7476
.build();
7577
// @formatter:on
76-
assertThat(userDetails.getAuthorities().stream().findFirst().get()).isEqualTo(authority);
78+
assertThat((Optional<GrantedAuthority>) userDetails.getAuthorities().stream().findFirst()).contains(authority);
7779
}
7880

7981
@Test
@@ -99,7 +101,7 @@ public void authoritiesWithAListOfGrantedAuthorityWorks() {
99101
.authorities(Arrays.asList(authority))
100102
.build();
101103
// @formatter:on
102-
assertThat(userDetails.getAuthorities().stream().findFirst().get()).isEqualTo(authority);
104+
assertThat((Optional<GrantedAuthority>) userDetails.getAuthorities().stream().findFirst()).contains(authority);
103105
}
104106

105107
private UserDetailsManagerConfigurer<AuthenticationManagerBuilder, InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder>> configurer() {

‎config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryNoMvcTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ public void setUp() {
4747
public void requestMatchersWhenPatternAndMvcNotPresentThenReturnAntPathRequestMatcherType() {
4848
List<RequestMatcher> requestMatchers = this.matcherRegistry.requestMatchers("/path");
4949
assertThat(requestMatchers).isNotEmpty();
50-
assertThat(requestMatchers.size()).isEqualTo(1);
50+
assertThat(requestMatchers).hasSize(1);
5151
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class);
5252
}
5353

5454
@Test
5555
public void requestMatchersWhenHttpMethodAndPatternAndMvcNotPresentThenReturnAntPathRequestMatcherType() {
5656
List<RequestMatcher> requestMatchers = this.matcherRegistry.requestMatchers(HttpMethod.GET, "/path");
5757
assertThat(requestMatchers).isNotEmpty();
58-
assertThat(requestMatchers.size()).isEqualTo(1);
58+
assertThat(requestMatchers).hasSize(1);
5959
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class);
6060
}
6161

6262
@Test
6363
public void requestMatchersWhenHttpMethodAndMvcNotPresentThenReturnAntPathMatcherType() {
6464
List<RequestMatcher> requestMatchers = this.matcherRegistry.requestMatchers(HttpMethod.GET);
6565
assertThat(requestMatchers).isNotEmpty();
66-
assertThat(requestMatchers.size()).isEqualTo(1);
66+
assertThat(requestMatchers).hasSize(1);
6767
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class);
6868
}
6969

‎config/src/test/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistryTests.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void regexMatchersWhenHttpMethodAndPatternParamsThenReturnRegexRequestMat
7575
List<RequestMatcher> requestMatchers = this.matcherRegistry
7676
.requestMatchers(new RegexRequestMatcher("/a.*", HttpMethod.GET.name()));
7777
assertThat(requestMatchers).isNotEmpty();
78-
assertThat(requestMatchers.size()).isEqualTo(1);
78+
assertThat(requestMatchers).hasSize(1);
7979
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(RegexRequestMatcher.class);
8080
}
8181

@@ -84,7 +84,7 @@ public void regexMatchersWhenPatternParamThenReturnRegexRequestMatcherType() {
8484
List<RequestMatcher> requestMatchers = this.matcherRegistry
8585
.requestMatchers(new RegexRequestMatcher("/a.*", null));
8686
assertThat(requestMatchers).isNotEmpty();
87-
assertThat(requestMatchers.size()).isEqualTo(1);
87+
assertThat(requestMatchers).hasSize(1);
8888
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(RegexRequestMatcher.class);
8989
}
9090

@@ -93,15 +93,15 @@ public void antMatchersWhenHttpMethodAndPatternParamsThenReturnAntPathRequestMat
9393
List<RequestMatcher> requestMatchers = this.matcherRegistry
9494
.requestMatchers(new AntPathRequestMatcher("/a.*", HttpMethod.GET.name()));
9595
assertThat(requestMatchers).isNotEmpty();
96-
assertThat(requestMatchers.size()).isEqualTo(1);
96+
assertThat(requestMatchers).hasSize(1);
9797
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class);
9898
}
9999

100100
@Test
101101
public void antMatchersWhenPatternParamThenReturnAntPathRequestMatcherType() {
102102
List<RequestMatcher> requestMatchers = this.matcherRegistry.requestMatchers(new AntPathRequestMatcher("/a.*"));
103103
assertThat(requestMatchers).isNotEmpty();
104-
assertThat(requestMatchers.size()).isEqualTo(1);
104+
assertThat(requestMatchers).hasSize(1);
105105
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(AntPathRequestMatcher.class);
106106
}
107107

@@ -110,39 +110,39 @@ public void dispatcherTypeMatchersWhenHttpMethodAndPatternParamsThenReturnAntPat
110110
List<RequestMatcher> requestMatchers = this.matcherRegistry.dispatcherTypeMatchers(HttpMethod.GET,
111111
DispatcherType.ASYNC);
112112
assertThat(requestMatchers).isNotEmpty();
113-
assertThat(requestMatchers.size()).isEqualTo(1);
113+
assertThat(requestMatchers).hasSize(1);
114114
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(DispatcherTypeRequestMatcher.class);
115115
}
116116

117117
@Test
118118
public void dispatcherMatchersWhenPatternParamThenReturnAntPathRequestMatcherType() {
119119
List<RequestMatcher> requestMatchers = this.matcherRegistry.dispatcherTypeMatchers(DispatcherType.INCLUDE);
120120
assertThat(requestMatchers).isNotEmpty();
121-
assertThat(requestMatchers.size()).isEqualTo(1);
121+
assertThat(requestMatchers).hasSize(1);
122122
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(DispatcherTypeRequestMatcher.class);
123123
}
124124

125125
@Test
126126
public void requestMatchersWhenPatternAndMvcPresentThenReturnMvcRequestMatcherType() {
127127
List<RequestMatcher> requestMatchers = this.matcherRegistry.requestMatchers("/path");
128128
assertThat(requestMatchers).isNotEmpty();
129-
assertThat(requestMatchers.size()).isEqualTo(1);
129+
assertThat(requestMatchers).hasSize(1);
130130
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(MvcRequestMatcher.class);
131131
}
132132

133133
@Test
134134
public void requestMatchersWhenHttpMethodAndPatternAndMvcPresentThenReturnMvcRequestMatcherType() {
135135
List<RequestMatcher> requestMatchers = this.matcherRegistry.requestMatchers(HttpMethod.GET, "/path");
136136
assertThat(requestMatchers).isNotEmpty();
137-
assertThat(requestMatchers.size()).isEqualTo(1);
137+
assertThat(requestMatchers).hasSize(1);
138138
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(MvcRequestMatcher.class);
139139
}
140140

141141
@Test
142142
public void requestMatchersWhenHttpMethodAndMvcPresentThenReturnMvcRequestMatcherType() {
143143
List<RequestMatcher> requestMatchers = this.matcherRegistry.requestMatchers(HttpMethod.GET);
144144
assertThat(requestMatchers).isNotEmpty();
145-
assertThat(requestMatchers.size()).isEqualTo(1);
145+
assertThat(requestMatchers).hasSize(1);
146146
assertThat(requestMatchers.get(0)).isExactlyInstanceOf(MvcRequestMatcher.class);
147147
}
148148

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ public void nullWebInvocationPrivilegeEvaluator() {
8484
this.spring.register(NullWebInvocationPrivilegeEvaluatorConfig.class, UserDetailsServiceConfig.class);
8585
List<SecurityFilterChain> filterChains = this.spring.getContext().getBean(FilterChainProxy.class)
8686
.getFilterChains();
87-
assertThat(filterChains.size()).isEqualTo(1);
87+
assertThat(filterChains).hasSize(1);
8888
DefaultSecurityFilterChain filterChain = (DefaultSecurityFilterChain) filterChains.get(0);
8989
assertThat(filterChain.getRequestMatcher()).isInstanceOf(AnyRequestMatcher.class);
90-
assertThat(filterChain.getFilters().size()).isEqualTo(1);
90+
assertThat(filterChain.getFilters()).hasSize(1);
9191
long filter = filterChain.getFilters().stream()
9292
.filter((it) -> it instanceof UsernamePasswordAuthenticationFilter).count();
9393
assertThat(filter).isEqualTo(1);
@@ -98,23 +98,23 @@ public void filterChainProxyBuilderIgnoringResources() {
9898
this.spring.register(FilterChainProxyBuilderIgnoringConfig.class, UserDetailsServiceConfig.class);
9999
List<SecurityFilterChain> filterChains = this.spring.getContext().getBean(FilterChainProxy.class)
100100
.getFilterChains();
101-
assertThat(filterChains.size()).isEqualTo(2);
101+
assertThat(filterChains).hasSize(2);
102102
DefaultSecurityFilterChain firstFilter = (DefaultSecurityFilterChain) filterChains.get(0);
103103
DefaultSecurityFilterChain secondFilter = (DefaultSecurityFilterChain) filterChains.get(1);
104104
assertThat(firstFilter.getFilters().isEmpty()).isEqualTo(true);
105105
assertThat(secondFilter.getRequestMatcher()).isInstanceOf(AnyRequestMatcher.class);
106-
List<? extends Class<? extends Filter>> classes = secondFilter.getFilters().stream().map(Filter::getClass)
106+
List<Class<? extends Filter>> classes = secondFilter.getFilters().stream().map(Filter::getClass)
107107
.collect(Collectors.toList());
108-
assertThat(classes.contains(WebAsyncManagerIntegrationFilter.class)).isTrue();
109-
assertThat(classes.contains(SecurityContextHolderFilter.class)).isTrue();
110-
assertThat(classes.contains(HeaderWriterFilter.class)).isTrue();
111-
assertThat(classes.contains(LogoutFilter.class)).isTrue();
112-
assertThat(classes.contains(CsrfFilter.class)).isTrue();
113-
assertThat(classes.contains(RequestCacheAwareFilter.class)).isTrue();
114-
assertThat(classes.contains(SecurityContextHolderAwareRequestFilter.class)).isTrue();
115-
assertThat(classes.contains(AnonymousAuthenticationFilter.class)).isTrue();
116-
assertThat(classes.contains(ExceptionTranslationFilter.class)).isTrue();
117-
assertThat(classes.contains(FilterSecurityInterceptor.class)).isTrue();
108+
assertThat(classes).contains(WebAsyncManagerIntegrationFilter.class);
109+
assertThat(classes).contains(SecurityContextHolderFilter.class);
110+
assertThat(classes).contains(HeaderWriterFilter.class);
111+
assertThat(classes).contains(LogoutFilter.class);
112+
assertThat(classes).contains(CsrfFilter.class);
113+
assertThat(classes).contains(RequestCacheAwareFilter.class);
114+
assertThat(classes).contains(SecurityContextHolderAwareRequestFilter.class);
115+
assertThat(classes).contains(AnonymousAuthenticationFilter.class);
116+
assertThat(classes).contains(ExceptionTranslationFilter.class);
117+
assertThat(classes).contains(FilterSecurityInterceptor.class);
118118
}
119119

120120
@Test

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import jakarta.servlet.http.HttpServletResponse;
2828
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
2929
import org.junit.jupiter.api.AfterEach;
30-
import org.junit.jupiter.api.Assertions;
3130
import org.junit.jupiter.api.BeforeAll;
3231
import org.junit.jupiter.api.BeforeEach;
3332
import org.junit.jupiter.api.Test;
@@ -401,7 +400,7 @@ private void performSaml2Login(String expected) throws IOException, ServletExcep
401400
// assertions
402401
Authentication authentication = this.securityContextRepository
403402
.loadContext(new HttpRequestResponseHolder(this.request, this.response)).getAuthentication();
404-
Assertions.assertNotNull(authentication, "Expected a valid authentication object.");
403+
assertThat(authentication).as("Expected a valid authentication object.").isNotNull();
405404
assertThat(authentication.getAuthorities()).hasSize(1);
406405
assertThat(authentication.getAuthorities()).first().isInstanceOf(SimpleGrantedAuthority.class)
407406
.hasToString(expected);

‎config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ public void inboundChannelSecurityDefinedByBean() {
286286
private void assertHandshake(HttpServletRequest request) {
287287
TestHandshakeHandler handshakeHandler = this.context.getBean(TestHandshakeHandler.class);
288288
assertThatCsrfToken(handshakeHandler.attributes.get(CsrfToken.class.getName())).isEqualTo(this.token);
289-
assertThat(handshakeHandler.attributes.get(this.sessionAttr))
290-
.isEqualTo(request.getSession().getAttribute(this.sessionAttr));
289+
assertThat(handshakeHandler.attributes).containsEntry(this.sessionAttr,
290+
request.getSession().getAttribute(this.sessionAttr));
291291
}
292292

293293
private HttpRequestHandler handler(HttpServletRequest request) throws Exception {

0 commit comments

Comments
 (0)