From 27ac046d8a534dc691e86f43d94192f50cd54254 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 5 Aug 2020 17:24:50 -0700 Subject: [PATCH] Rename *Test.java -> *Tests.java Rename a few test classes that accidentally ended in `Test` instead of `Tests`. Issue gh-8945 --- .../{AclClassIdUtilsTest.java => AclClassIdUtilsTests.java} | 2 +- ....java => LdapAuthenticationProviderConfigurerTests.java} | 2 +- ...nTest.java => ServerHttpSecurityConfigurationTests.java} | 2 +- ...anTest.java => UserDetailsResourceFactoryBeanTests.java} | 2 +- .../security/config/http/FormLoginConfigTests.java | 6 +++--- .../{WebConfigUtilsTest.java => WebConfigUtilsTests.java} | 2 +- ...ssorTest.java => MessageSecurityPostProcessorTests.java} | 2 +- .../security/config/http/FormLoginConfigTests-UsingSpel.xml | 6 +++--- ...RsaKeyConvertersTest.java => RsaKeyConvertersTests.java} | 2 +- ...a => BouncyCastleAesBytesEncryptorEquivalencyTests.java} | 2 +- ...torTest.java => BouncyCastleAesBytesEncryptorTests.java} | 2 +- ...dMessageMatcherTest.java => AndMessageMatcherTests.java} | 2 +- ...OrMessageMatcherTest.java => OrMessageMatcherTests.java} | 2 +- ...RegistrationsTest.java => ClientRegistrationsTests.java} | 2 +- ...AuthorizationCodeAuthenticationTokenConverterTests.java} | 2 +- ...java => MapOAuth2AccessTokenResponseConverterTests.java} | 2 +- ...java => OAuth2AccessTokenResponseMapConverterTests.java} | 2 +- ...adExchangeMatcherReactiveAuthorizationManagerTests.java} | 2 +- ...etadataFilterTest.java => Saml2MetadataFilterTests.java} | 2 +- .../debug/{DebugFilterTest.java => DebugFilterTests.java} | 2 +- ...ReactivePreAuthenticatedAuthenticationManagerTests.java} | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) rename acl/src/test/java/org/springframework/security/acls/jdbc/{AclClassIdUtilsTest.java => AclClassIdUtilsTests.java} (99%) rename config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/{LdapAuthenticationProviderConfigurerTest.java => LdapAuthenticationProviderConfigurerTests.java} (96%) rename config/src/test/java/org/springframework/security/config/annotation/web/reactive/{ServerHttpSecurityConfigurationTest.java => ServerHttpSecurityConfigurationTests.java} (97%) rename config/src/test/java/org/springframework/security/config/core/userdetails/{UserDetailsResourceFactoryBeanTest.java => UserDetailsResourceFactoryBeanTests.java} (98%) rename config/src/test/java/org/springframework/security/config/http/{WebConfigUtilsTest.java => WebConfigUtilsTests.java} (97%) rename config/src/test/java/org/springframework/security/config/websocket/{MessageSecurityPostProcessorTest.java => MessageSecurityPostProcessorTests.java} (96%) rename core/src/test/java/org/springframework/security/converter/{RsaKeyConvertersTest.java => RsaKeyConvertersTests.java} (99%) rename crypto/src/test/java/org/springframework/security/crypto/encrypt/{BouncyCastleAesBytesEncryptorEquivalencyTest.java => BouncyCastleAesBytesEncryptorEquivalencyTests.java} (98%) rename crypto/src/test/java/org/springframework/security/crypto/encrypt/{BouncyCastleAesBytesEncryptorTest.java => BouncyCastleAesBytesEncryptorTests.java} (98%) rename messaging/src/test/java/org/springframework/security/messaging/util/matcher/{AndMessageMatcherTest.java => AndMessageMatcherTests.java} (98%) rename messaging/src/test/java/org/springframework/security/messaging/util/matcher/{OrMessageMatcherTest.java => OrMessageMatcherTests.java} (98%) rename oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/{ClientRegistrationsTest.java => ClientRegistrationsTests.java} (99%) rename oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/{ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTest.java => ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTests.java} (99%) rename oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/{MapOAuth2AccessTokenResponseConverterTest.java => MapOAuth2AccessTokenResponseConverterTests.java} (98%) rename oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/{OAuth2AccessTokenResponseMapConverterTest.java => OAuth2AccessTokenResponseMapConverterTests.java} (98%) rename rsocket/src/test/java/org/springframework/security/rsocket/authorization/{PayloadExchangeMatcherReactiveAuthorizationManagerTest.java => PayloadExchangeMatcherReactiveAuthorizationManagerTests.java} (99%) rename saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/{Saml2MetadataFilterTest.java => Saml2MetadataFilterTests.java} (99%) rename web/src/test/java/org/springframework/security/web/debug/{DebugFilterTest.java => DebugFilterTests.java} (99%) rename web/src/test/java/org/springframework/security/web/server/authentication/{ReactivePreAuthenticatedAuthenticationManagerTest.java => ReactivePreAuthenticatedAuthenticationManagerTests.java} (98%) diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTest.java b/acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTests.java similarity index 99% rename from acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTest.java rename to acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTests.java index 5dd2e36f31..d41341c466 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTest.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTests.java @@ -37,7 +37,7 @@ import static org.mockito.BDDMockito.given; * @author paulwheeler */ @RunWith(MockitoJUnitRunner.class) -public class AclClassIdUtilsTest { +public class AclClassIdUtilsTests { private static final Long DEFAULT_IDENTIFIER = 999L; private static final BigInteger BIGINT_IDENTIFIER = new BigInteger("999"); diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTest.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTests.java similarity index 96% rename from config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTest.java rename to config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTests.java index f3f33a91d9..b8b98509e6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTest.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTests.java @@ -24,7 +24,7 @@ import org.springframework.security.core.authority.mapping.SimpleAuthorityMapper import static org.assertj.core.api.Assertions.assertThat; -public class LdapAuthenticationProviderConfigurerTest { +public class LdapAuthenticationProviderConfigurerTests { private LdapAuthenticationProviderConfigurer configurer; diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationTest.java b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationTests.java similarity index 97% rename from config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationTest.java rename to config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationTests.java index 31c07cc2e0..c7ae2e2d78 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationTest.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Eleftheria Stein */ -public class ServerHttpSecurityConfigurationTest { +public class ServerHttpSecurityConfigurationTests { @Rule public final SpringTestRule spring = new SpringTestRule(); diff --git a/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTest.java b/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTests.java similarity index 98% rename from config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTest.java rename to config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTests.java index 8b53fc0e34..6317995e78 100644 --- a/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTest.java +++ b/config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; * @since 5.0 */ @RunWith(MockitoJUnitRunner.class) -public class UserDetailsResourceFactoryBeanTest { +public class UserDetailsResourceFactoryBeanTests { @Mock ResourceLoader resourceLoader; diff --git a/config/src/test/java/org/springframework/security/config/http/FormLoginConfigTests.java b/config/src/test/java/org/springframework/security/config/http/FormLoginConfigTests.java index 1fd9c265e2..56bbe0b062 100644 --- a/config/src/test/java/org/springframework/security/config/http/FormLoginConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/FormLoginConfigTests.java @@ -95,16 +95,16 @@ public class FormLoginConfigTests { .param("username", "user") .param("password", "password") .with(csrf())) - .andExpect(redirectedUrl(WebConfigUtilsTest.URL + "/default")); + .andExpect(redirectedUrl(WebConfigUtilsTests.URL + "/default")); this.mvc.perform(post("/login") .param("username", "user") .param("password", "wrong") .with(csrf())) - .andExpect(redirectedUrl(WebConfigUtilsTest.URL + "/failure")); + .andExpect(redirectedUrl(WebConfigUtilsTests.URL + "/failure")); this.mvc.perform(get("/")) - .andExpect(redirectedUrl("http://localhost" + WebConfigUtilsTest.URL + "/login")); + .andExpect(redirectedUrl("http://localhost" + WebConfigUtilsTests.URL + "/login")); } @Test diff --git a/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTest.java b/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java similarity index 97% rename from config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTest.java rename to config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java index 0eb0023f65..532fea1706 100644 --- a/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTest.java +++ b/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.xml.ParserContext; @RunWith(PowerMockRunner.class) @PrepareOnlyThisForTest(ParserContext.class) -public class WebConfigUtilsTest { +public class WebConfigUtilsTests { public final static String URL = "/url"; @Mock diff --git a/config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTest.java b/config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTests.java similarity index 96% rename from config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTest.java rename to config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTests.java index e05ee31365..cf8a615684 100644 --- a/config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTest.java +++ b/config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTests.java @@ -20,7 +20,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry; -public class MessageSecurityPostProcessorTest { +public class MessageSecurityPostProcessorTests { private WebSocketMessageBrokerSecurityBeanDefinitionParser.MessageSecurityPostProcessor postProcessor = new WebSocketMessageBrokerSecurityBeanDefinitionParser.MessageSecurityPostProcessor("id", false); diff --git a/config/src/test/resources/org/springframework/security/config/http/FormLoginConfigTests-UsingSpel.xml b/config/src/test/resources/org/springframework/security/config/http/FormLoginConfigTests-UsingSpel.xml index 7cc3784f25..8146964536 100644 --- a/config/src/test/resources/org/springframework/security/config/http/FormLoginConfigTests-UsingSpel.xml +++ b/config/src/test/resources/org/springframework/security/config/http/FormLoginConfigTests-UsingSpel.xml @@ -27,9 +27,9 @@ + default-target-url="#{T(org.springframework.security.config.http.WebConfigUtilsTests).URL}/default" + authentication-failure-url="#{T(org.springframework.security.config.http.WebConfigUtilsTests).URL}/failure" + login-page="#{T(org.springframework.security.config.http.WebConfigUtilsTests).URL}/login"/> diff --git a/core/src/test/java/org/springframework/security/converter/RsaKeyConvertersTest.java b/core/src/test/java/org/springframework/security/converter/RsaKeyConvertersTests.java similarity index 99% rename from core/src/test/java/org/springframework/security/converter/RsaKeyConvertersTest.java rename to core/src/test/java/org/springframework/security/converter/RsaKeyConvertersTests.java index f1ba277e12..90a4450149 100644 --- a/core/src/test/java/org/springframework/security/converter/RsaKeyConvertersTest.java +++ b/core/src/test/java/org/springframework/security/converter/RsaKeyConvertersTests.java @@ -32,7 +32,7 @@ import org.springframework.core.convert.converter.Converter; /** * Tests for {@link RsaKeyConverters} */ -public class RsaKeyConvertersTest { +public class RsaKeyConvertersTests { private static final String PKCS8_PRIVATE_KEY = "-----BEGIN PRIVATE KEY-----\n" + "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCMk7CKSTfu3QoV\n" + "HoPVXxwZO+qweztd36cVWYqGOZinrOR2crWFu50AgR2CsdIH0+cqo7F4Vx7/3O8i\n" + diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTest.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java similarity index 98% rename from crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTest.java rename to crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java index 548b3791af..d4c5c73e72 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTest.java +++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java @@ -27,7 +27,7 @@ import org.springframework.security.crypto.encrypt.AesBytesEncryptor.CipherAlgor import org.springframework.security.crypto.keygen.BytesKeyGenerator; import org.springframework.security.crypto.keygen.KeyGenerators; -public class BouncyCastleAesBytesEncryptorEquivalencyTest { +public class BouncyCastleAesBytesEncryptorEquivalencyTests { private byte[] testData; private String password; diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTest.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java similarity index 98% rename from crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTest.java rename to crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java index 3efe507387..f4bd049c33 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTest.java +++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.springframework.security.crypto.codec.Hex; import org.springframework.security.crypto.keygen.KeyGenerators; -public class BouncyCastleAesBytesEncryptorTest { +public class BouncyCastleAesBytesEncryptorTests { private byte[] testData; private String password; diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java similarity index 98% rename from messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java rename to messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java index a765f18e77..f0d3777729 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java @@ -29,7 +29,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.messaging.Message; @RunWith(MockitoJUnitRunner.class) -public class AndMessageMatcherTest { +public class AndMessageMatcherTests { @Mock private MessageMatcher delegate; diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java similarity index 98% rename from messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java rename to messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java index 0e132cffe5..8f4843ab43 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java @@ -29,7 +29,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.messaging.Message; @RunWith(MockitoJUnitRunner.class) -public class OrMessageMatcherTest { +public class OrMessageMatcherTests { @Mock private MessageMatcher delegate; diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationsTest.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationsTests.java similarity index 99% rename from oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationsTest.java rename to oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationsTests.java index 03677717b1..2f3a239738 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationsTest.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationsTests.java @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; * @author Rafiullah Hamedy * @since 5.1 */ -public class ClientRegistrationsTest { +public class ClientRegistrationsTests { /** * Contains all optional parameters that are found in ClientRegistration diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTest.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTests.java similarity index 99% rename from oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTest.java rename to oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTests.java index 9f921392d8..feb4ab5d7c 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTest.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTests.java @@ -47,7 +47,7 @@ import static org.mockito.Mockito.when; * @since 5.1 */ @RunWith(MockitoJUnitRunner.class) -public class ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTest { +public class ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTests { @Mock private ReactiveClientRegistrationRepository clientRegistrationRepository; diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTest.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTests.java similarity index 98% rename from oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTest.java rename to oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTests.java index 56dd03f83f..6af7ed499d 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTest.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTests.java @@ -32,7 +32,7 @@ import org.springframework.security.oauth2.core.OAuth2RefreshToken; * * @author Nikita Konev */ -public class MapOAuth2AccessTokenResponseConverterTest { +public class MapOAuth2AccessTokenResponseConverterTests { private MapOAuth2AccessTokenResponseConverter messageConverter; diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTest.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTests.java similarity index 98% rename from oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTest.java rename to oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTests.java index cdeb3dd73d..980155b6c9 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTest.java +++ b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTests.java @@ -31,7 +31,7 @@ import org.springframework.security.oauth2.core.OAuth2AccessToken; * * @author Nikita Konev */ -public class OAuth2AccessTokenResponseMapConverterTest { +public class OAuth2AccessTokenResponseMapConverterTests { private OAuth2AccessTokenResponseMapConverter messageConverter; diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java b/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTests.java similarity index 99% rename from rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java rename to rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTests.java index 03a614b792..2a0fceafe3 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTests.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; * @author Rob Winch */ @RunWith(MockitoJUnitRunner.class) -public class PayloadExchangeMatcherReactiveAuthorizationManagerTest { +public class PayloadExchangeMatcherReactiveAuthorizationManagerTests { @Mock private ReactiveAuthorizationManager authz; diff --git a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTest.java b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java similarity index 99% rename from saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTest.java rename to saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java index 4c490bd284..658afcbd96 100644 --- a/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTest.java +++ b/saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java @@ -39,7 +39,7 @@ import static org.springframework.security.saml2.provider.service.registration.T /** * Tests for {@link Saml2MetadataFilter} */ -public class Saml2MetadataFilterTest { +public class Saml2MetadataFilterTests { RelyingPartyRegistrationRepository repository; Saml2MetadataResolver resolver; diff --git a/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java b/web/src/test/java/org/springframework/security/web/debug/DebugFilterTests.java similarity index 99% rename from web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java rename to web/src/test/java/org/springframework/security/web/debug/DebugFilterTests.java index 7570448e5e..728630334f 100644 --- a/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java +++ b/web/src/test/java/org/springframework/security/web/debug/DebugFilterTests.java @@ -48,7 +48,7 @@ import org.springframework.test.util.ReflectionTestUtils; */ @RunWith(PowerMockRunner.class) @PrepareOnlyThisForTest(Logger.class) -public class DebugFilterTest { +public class DebugFilterTests { @Captor private ArgumentCaptor requestCaptor; @Captor diff --git a/web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTest.java b/web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTests.java similarity index 98% rename from web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTest.java rename to web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTests.java index 16925d7b9e..9dacbd93a6 100644 --- a/web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTest.java +++ b/web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTests.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.when; * @author Alexey Nesterov * @since 5.2 */ -public class ReactivePreAuthenticatedAuthenticationManagerTest { +public class ReactivePreAuthenticatedAuthenticationManagerTests { private ReactiveUserDetailsService mockUserDetailsService = mock(ReactiveUserDetailsService.class);