Skip to content

Commit a7da949

Browse files
marcusdacoregiomarcusdacoregio
committed
Use assertj assertions
1 parent 382cfd6 commit a7da949

File tree

9 files changed

+99
-102
lines changed

9 files changed

+99
-102
lines changed

‎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
@@ -29,7 +29,6 @@
2929
import javax.servlet.http.HttpServletResponse;
3030

3131
import org.junit.jupiter.api.AfterEach;
32-
import org.junit.jupiter.api.Assertions;
3332
import org.junit.jupiter.api.BeforeEach;
3433
import org.junit.jupiter.api.Test;
3534
import org.junit.jupiter.api.extension.ExtendWith;
@@ -461,7 +460,7 @@ private void performSaml2Login(String expected) throws IOException, ServletExcep
461460
Authentication authentication = this.securityContextRepository
462461
.loadContext(new HttpRequestResponseHolder(this.request, this.response))
463462
.getAuthentication();
464-
Assertions.assertNotNull(authentication, "Expected a valid authentication object.");
463+
assertThat(authentication).as("Expected a valid authentication object.").isNotNull();
465464
assertThat(authentication.getAuthorities()).hasSize(1);
466465
assertThat(authentication.getAuthorities()).first()
467466
.isInstanceOf(SimpleGrantedAuthority.class)

‎core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.security.access.intercept;
1818

19-
import org.junit.jupiter.api.Assertions;
2019
import org.junit.jupiter.api.Test;
2120

2221
import org.springframework.security.authentication.BadCredentialsException;
@@ -50,7 +49,7 @@ public void testAuthenticationSuccess() {
5049
RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
5150
provider.setKey("my_password");
5251
Authentication result = provider.authenticate(token);
53-
Assertions.assertTrue(result instanceof RunAsUserToken, "Should have returned RunAsUserToken");
52+
assertThat(result instanceof RunAsUserToken).as("Should have returned RunAsUserToken").isTrue();
5453
RunAsUserToken resultCast = (RunAsUserToken) result;
5554
assertThat(resultCast.getKeyHash()).isEqualTo("my_password".hashCode());
5655
}

‎crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Random;
2121
import java.util.UUID;
2222

23-
import org.junit.jupiter.api.Assertions;
2423
import org.junit.jupiter.api.BeforeEach;
2524
import org.junit.jupiter.api.Test;
2625

@@ -29,6 +28,8 @@
2928
import org.springframework.security.crypto.keygen.BytesKeyGenerator;
3029
import org.springframework.security.crypto.keygen.KeyGenerators;
3130

31+
import static org.assertj.core.api.Assertions.assertThat;
32+
3233
public class BouncyCastleAesBytesEncryptorEquivalencyTests {
3334

3435
private byte[] testData;
@@ -96,11 +97,11 @@ private void testEquivalence(BytesEncryptor left, BytesEncryptor right) {
9697
// and can decrypt back to the original input
9798
byte[] leftEncrypted = left.encrypt(this.testData);
9899
byte[] rightEncrypted = right.encrypt(this.testData);
99-
Assertions.assertArrayEquals(leftEncrypted, rightEncrypted);
100+
assertThat(rightEncrypted).containsExactly(leftEncrypted);
100101
byte[] leftDecrypted = left.decrypt(leftEncrypted);
101102
byte[] rightDecrypted = right.decrypt(rightEncrypted);
102-
Assertions.assertArrayEquals(this.testData, leftDecrypted);
103-
Assertions.assertArrayEquals(this.testData, rightDecrypted);
103+
assertThat(leftDecrypted).containsExactly(this.testData);
104+
assertThat(rightDecrypted).containsExactly(this.testData);
104105
}
105106
}
106107

@@ -114,8 +115,8 @@ private void testCompatibility(BytesEncryptor left, BytesEncryptor right) {
114115
byte[] rightEncrypted = right.encrypt(this.testData);
115116
byte[] leftDecrypted = left.decrypt(rightEncrypted);
116117
byte[] rightDecrypted = right.decrypt(leftEncrypted);
117-
Assertions.assertArrayEquals(this.testData, leftDecrypted);
118-
Assertions.assertArrayEquals(this.testData, rightDecrypted);
118+
assertThat(leftDecrypted).containsExactly(this.testData);
119+
assertThat(rightDecrypted).containsExactly(this.testData);
119120
}
120121
}
121122

‎crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
import java.util.UUID;
2121

2222
import org.bouncycastle.util.Arrays;
23-
import org.junit.jupiter.api.Assertions;
2423
import org.junit.jupiter.api.BeforeEach;
2524
import org.junit.jupiter.api.Test;
2625

2726
import org.springframework.security.crypto.codec.Hex;
2827
import org.springframework.security.crypto.keygen.KeyGenerators;
2928

29+
import static org.assertj.core.api.Assertions.assertThat;
3030
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
3131

3232
public class BouncyCastleAesBytesEncryptorTests {
@@ -64,11 +64,11 @@ public void bcGcmWithSecureIvGeneratesDifferentMessages() {
6464
private void generatesDifferentCipherTexts(BytesEncryptor bcEncryptor) {
6565
byte[] encrypted1 = bcEncryptor.encrypt(this.testData);
6666
byte[] encrypted2 = bcEncryptor.encrypt(this.testData);
67-
Assertions.assertFalse(Arrays.areEqual(encrypted1, encrypted2));
67+
assertThat(Arrays.areEqual(encrypted1, encrypted2)).isFalse();
6868
byte[] decrypted1 = bcEncryptor.decrypt(encrypted1);
6969
byte[] decrypted2 = bcEncryptor.decrypt(encrypted2);
70-
Assertions.assertArrayEquals(this.testData, decrypted1);
71-
Assertions.assertArrayEquals(this.testData, decrypted2);
70+
assertThat(decrypted1).containsExactly(this.testData);
71+
assertThat(decrypted2).containsExactly(this.testData);
7272
}
7373

7474
@Test

‎oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultMapOAuth2AccessTokenResponseConverterTests.java

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222
import java.util.Map;
2323
import java.util.Set;
2424

25-
import org.junit.jupiter.api.Assertions;
2625
import org.junit.jupiter.api.BeforeEach;
2726
import org.junit.jupiter.api.Test;
2827

2928
import org.springframework.core.convert.converter.Converter;
3029
import org.springframework.security.oauth2.core.OAuth2AccessToken;
3130
import org.springframework.security.oauth2.core.OAuth2RefreshToken;
3231

32+
import static org.assertj.core.api.Assertions.assertThat;
33+
3334
/**
3435
* Tests for {@link DefaultMapOAuth2AccessTokenResponseConverter}.
3536
*
@@ -56,24 +57,24 @@ public void shouldConvertFull() {
5657
map.put("custom_parameter_2", "custom-value-2");
5758
OAuth2AccessTokenResponse converted = this.messageConverter.convert(map);
5859
OAuth2AccessToken accessToken = converted.getAccessToken();
59-
Assertions.assertNotNull(accessToken);
60-
Assertions.assertEquals("access-token-1234", accessToken.getTokenValue());
61-
Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType());
60+
assertThat(accessToken).isNotNull();
61+
assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234");
62+
assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER);
6263
Set<String> scopes = accessToken.getScopes();
63-
Assertions.assertNotNull(scopes);
64-
Assertions.assertEquals(2, scopes.size());
65-
Assertions.assertTrue(scopes.contains("read"));
66-
Assertions.assertTrue(scopes.contains("write"));
67-
Assertions.assertEquals(3600,
68-
Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds());
64+
assertThat(scopes).isNotNull();
65+
assertThat(scopes.size()).isEqualTo(2);
66+
assertThat(scopes.contains("read")).isTrue();
67+
assertThat(scopes.contains("write")).isTrue();
68+
assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds())
69+
.isEqualTo(3600);
6970
OAuth2RefreshToken refreshToken = converted.getRefreshToken();
70-
Assertions.assertNotNull(refreshToken);
71-
Assertions.assertEquals("refresh-token-1234", refreshToken.getTokenValue());
71+
assertThat(refreshToken).isNotNull();
72+
assertThat(refreshToken.getTokenValue()).isEqualTo("refresh-token-1234");
7273
Map<String, Object> additionalParameters = converted.getAdditionalParameters();
73-
Assertions.assertNotNull(additionalParameters);
74-
Assertions.assertEquals(2, additionalParameters.size());
75-
Assertions.assertEquals("custom-value-1", additionalParameters.get("custom_parameter_1"));
76-
Assertions.assertEquals("custom-value-2", additionalParameters.get("custom_parameter_2"));
74+
assertThat(additionalParameters).isNotNull();
75+
assertThat(additionalParameters.size()).isEqualTo(2);
76+
assertThat(additionalParameters.get("custom_parameter_1")).isEqualTo("custom-value-1");
77+
assertThat(additionalParameters.get("custom_parameter_2")).isEqualTo("custom-value-2");
7778
}
7879

7980
@Test
@@ -83,19 +84,18 @@ public void shouldConvertMinimal() {
8384
map.put("token_type", "bearer");
8485
OAuth2AccessTokenResponse converted = this.messageConverter.convert(map);
8586
OAuth2AccessToken accessToken = converted.getAccessToken();
86-
Assertions.assertNotNull(accessToken);
87-
Assertions.assertEquals("access-token-1234", accessToken.getTokenValue());
88-
Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType());
87+
assertThat(accessToken).isNotNull();
88+
assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234");
89+
assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER);
8990
Set<String> scopes = accessToken.getScopes();
90-
Assertions.assertNotNull(scopes);
91-
Assertions.assertEquals(0, scopes.size());
92-
Assertions.assertEquals(1,
93-
Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds());
91+
assertThat(scopes).isNotNull();
92+
assertThat(scopes.size()).isEqualTo(0);
93+
assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()).isEqualTo(1);
9494
OAuth2RefreshToken refreshToken = converted.getRefreshToken();
95-
Assertions.assertNull(refreshToken);
95+
assertThat(refreshToken).isNull();
9696
Map<String, Object> additionalParameters = converted.getAdditionalParameters();
97-
Assertions.assertNotNull(additionalParameters);
98-
Assertions.assertEquals(0, additionalParameters.size());
97+
assertThat(additionalParameters).isNotNull();
98+
assertThat(additionalParameters.size()).isEqualTo(0);
9999
}
100100

101101
@Test
@@ -106,19 +106,18 @@ public void shouldConvertWithUnsupportedExpiresIn() {
106106
map.put("expires_in", "2100-01-01-abc");
107107
OAuth2AccessTokenResponse converted = this.messageConverter.convert(map);
108108
OAuth2AccessToken accessToken = converted.getAccessToken();
109-
Assertions.assertNotNull(accessToken);
110-
Assertions.assertEquals("access-token-1234", accessToken.getTokenValue());
111-
Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType());
109+
assertThat(accessToken).isNotNull();
110+
assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234");
111+
assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER);
112112
Set<String> scopes = accessToken.getScopes();
113-
Assertions.assertNotNull(scopes);
114-
Assertions.assertEquals(0, scopes.size());
115-
Assertions.assertEquals(1,
116-
Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds());
113+
assertThat(scopes).isNotNull();
114+
assertThat(scopes.size()).isEqualTo(0);
115+
assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds()).isEqualTo(1);
117116
OAuth2RefreshToken refreshToken = converted.getRefreshToken();
118-
Assertions.assertNull(refreshToken);
117+
assertThat(refreshToken).isNull();
119118
Map<String, Object> additionalParameters = converted.getAdditionalParameters();
120-
Assertions.assertNotNull(additionalParameters);
121-
Assertions.assertEquals(0, additionalParameters.size());
119+
assertThat(additionalParameters).isNotNull();
120+
assertThat(additionalParameters.size()).isEqualTo(0);
122121
}
123122

124123
// gh-9685
@@ -130,11 +129,11 @@ public void shouldConvertWithNumericExpiresIn() {
130129
map.put("expires_in", 3600);
131130
OAuth2AccessTokenResponse converted = this.messageConverter.convert(map);
132131
OAuth2AccessToken accessToken = converted.getAccessToken();
133-
Assertions.assertNotNull(accessToken);
134-
Assertions.assertEquals("access-token-1234", accessToken.getTokenValue());
135-
Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType());
136-
Assertions.assertEquals(3600,
137-
Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds());
132+
assertThat(accessToken).isNotNull();
133+
assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234");
134+
assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER);
135+
assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds())
136+
.isEqualTo(3600);
138137
}
139138

140139
// gh-9685
@@ -153,24 +152,24 @@ public void shouldConvertWithObjectAdditionalParameter() {
153152
map.put("custom_parameter_2", "custom-value-2");
154153
OAuth2AccessTokenResponse converted = this.messageConverter.convert(map);
155154
OAuth2AccessToken accessToken = converted.getAccessToken();
156-
Assertions.assertNotNull(accessToken);
157-
Assertions.assertEquals("access-token-1234", accessToken.getTokenValue());
158-
Assertions.assertEquals(OAuth2AccessToken.TokenType.BEARER, accessToken.getTokenType());
155+
assertThat(accessToken).isNotNull();
156+
assertThat(accessToken.getTokenValue()).isEqualTo("access-token-1234");
157+
assertThat(accessToken.getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER);
159158
Set<String> scopes = accessToken.getScopes();
160-
Assertions.assertNotNull(scopes);
161-
Assertions.assertEquals(2, scopes.size());
162-
Assertions.assertTrue(scopes.contains("read"));
163-
Assertions.assertTrue(scopes.contains("write"));
164-
Assertions.assertEquals(3600,
165-
Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds());
159+
assertThat(scopes).isNotNull();
160+
assertThat(scopes.size()).isEqualTo(2);
161+
assertThat(scopes.contains("read")).isTrue();
162+
assertThat(scopes.contains("write")).isTrue();
163+
assertThat(Duration.between(accessToken.getIssuedAt(), accessToken.getExpiresAt()).getSeconds())
164+
.isEqualTo(3600);
166165
OAuth2RefreshToken refreshToken = converted.getRefreshToken();
167-
Assertions.assertNotNull(refreshToken);
168-
Assertions.assertEquals("refresh-token-1234", refreshToken.getTokenValue());
166+
assertThat(refreshToken).isNotNull();
167+
assertThat(refreshToken.getTokenValue()).isEqualTo("refresh-token-1234");
169168
Map<String, Object> additionalParameters = converted.getAdditionalParameters();
170-
Assertions.assertNotNull(additionalParameters);
171-
Assertions.assertEquals(2, additionalParameters.size());
172-
Assertions.assertEquals(nestedObject, additionalParameters.get("custom_parameter_1"));
173-
Assertions.assertEquals("custom-value-2", additionalParameters.get("custom_parameter_2"));
169+
assertThat(additionalParameters).isNotNull();
170+
assertThat(additionalParameters.size()).isEqualTo(2);
171+
assertThat(additionalParameters.get("custom_parameter_1")).isEqualTo(nestedObject);
172+
assertThat(additionalParameters.get("custom_parameter_2")).isEqualTo("custom-value-2");
174173
}
175174

176175
}

‎oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/DefaultOAuth2AccessTokenResponseMapConverterTests.java

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
import java.util.Map;
2323
import java.util.Set;
2424

25-
import org.junit.jupiter.api.Assertions;
2625
import org.junit.jupiter.api.BeforeEach;
2726
import org.junit.jupiter.api.Test;
2827

2928
import org.springframework.core.convert.converter.Converter;
3029
import org.springframework.security.oauth2.core.OAuth2AccessToken;
3130

31+
import static org.assertj.core.api.Assertions.assertThat;
32+
3233
/**
3334
* Tests for {@link DefaultOAuth2AccessTokenResponseMapConverter}.
3435
*
@@ -61,14 +62,14 @@ public void shouldConvertFull() {
6162
.build();
6263
// @formatter:on
6364
Map<String, Object> result = this.messageConverter.convert(build);
64-
Assertions.assertEquals(7, result.size());
65-
Assertions.assertEquals("access-token-value-1234", result.get("access_token"));
66-
Assertions.assertEquals("refresh-token-value-1234", result.get("refresh_token"));
67-
Assertions.assertEquals("read write", result.get("scope"));
68-
Assertions.assertEquals("Bearer", result.get("token_type"));
69-
Assertions.assertNotNull(result.get("expires_in"));
70-
Assertions.assertEquals("custom-value-1", result.get("custom_parameter_1"));
71-
Assertions.assertEquals("custom-value-2", result.get("custom_parameter_2"));
65+
assertThat(result.size()).isEqualTo(7);
66+
assertThat(result.get("access_token")).isEqualTo("access-token-value-1234");
67+
assertThat(result.get("refresh_token")).isEqualTo("refresh-token-value-1234");
68+
assertThat(result.get("scope")).isEqualTo("read write");
69+
assertThat(result.get("token_type")).isEqualTo("Bearer");
70+
assertThat(result.get("expires_in")).isNotNull();
71+
assertThat(result.get("custom_parameter_1")).isEqualTo("custom-value-1");
72+
assertThat(result.get("custom_parameter_2")).isEqualTo("custom-value-2");
7273
}
7374

7475
@Test
@@ -79,10 +80,10 @@ public void shouldConvertMinimal() {
7980
.build();
8081
// @formatter:on
8182
Map<String, Object> result = this.messageConverter.convert(build);
82-
Assertions.assertEquals(3, result.size());
83-
Assertions.assertEquals("access-token-value-1234", result.get("access_token"));
84-
Assertions.assertEquals("Bearer", result.get("token_type"));
85-
Assertions.assertNotNull(result.get("expires_in"));
83+
assertThat(result.size()).isEqualTo(3);
84+
assertThat(result.get("access_token")).isEqualTo("access-token-value-1234");
85+
assertThat(result.get("token_type")).isEqualTo("Bearer");
86+
assertThat(result.get("expires_in")).isNotNull();
8687
}
8788

8889
// gh-9685
@@ -107,14 +108,14 @@ public void shouldConvertWithObjectAdditionalParameter() {
107108
.build();
108109
// @formatter:on
109110
Map<String, Object> result = this.messageConverter.convert(build);
110-
Assertions.assertEquals(7, result.size());
111-
Assertions.assertEquals("access-token-value-1234", result.get("access_token"));
112-
Assertions.assertEquals("refresh-token-value-1234", result.get("refresh_token"));
113-
Assertions.assertEquals("read write", result.get("scope"));
114-
Assertions.assertEquals("Bearer", result.get("token_type"));
115-
Assertions.assertNotNull(result.get("expires_in"));
116-
Assertions.assertEquals(nestedObject, result.get("custom_parameter_1"));
117-
Assertions.assertEquals("custom-value-2", result.get("custom_parameter_2"));
111+
assertThat(result.size()).isEqualTo(7);
112+
assertThat(result.get("access_token")).isEqualTo("access-token-value-1234");
113+
assertThat(result.get("refresh_token")).isEqualTo("refresh-token-value-1234");
114+
assertThat(result.get("scope")).isEqualTo("read write");
115+
assertThat(result.get("token_type")).isEqualTo("Bearer");
116+
assertThat(result.get("expires_in")).isNotNull();
117+
assertThat(result.get("custom_parameter_1")).isEqualTo(nestedObject);
118+
assertThat(result.get("custom_parameter_2")).isEqualTo("custom-value-2");
118119
}
119120

120121
}

‎saml2/saml2-service-provider/src/opensaml3Test/java/org/springframework/security/saml2/provider/service/authentication/OpenSamlAuthenticationRequestFactoryTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
2020
import java.nio.charset.StandardCharsets;
2121

2222
import org.joda.time.DateTime;
23-
import org.junit.jupiter.api.Assertions;
2423
import org.junit.jupiter.api.BeforeEach;
2524
import org.junit.jupiter.api.Test;
2625
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
@@ -190,14 +189,14 @@ public void createPostAuthenticationRequestWhenSignRequestThenCredentialIsRequir
190189
@Test
191190
public void createAuthenticationRequestWhenDefaultThenReturnsPostBinding() {
192191
AuthnRequest authn = getAuthNRequest(Saml2MessageBinding.POST);
193-
Assertions.assertEquals(SAMLConstants.SAML2_POST_BINDING_URI, authn.getProtocolBinding());
192+
assertThat(SAMLConstants.SAML2_POST_BINDING_URI).isEqualTo(authn.getProtocolBinding());
194193
}
195194

196195
@Test
197196
public void createAuthenticationRequestWhenSetUriThenReturnsCorrectBinding() {
198197
this.factory.setProtocolBinding(SAMLConstants.SAML2_REDIRECT_BINDING_URI);
199198
AuthnRequest authn = getAuthNRequest(Saml2MessageBinding.POST);
200-
Assertions.assertEquals(SAMLConstants.SAML2_REDIRECT_BINDING_URI, authn.getProtocolBinding());
199+
assertThat(SAMLConstants.SAML2_REDIRECT_BINDING_URI).isEqualTo(authn.getProtocolBinding());
201200
}
202201

203202
@Test

0 commit comments

Comments
 (0)