Skip to content

Commit 9d97273

Browse files
author
chu3la
committed
Update WebAuthn Test Objects Class Names
1 parent 401e237 commit 9d97273

15 files changed

+82
-82
lines changed

‎config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@
239239
import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
240240
import org.springframework.security.web.webauthn.api.TestAuthenticationAssertionResponses;
241241
import org.springframework.security.web.webauthn.api.TestBytes;
242-
import org.springframework.security.web.webauthn.api.TestPublicKeyCredential;
242+
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentials;
243243
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialRequestOptions;
244-
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
244+
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
245245
import org.springframework.security.web.webauthn.api.UserVerificationRequirement;
246246
import org.springframework.security.web.webauthn.authentication.WebAuthnAuthentication;
247247
import org.springframework.security.web.webauthn.authentication.WebAuthnAuthenticationRequestToken;
@@ -640,7 +640,7 @@ class SpringSecurityCoreVersionSerializableTests {
640640
AuthenticationExtensionsClientOutputs outputs = new ImmutableAuthenticationExtensionsClientOutputs(credentialOutput);
641641
AuthenticatorAssertionResponse response = TestAuthenticationAssertionResponses.createAuthenticatorAssertionResponse()
642642
.build();
643-
PublicKeyCredential<AuthenticatorAssertionResponse> credential = TestPublicKeyCredential.createPublicKeyCredential(
643+
PublicKeyCredential<AuthenticatorAssertionResponse> credential = TestPublicKeyCredentials.createPublicKeyCredential(
644644
response, outputs)
645645
.build();
646646
RelyingPartyAuthenticationRequest authRequest = new RelyingPartyAuthenticationRequest(
@@ -658,9 +658,9 @@ class SpringSecurityCoreVersionSerializableTests {
658658
generatorByClassName.put(AuthenticatorAttachment.class, (r) -> AuthenticatorAttachment.PLATFORM);
659659
// @formatter:on
660660
generatorByClassName.put(ImmutablePublicKeyCredentialUserEntity.class,
661-
(r) -> TestPublicKeyCredentialUserEntity.userEntity().id(TestBytes.get()).build());
661+
(r) -> TestPublicKeyCredentialUserEntities.userEntity().id(TestBytes.get()).build());
662662
generatorByClassName.put(WebAuthnAuthentication.class, (r) -> {
663-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity()
663+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity()
664664
.id(TestBytes.get())
665665
.build();
666666
List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");

‎web/src/test/java/org/springframework/security/web/webauthn/api/TestAuthenticatorAttestationResponse.java‎ renamed to ‎web/src/test/java/org/springframework/security/web/webauthn/api/TestAuthenticatorAttestationResponses.java‎

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

1717
package org.springframework.security.web.webauthn.api;
1818

19-
public final class TestAuthenticatorAttestationResponse {
19+
public final class TestAuthenticatorAttestationResponses {
2020

2121
public static AuthenticatorAttestationResponse.AuthenticatorAttestationResponseBuilder createAuthenticatorAttestationResponse() {
2222
return AuthenticatorAttestationResponse.builder()
@@ -27,7 +27,7 @@ public static AuthenticatorAttestationResponse.AuthenticatorAttestationResponseB
2727
.transports(AuthenticatorTransport.HYBRID, AuthenticatorTransport.INTERNAL);
2828
}
2929

30-
private TestAuthenticatorAttestationResponse() {
30+
private TestAuthenticatorAttestationResponses() {
3131
}
3232

3333
}

‎web/src/test/java/org/springframework/security/web/webauthn/api/TestCredentialRecord.java‎ renamed to ‎web/src/test/java/org/springframework/security/web/webauthn/api/TestCredentialRecords.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.time.Instant;
2020
import java.util.Set;
2121

22-
public final class TestCredentialRecord {
22+
public final class TestCredentialRecords {
2323

2424
public static ImmutableCredentialRecord.ImmutableCredentialRecordBuilder userCredential() {
2525
return ImmutableCredentialRecord.builder()
@@ -50,7 +50,7 @@ public static ImmutableCredentialRecord.ImmutableCredentialRecordBuilder fullUse
5050
.backupState(true);
5151
}
5252

53-
private TestCredentialRecord() {
53+
private TestCredentialRecords() {
5454
}
5555

5656
}

‎web/src/test/java/org/springframework/security/web/webauthn/api/TestPublicKeyCredentialUserEntity.java‎ renamed to ‎web/src/test/java/org/springframework/security/web/webauthn/api/TestPublicKeyCredentialUserEntities.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818

1919
import org.springframework.security.web.webauthn.api.ImmutablePublicKeyCredentialUserEntity.PublicKeyCredentialUserEntityBuilder;
2020

21-
public final class TestPublicKeyCredentialUserEntity {
21+
public final class TestPublicKeyCredentialUserEntities {
2222

2323
public static PublicKeyCredentialUserEntityBuilder userEntity() {
2424
return ImmutablePublicKeyCredentialUserEntity.builder().name("user").id(TestBytes.get()).displayName("user");
2525
}
2626

27-
private TestPublicKeyCredentialUserEntity() {
27+
private TestPublicKeyCredentialUserEntities() {
2828
}
2929

3030
}

‎web/src/test/java/org/springframework/security/web/webauthn/api/TestPublicKeyCredential.java‎ renamed to ‎web/src/test/java/org/springframework/security/web/webauthn/api/TestPublicKeyCredentials.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package org.springframework.security.web.webauthn.api;
1818

19-
public final class TestPublicKeyCredential {
19+
public final class TestPublicKeyCredentials {
2020

2121
public static PublicKeyCredential.PublicKeyCredentialBuilder<AuthenticatorAttestationResponse> createPublicKeyCredential() {
22-
AuthenticatorAttestationResponse response = TestAuthenticatorAttestationResponse
22+
AuthenticatorAttestationResponse response = TestAuthenticatorAttestationResponses
2323
.createAuthenticatorAttestationResponse()
2424
.build();
2525
return createPublicKeyCredential(response);
@@ -49,7 +49,7 @@ public static <R extends AuthenticatorResponse> PublicKeyCredential.PublicKeyCre
4949
.clientExtensionResults(outputs);
5050
}
5151

52-
private TestPublicKeyCredential() {
52+
private TestPublicKeyCredentials() {
5353
}
5454

5555
}

‎web/src/test/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilterTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.springframework.security.web.webauthn.api.PublicKeyCredentialRequestOptions;
4040
import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
4141
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialRequestOptions;
42-
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
42+
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
4343
import org.springframework.security.web.webauthn.management.RelyingPartyAuthenticationRequest;
4444
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
4545

@@ -153,7 +153,7 @@ void doFilterWhenOptionsNullThenUnAuthorized() throws Exception {
153153
void doFilterWhenValidThenOk() throws Exception {
154154
PublicKeyCredentialRequestOptions options = TestPublicKeyCredentialRequestOptions.create().build();
155155
given(this.requestOptionsRepository.load(any())).willReturn(options);
156-
PublicKeyCredentialUserEntity principal = TestPublicKeyCredentialUserEntity.userEntity().build();
156+
PublicKeyCredentialUserEntity principal = TestPublicKeyCredentialUserEntities.userEntity().build();
157157
WebAuthnAuthentication authentication = new WebAuthnAuthentication(principal,
158158
AuthorityUtils.createAuthorityList("ROLE_USER"));
159159
given(this.authenticationManager.authenticate(any())).willReturn(authentication);

‎web/src/test/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.springframework.security.core.GrantedAuthority;
2424
import org.springframework.security.core.authority.AuthorityUtils;
2525
import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
26-
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
26+
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -32,23 +32,23 @@ class WebAuthnAuthenticationTests {
3232

3333
@Test
3434
void isAuthenticatedThenTrue() {
35-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
35+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
3636
List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
3737
WebAuthnAuthentication authentication = new WebAuthnAuthentication(userEntity, authorities);
3838
assertThat(authentication.isAuthenticated()).isTrue();
3939
}
4040

4141
@Test
4242
void setAuthenticationWhenTrueThenException() {
43-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
43+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
4444
List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
4545
WebAuthnAuthentication authentication = new WebAuthnAuthentication(userEntity, authorities);
4646
assertThatIllegalArgumentException().isThrownBy(() -> authentication.setAuthenticated(true));
4747
}
4848

4949
@Test
5050
void setAuthenticationWhenFalseThenNotAuthenticated() {
51-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
51+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
5252
List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
5353
WebAuthnAuthentication authentication = new WebAuthnAuthentication(userEntity, authorities);
5454
authentication.setAuthenticated(false);

‎web/src/test/java/org/springframework/security/web/webauthn/management/JdbcPublicKeyCredentialUserEntityRepositoryTests.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.springframework.security.web.webauthn.api.Bytes;
2929
import org.springframework.security.web.webauthn.api.ImmutablePublicKeyCredentialUserEntity;
3030
import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
31-
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
31+
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
3232

3333
import static org.assertj.core.api.Assertions.assertThat;
3434
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -107,7 +107,7 @@ void findByUserNameWheUserNameIsNullThenThrowIllegalArgumentException() {
107107

108108
@Test
109109
void saveUserEntityWhenSaveThenReturnsSaved() {
110-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
110+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
111111

112112
this.repository.save(userEntity);
113113

@@ -120,7 +120,7 @@ void saveUserEntityWhenSaveThenReturnsSaved() {
120120

121121
@Test
122122
void saveUserEntityWhenUserEntityExistsThenUpdates() {
123-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
123+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
124124
this.repository.save(userEntity);
125125

126126
this.repository.save(testUserEntity(userEntity.getId()));
@@ -134,7 +134,7 @@ void saveUserEntityWhenUserEntityExistsThenUpdates() {
134134

135135
@Test
136136
void findUserEntityByUserNameWhenUserEntityExistsThenReturnsSaved() {
137-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
137+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
138138
this.repository.save(userEntity);
139139

140140
PublicKeyCredentialUserEntity savedUserEntity = this.repository.findByUsername(userEntity.getName());
@@ -144,7 +144,7 @@ void findUserEntityByUserNameWhenUserEntityExistsThenReturnsSaved() {
144144

145145
@Test
146146
void deleteUserEntityWhenRecordExistThenSuccess() {
147-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
147+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
148148
this.repository.save(userEntity);
149149

150150
this.repository.delete(userEntity.getId());
@@ -155,15 +155,15 @@ void deleteUserEntityWhenRecordExistThenSuccess() {
155155

156156
@Test
157157
void findUserEntityByIdWhenUserEntityDoesNotExistThenReturnsNull() {
158-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
158+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
159159

160160
PublicKeyCredentialUserEntity savedUserEntity = this.repository.findById(userEntity.getId());
161161
assertThat(savedUserEntity).isNull();
162162
}
163163

164164
@Test
165165
void findUserEntityByUserNameWhenUserEntityDoesNotExistThenReturnsEmpty() {
166-
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
166+
PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
167167

168168
PublicKeyCredentialUserEntity savedUserEntity = this.repository.findByUsername(userEntity.getName());
169169
assertThat(savedUserEntity).isNull();

‎web/src/test/java/org/springframework/security/web/webauthn/management/JdbcUserCredentialRepositoryTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.security.web.webauthn.api.AuthenticatorTransport;
3131
import org.springframework.security.web.webauthn.api.CredentialRecord;
3232
import org.springframework.security.web.webauthn.api.PublicKeyCredentialType;
33-
import org.springframework.security.web.webauthn.api.TestCredentialRecord;
33+
import org.springframework.security.web.webauthn.api.TestCredentialRecords;
3434

3535
import static org.assertj.core.api.Assertions.assertThat;
3636
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -109,7 +109,7 @@ void findByCredentialIdWheUserIdIsNullThenThrowIllegalArgumentException() {
109109

110110
@Test
111111
void saveCredentialRecordWhenSaveThenReturnsSaved() {
112-
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
112+
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
113113
this.jdbcUserCredentialRepository.save(userCredential);
114114

115115
CredentialRecord savedUserCredential = this.jdbcUserCredentialRepository
@@ -135,7 +135,7 @@ void saveCredentialRecordWhenSaveThenReturnsSaved() {
135135

136136
@Test
137137
void findCredentialRecordByUserIdWhenRecordExistsThenReturnsSaved() {
138-
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
138+
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
139139
this.jdbcUserCredentialRepository.save(userCredential);
140140

141141
List<CredentialRecord> credentialRecords = this.jdbcUserCredentialRepository
@@ -147,7 +147,7 @@ void findCredentialRecordByUserIdWhenRecordExistsThenReturnsSaved() {
147147

148148
@Test
149149
void findCredentialRecordByUserIdWhenRecordDoesNotExistThenReturnsEmpty() {
150-
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
150+
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
151151

152152
List<CredentialRecord> credentialRecords = this.jdbcUserCredentialRepository
153153
.findByUserId(userCredential.getUserEntityUserId());
@@ -157,7 +157,7 @@ void findCredentialRecordByUserIdWhenRecordDoesNotExistThenReturnsEmpty() {
157157

158158
@Test
159159
void findCredentialRecordByCredentialIdWhenRecordDoesNotExistThenReturnsNull() {
160-
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
160+
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
161161

162162
CredentialRecord credentialRecord = this.jdbcUserCredentialRepository
163163
.findByCredentialId(userCredential.getCredentialId());
@@ -167,7 +167,7 @@ void findCredentialRecordByCredentialIdWhenRecordDoesNotExistThenReturnsNull() {
167167

168168
@Test
169169
void deleteCredentialRecordWhenRecordExistThenSuccess() {
170-
CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
170+
CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
171171
this.jdbcUserCredentialRepository.save(userCredential);
172172

173173
this.jdbcUserCredentialRepository.delete(userCredential.getCredentialId());

‎web/src/test/java/org/springframework/security/web/webauthn/management/MapPublicKeyCredentialUserEntityRepositoryTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.junit.jupiter.api.Test;
2020

2121
import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
22-
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
22+
import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
2323

2424
import static org.assertj.core.api.Assertions.assertThat;
2525
import static org.assertj.core.api.Assertions.assertThatNoException;
@@ -36,7 +36,7 @@ class MapPublicKeyCredentialUserEntityRepositoryTests {
3636

3737
private String username = "username";
3838

39-
private PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity()
39+
private PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity()
4040
.name(this.username)
4141
.build();
4242

@@ -75,7 +75,7 @@ void saveWhenNonNullThenSuccess() {
7575

7676
@Test
7777
void saveWhenUpdateThenUpdated() {
78-
PublicKeyCredentialUserEntity newUserEntity = TestPublicKeyCredentialUserEntity.userEntity()
78+
PublicKeyCredentialUserEntity newUserEntity = TestPublicKeyCredentialUserEntities.userEntity()
7979
.name(this.userEntity.getName())
8080
.displayName("Updated")
8181
.build();

0 commit comments

Comments
 (0)