Update WebAuthn Test Objects Class Names

vasanth-79 · jzheaux · commit 04d71309759a · 2025-04-03T12:55:50.000-06:00
Renamed the WebAuthn test object class names Closes gh-16604 Signed-off-by: Vasanth <76898064+vasanth-79@users.noreply.github.com>
diff --git a/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java b/config/src/test/java/org/springframework/security/SpringSecurityCoreVersionSerializableTests.java
@@ -239,9 +239,9 @@
 import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
 import org.springframework.security.web.webauthn.api.TestAuthenticationAssertionResponses;
 import org.springframework.security.web.webauthn.api.TestBytes;
-import org.springframework.security.web.webauthn.api.TestPublicKeyCredential;
+import org.springframework.security.web.webauthn.api.TestPublicKeyCredentials;
 import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialRequestOptions;
-import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
+import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
 import org.springframework.security.web.webauthn.api.UserVerificationRequirement;
 import org.springframework.security.web.webauthn.authentication.WebAuthnAuthentication;
 import org.springframework.security.web.webauthn.authentication.WebAuthnAuthenticationRequestToken;
@@ -640,7 +640,7 @@ class SpringSecurityCoreVersionSerializableTests {
 		AuthenticationExtensionsClientOutputs outputs = new ImmutableAuthenticationExtensionsClientOutputs(credentialOutput);
 		AuthenticatorAssertionResponse response = TestAuthenticationAssertionResponses.createAuthenticatorAssertionResponse()
 				.build();
-		PublicKeyCredential<AuthenticatorAssertionResponse> credential = TestPublicKeyCredential.createPublicKeyCredential(
+		PublicKeyCredential<AuthenticatorAssertionResponse> credential = TestPublicKeyCredentials.createPublicKeyCredential(
 				response, outputs)
 				.build();
 		RelyingPartyAuthenticationRequest authRequest = new RelyingPartyAuthenticationRequest(
@@ -658,9 +658,9 @@ class SpringSecurityCoreVersionSerializableTests {
 		generatorByClassName.put(AuthenticatorAttachment.class, (r) -> AuthenticatorAttachment.PLATFORM);
 		// @formatter:on
 		generatorByClassName.put(ImmutablePublicKeyCredentialUserEntity.class,
-				(r) -> TestPublicKeyCredentialUserEntity.userEntity().id(TestBytes.get()).build());
+				(r) -> TestPublicKeyCredentialUserEntities.userEntity().id(TestBytes.get()).build());
 		generatorByClassName.put(WebAuthnAuthentication.class, (r) -> {
-			PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity()
+			PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity()
 				.id(TestBytes.get())
 				.build();
 			List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/api/TestAuthenticatorAttestationResponses.java b/web/src/test/java/org/springframework/security/web/webauthn/api/TestAuthenticatorAttestationResponses.java
@@ -16,7 +16,7 @@
 
 package org.springframework.security.web.webauthn.api;
 
-public final class TestAuthenticatorAttestationResponse {
+public final class TestAuthenticatorAttestationResponses {
 
 	public static AuthenticatorAttestationResponse.AuthenticatorAttestationResponseBuilder createAuthenticatorAttestationResponse() {
 		return AuthenticatorAttestationResponse.builder()
@@ -27,7 +27,7 @@ public static AuthenticatorAttestationResponse.AuthenticatorAttestationResponseB
 			.transports(AuthenticatorTransport.HYBRID, AuthenticatorTransport.INTERNAL);
 	}
 
-	private TestAuthenticatorAttestationResponse() {
+	private TestAuthenticatorAttestationResponses() {
 	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/api/TestCredentialRecords.java b/web/src/test/java/org/springframework/security/web/webauthn/api/TestCredentialRecords.java
@@ -19,7 +19,7 @@
 import java.time.Instant;
 import java.util.Set;
 
-public final class TestCredentialRecord {
+public final class TestCredentialRecords {
 
 	public static ImmutableCredentialRecord.ImmutableCredentialRecordBuilder userCredential() {
 		return ImmutableCredentialRecord.builder()
@@ -50,7 +50,7 @@ public static ImmutableCredentialRecord.ImmutableCredentialRecordBuilder fullUse
 			.backupState(true);
 	}
 
-	private TestCredentialRecord() {
+	private TestCredentialRecords() {
 	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/api/TestPublicKeyCredentialUserEntities.java b/web/src/test/java/org/springframework/security/web/webauthn/api/TestPublicKeyCredentialUserEntities.java
@@ -18,13 +18,13 @@
 
 import org.springframework.security.web.webauthn.api.ImmutablePublicKeyCredentialUserEntity.PublicKeyCredentialUserEntityBuilder;
 
-public final class TestPublicKeyCredentialUserEntity {
+public final class TestPublicKeyCredentialUserEntities {
 
 	public static PublicKeyCredentialUserEntityBuilder userEntity() {
 		return ImmutablePublicKeyCredentialUserEntity.builder().name("user").id(TestBytes.get()).displayName("user");
 	}
 
-	private TestPublicKeyCredentialUserEntity() {
+	private TestPublicKeyCredentialUserEntities() {
 	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/api/TestPublicKeyCredentials.java b/web/src/test/java/org/springframework/security/web/webauthn/api/TestPublicKeyCredentials.java
@@ -16,10 +16,10 @@
 
 package org.springframework.security.web.webauthn.api;
 
-public final class TestPublicKeyCredential {
+public final class TestPublicKeyCredentials {
 
 	public static PublicKeyCredential.PublicKeyCredentialBuilder<AuthenticatorAttestationResponse> createPublicKeyCredential() {
-		AuthenticatorAttestationResponse response = TestAuthenticatorAttestationResponse
+		AuthenticatorAttestationResponse response = TestAuthenticatorAttestationResponses
 			.createAuthenticatorAttestationResponse()
 			.build();
 		return createPublicKeyCredential(response);
@@ -49,7 +49,7 @@ public static <R extends AuthenticatorResponse> PublicKeyCredential.PublicKeyCre
 			.clientExtensionResults(outputs);
 	}
 
-	private TestPublicKeyCredential() {
+	private TestPublicKeyCredentials() {
 	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationFilterTests.java
@@ -39,7 +39,7 @@
 import org.springframework.security.web.webauthn.api.PublicKeyCredentialRequestOptions;
 import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
 import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialRequestOptions;
-import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
+import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
 import org.springframework.security.web.webauthn.management.RelyingPartyAuthenticationRequest;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -153,7 +153,7 @@ void doFilterWhenOptionsNullThenUnAuthorized() throws Exception {
 	void doFilterWhenValidThenOk() throws Exception {
 		PublicKeyCredentialRequestOptions options = TestPublicKeyCredentialRequestOptions.create().build();
 		given(this.requestOptionsRepository.load(any())).willReturn(options);
-		PublicKeyCredentialUserEntity principal = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity principal = TestPublicKeyCredentialUserEntities.userEntity().build();
 		WebAuthnAuthentication authentication = new WebAuthnAuthentication(principal,
 				AuthorityUtils.createAuthorityList("ROLE_USER"));
 		given(this.authenticationManager.authenticate(any())).willReturn(authentication);
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationTests.java b/web/src/test/java/org/springframework/security/web/webauthn/authentication/WebAuthnAuthenticationTests.java
@@ -23,7 +23,7 @@
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
-import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
+import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -32,23 +32,23 @@ class WebAuthnAuthenticationTests {
 
 	@Test
 	void isAuthenticatedThenTrue() {
-		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
 		List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
 		WebAuthnAuthentication authentication = new WebAuthnAuthentication(userEntity, authorities);
 		assertThat(authentication.isAuthenticated()).isTrue();
 	}
 
 	@Test
 	void setAuthenticationWhenTrueThenException() {
-		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
 		List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
 		WebAuthnAuthentication authentication = new WebAuthnAuthentication(userEntity, authorities);
 		assertThatIllegalArgumentException().isThrownBy(() -> authentication.setAuthenticated(true));
 	}
 
 	@Test
 	void setAuthenticationWhenFalseThenNotAuthenticated() {
-		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
 		List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
 		WebAuthnAuthentication authentication = new WebAuthnAuthentication(userEntity, authorities);
 		authentication.setAuthenticated(false);
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/management/JdbcPublicKeyCredentialUserEntityRepositoryTests.java b/web/src/test/java/org/springframework/security/web/webauthn/management/JdbcPublicKeyCredentialUserEntityRepositoryTests.java
@@ -28,7 +28,7 @@
 import org.springframework.security.web.webauthn.api.Bytes;
 import org.springframework.security.web.webauthn.api.ImmutablePublicKeyCredentialUserEntity;
 import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
-import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
+import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -107,7 +107,7 @@ void findByUserNameWheUserNameIsNullThenThrowIllegalArgumentException() {
 
 	@Test
 	void saveUserEntityWhenSaveThenReturnsSaved() {
-		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
 
 		this.repository.save(userEntity);
 
@@ -120,7 +120,7 @@ void saveUserEntityWhenSaveThenReturnsSaved() {
 
 	@Test
 	void saveUserEntityWhenUserEntityExistsThenUpdates() {
-		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
 		this.repository.save(userEntity);
 
 		this.repository.save(testUserEntity(userEntity.getId()));
@@ -134,7 +134,7 @@ void saveUserEntityWhenUserEntityExistsThenUpdates() {
 
 	@Test
 	void findUserEntityByUserNameWhenUserEntityExistsThenReturnsSaved() {
-		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
 		this.repository.save(userEntity);
 
 		PublicKeyCredentialUserEntity savedUserEntity = this.repository.findByUsername(userEntity.getName());
@@ -144,7 +144,7 @@ void findUserEntityByUserNameWhenUserEntityExistsThenReturnsSaved() {
 
 	@Test
 	void deleteUserEntityWhenRecordExistThenSuccess() {
-		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
 		this.repository.save(userEntity);
 
 		this.repository.delete(userEntity.getId());
@@ -155,15 +155,15 @@ void deleteUserEntityWhenRecordExistThenSuccess() {
 
 	@Test
 	void findUserEntityByIdWhenUserEntityDoesNotExistThenReturnsNull() {
-		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
 
 		PublicKeyCredentialUserEntity savedUserEntity = this.repository.findById(userEntity.getId());
 		assertThat(savedUserEntity).isNull();
 	}
 
 	@Test
 	void findUserEntityByUserNameWhenUserEntityDoesNotExistThenReturnsEmpty() {
-		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity().build();
+		PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity().build();
 
 		PublicKeyCredentialUserEntity savedUserEntity = this.repository.findByUsername(userEntity.getName());
 		assertThat(savedUserEntity).isNull();
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/management/JdbcUserCredentialRepositoryTests.java b/web/src/test/java/org/springframework/security/web/webauthn/management/JdbcUserCredentialRepositoryTests.java
@@ -31,7 +31,7 @@
 import org.springframework.security.web.webauthn.api.CredentialRecord;
 import org.springframework.security.web.webauthn.api.ImmutableCredentialRecord;
 import org.springframework.security.web.webauthn.api.PublicKeyCredentialType;
-import org.springframework.security.web.webauthn.api.TestCredentialRecord;
+import org.springframework.security.web.webauthn.api.TestCredentialRecords;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -110,7 +110,7 @@ void findByCredentialIdWheUserIdIsNullThenThrowIllegalArgumentException() {
 
 	@Test
 	void saveCredentialRecordWhenSaveThenReturnsSaved() {
-		CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
+		CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
 		this.jdbcUserCredentialRepository.save(userCredential);
 
 		CredentialRecord savedUserCredential = this.jdbcUserCredentialRepository
@@ -136,7 +136,7 @@ void saveCredentialRecordWhenSaveThenReturnsSaved() {
 
 	@Test
 	void saveCredentialRecordWhenRecordExistsThenReturnsUpdated() {
-		CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
+		CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
 		this.jdbcUserCredentialRepository.save(userCredential);
 		// @formatter:off
 		CredentialRecord updatedRecord = ImmutableCredentialRecord.fromCredentialRecord(userCredential)
@@ -157,7 +157,7 @@ void saveCredentialRecordWhenRecordExistsThenReturnsUpdated() {
 
 	@Test
 	void findCredentialRecordByUserIdWhenRecordExistsThenReturnsSaved() {
-		CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
+		CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
 		this.jdbcUserCredentialRepository.save(userCredential);
 
 		List<CredentialRecord> credentialRecords = this.jdbcUserCredentialRepository
@@ -169,7 +169,7 @@ void findCredentialRecordByUserIdWhenRecordExistsThenReturnsSaved() {
 
 	@Test
 	void findCredentialRecordByUserIdWhenRecordDoesNotExistThenReturnsEmpty() {
-		CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
+		CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
 
 		List<CredentialRecord> credentialRecords = this.jdbcUserCredentialRepository
 			.findByUserId(userCredential.getUserEntityUserId());
@@ -179,7 +179,7 @@ void findCredentialRecordByUserIdWhenRecordDoesNotExistThenReturnsEmpty() {
 
 	@Test
 	void findCredentialRecordByCredentialIdWhenRecordDoesNotExistThenReturnsNull() {
-		CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
+		CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
 
 		CredentialRecord credentialRecord = this.jdbcUserCredentialRepository
 			.findByCredentialId(userCredential.getCredentialId());
@@ -189,7 +189,7 @@ void findCredentialRecordByCredentialIdWhenRecordDoesNotExistThenReturnsNull() {
 
 	@Test
 	void deleteCredentialRecordWhenRecordExistThenSuccess() {
-		CredentialRecord userCredential = TestCredentialRecord.fullUserCredential().build();
+		CredentialRecord userCredential = TestCredentialRecords.fullUserCredential().build();
 		this.jdbcUserCredentialRepository.save(userCredential);
 
 		this.jdbcUserCredentialRepository.delete(userCredential.getCredentialId());
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/management/MapPublicKeyCredentialUserEntityRepositoryTests.java b/web/src/test/java/org/springframework/security/web/webauthn/management/MapPublicKeyCredentialUserEntityRepositoryTests.java
@@ -19,7 +19,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity;
-import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntity;
+import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
@@ -36,7 +36,7 @@ class MapPublicKeyCredentialUserEntityRepositoryTests {
 
 	private String username = "username";
 
-	private PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntity.userEntity()
+	private PublicKeyCredentialUserEntity userEntity = TestPublicKeyCredentialUserEntities.userEntity()
 		.name(this.username)
 		.build();
 
@@ -75,7 +75,7 @@ void saveWhenNonNullThenSuccess() {
 
 	@Test
 	void saveWhenUpdateThenUpdated() {
-		PublicKeyCredentialUserEntity newUserEntity = TestPublicKeyCredentialUserEntity.userEntity()
+		PublicKeyCredentialUserEntity newUserEntity = TestPublicKeyCredentialUserEntities.userEntity()
 			.name(this.userEntity.getName())
 			.displayName("Updated")
 			.build();
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/management/MapUserCredentialRepositoryTests.java b/web/src/test/java/org/springframework/security/web/webauthn/management/MapUserCredentialRepositoryTests.java
@@ -23,7 +23,7 @@
 import org.springframework.security.web.webauthn.api.CredentialRecord;
 import org.springframework.security.web.webauthn.api.ImmutableCredentialRecord;
 import org.springframework.security.web.webauthn.api.TestBytes;
-import org.springframework.security.web.webauthn.api.TestCredentialRecord;
+import org.springframework.security.web.webauthn.api.TestCredentialRecords;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -61,7 +61,7 @@ void findByCredentialIdWhenNotFoundThenIllegalArgumentException() {
 
 	@Test
 	void deleteWhenCredentialNotFoundThenNoException() {
-		ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
+		ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
 		assertThatNoException().isThrownBy(() -> this.userCredentials.delete(credentialRecord.getCredentialId()));
 	}
 
@@ -72,7 +72,7 @@ void deleteWhenNullIdThenIllegalArgumentException() {
 
 	@Test
 	void saveThenFound() {
-		ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
+		ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
 		this.userCredentials.save(credentialRecord);
 		assertThat(this.userCredentials.findByCredentialId(credentialRecord.getCredentialId()))
 			.isEqualTo(credentialRecord);
@@ -87,7 +87,7 @@ void saveWhenNullThenIllegalArgumentException() {
 
 	@Test
 	void saveAndDeleteThenNotFound() {
-		ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
+		ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
 		this.userCredentials.save(credentialRecord);
 		this.userCredentials.delete(credentialRecord.getCredentialId());
 		assertThat(this.userCredentials.findByCredentialId(credentialRecord.getCredentialId())).isNull();
@@ -96,7 +96,7 @@ void saveAndDeleteThenNotFound() {
 
 	@Test
 	void saveWhenUpdateThenUpdated() {
-		ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
+		ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
 		this.userCredentials.save(credentialRecord);
 		Instant updatedLastUsed = credentialRecord.getLastUsed().plusSeconds(120);
 		CredentialRecord updatedCredentialRecord = ImmutableCredentialRecord.fromCredentialRecord(credentialRecord)
@@ -111,7 +111,7 @@ void saveWhenUpdateThenUpdated() {
 
 	@Test
 	void saveWhenSameUserThenUpdated() {
-		ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
+		ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
 		this.userCredentials.save(credentialRecord);
 		CredentialRecord newCredentialRecord = ImmutableCredentialRecord.fromCredentialRecord(credentialRecord)
 			.credentialId(TestBytes.get())
@@ -127,7 +127,7 @@ void saveWhenSameUserThenUpdated() {
 
 	@Test
 	void saveWhenDifferentUserThenNewEntryAdded() {
-		ImmutableCredentialRecord credentialRecord = TestCredentialRecord.userCredential().build();
+		ImmutableCredentialRecord credentialRecord = TestCredentialRecords.userCredential().build();
 		this.userCredentials.save(credentialRecord);
 		CredentialRecord newCredentialRecord = ImmutableCredentialRecord.fromCredentialRecord(credentialRecord)
 			.userEntityUserId(TestBytes.get())
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/management/TestPublicKeyCredentialRpEntities.java b/web/src/test/java/org/springframework/security/web/webauthn/management/TestPublicKeyCredentialRpEntities.java
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/management/Webauthn4jRelyingPartyOperationsTests.java b/web/src/test/java/org/springframework/security/web/webauthn/management/Webauthn4jRelyingPartyOperationsTests.java
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/registration/DefaultWebAuthnRegistrationPageGeneratingFilterTests.java b/web/src/test/java/org/springframework/security/web/webauthn/registration/DefaultWebAuthnRegistrationPageGeneratingFilterTests.java
diff --git a/web/src/test/java/org/springframework/security/web/webauthn/registration/WebAuthnRegistrationFilterTests.java b/web/src/test/java/org/springframework/security/web/webauthn/registration/WebAuthnRegistrationFilterTests.java

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`package org.springframework.security.web.webauthn.api;`
`18`	`18`
`19`		`-public final class TestAuthenticatorAttestationResponse {`
	`19`	`+public final class TestAuthenticatorAttestationResponses {`
`20`	`20`
`21`	`21`	`public static AuthenticatorAttestationResponse.AuthenticatorAttestationResponseBuilder createAuthenticatorAttestationResponse() {`
`22`	`22`	`return AuthenticatorAttestationResponse.builder()`
`@@ -27,7 +27,7 @@ public static AuthenticatorAttestationResponse.AuthenticatorAttestationResponseB`
`27`	`27`	`.transports(AuthenticatorTransport.HYBRID, AuthenticatorTransport.INTERNAL);`
`28`	`28`	`}`
`29`	`29`
`30`		`- private TestAuthenticatorAttestationResponse() {`
	`30`	`+ private TestAuthenticatorAttestationResponses() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`import java.time.Instant;`
`20`	`20`	`import java.util.Set;`
`21`	`21`
`22`		`-public final class TestCredentialRecord {`
	`22`	`+public final class TestCredentialRecords {`
`23`	`23`
`24`	`24`	`public static ImmutableCredentialRecord.ImmutableCredentialRecordBuilder userCredential() {`
`25`	`25`	`return ImmutableCredentialRecord.builder()`
`@@ -50,7 +50,7 @@ public static ImmutableCredentialRecord.ImmutableCredentialRecordBuilder fullUse`
`50`	`50`	`.backupState(true);`
`51`	`51`	`}`
`52`	`52`
`53`		`- private TestCredentialRecord() {`
	`53`	`+ private TestCredentialRecords() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,13 @@`
`18`	`18`
`19`	`19`	`import org.springframework.security.web.webauthn.api.ImmutablePublicKeyCredentialUserEntity.PublicKeyCredentialUserEntityBuilder;`
`20`	`20`
`21`		`-public final class TestPublicKeyCredentialUserEntity {`
	`21`	`+public final class TestPublicKeyCredentialUserEntities {`
`22`	`22`
`23`	`23`	`public static PublicKeyCredentialUserEntityBuilder userEntity() {`
`24`	`24`	`return ImmutablePublicKeyCredentialUserEntity.builder().name("user").id(TestBytes.get()).displayName("user");`
`25`	`25`	`}`
`26`	`26`
`27`		`- private TestPublicKeyCredentialUserEntity() {`
	`27`	`+ private TestPublicKeyCredentialUserEntities() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@`
`16`	`16`
`17`	`17`	`package org.springframework.security.web.webauthn.api;`
`18`	`18`
`19`		`-public final class TestPublicKeyCredential {`
	`19`	`+public final class TestPublicKeyCredentials {`
`20`	`20`
`21`	`21`	`public static PublicKeyCredential.PublicKeyCredentialBuilder<AuthenticatorAttestationResponse> createPublicKeyCredential() {`
`22`		`- AuthenticatorAttestationResponse response = TestAuthenticatorAttestationResponse`
	`22`	`+ AuthenticatorAttestationResponse response = TestAuthenticatorAttestationResponses`
`23`	`23`	`.createAuthenticatorAttestationResponse()`
`24`	`24`	`.build();`
`25`	`25`	`return createPublicKeyCredential(response);`
`@@ -49,7 +49,7 @@ public static <R extends AuthenticatorResponse> PublicKeyCredential.PublicKeyCre`
`49`	`49`	`.clientExtensionResults(outputs);`
`50`	`50`	`}`
`51`	`51`
`52`		`- private TestPublicKeyCredential() {`
	`52`	`+ private TestPublicKeyCredentials() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`}`