2
0
Эх сурвалжийг харах

Rename *Test.java -> *Tests.java

Rename a few test classes that accidentally ended in `Test` instead of
`Tests`.

Issue gh-8945
Phillip Webb 5 жил өмнө
parent
commit
27ac046d8a
21 өөрчлөгдсөн 25 нэмэгдсэн , 25 устгасан
  1. 1 1
      acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTests.java
  2. 1 1
      config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTests.java
  3. 1 1
      config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationTests.java
  4. 1 1
      config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTests.java
  5. 3 3
      config/src/test/java/org/springframework/security/config/http/FormLoginConfigTests.java
  6. 1 1
      config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTests.java
  7. 1 1
      config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTests.java
  8. 3 3
      config/src/test/resources/org/springframework/security/config/http/FormLoginConfigTests-UsingSpel.xml
  9. 1 1
      core/src/test/java/org/springframework/security/converter/RsaKeyConvertersTests.java
  10. 1 1
      crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java
  11. 1 1
      crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTests.java
  12. 1 1
      messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTests.java
  13. 1 1
      messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTests.java
  14. 1 1
      oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationsTests.java
  15. 1 1
      oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTests.java
  16. 1 1
      oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTests.java
  17. 1 1
      oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTests.java
  18. 1 1
      rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTests.java
  19. 1 1
      saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTests.java
  20. 1 1
      web/src/test/java/org/springframework/security/web/debug/DebugFilterTests.java
  21. 1 1
      web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTests.java

+ 1 - 1
acl/src/test/java/org/springframework/security/acls/jdbc/AclClassIdUtilsTest.java → 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");

+ 1 - 1
config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTest.java → 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<AuthenticationManagerBuilder> configurer;
 

+ 1 - 1
config/src/test/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfigurationTest.java → 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();
 

+ 1 - 1
config/src/test/java/org/springframework/security/config/core/userdetails/UserDetailsResourceFactoryBeanTest.java → 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;
 

+ 3 - 3
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

+ 1 - 1
config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTest.java → 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

+ 1 - 1
config/src/test/java/org/springframework/security/config/websocket/MessageSecurityPostProcessorTest.java → 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);

+ 3 - 3
config/src/test/resources/org/springframework/security/config/http/FormLoginConfigTests-UsingSpel.xml

@@ -27,9 +27,9 @@
 	<http auto-config="true" use-expressions="false">
 		<intercept-url pattern="/**" access="ROLE_USER"/>
 		<form-login
-				default-target-url="#{T(org.springframework.security.config.http.WebConfigUtilsTest).URL}/default"
-				authentication-failure-url="#{T(org.springframework.security.config.http.WebConfigUtilsTest).URL}/failure"
-				login-page="#{T(org.springframework.security.config.http.WebConfigUtilsTest).URL}/login"/>
+				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"/>
 	</http>
 
 	<b:import resource="userservice.xml"/>

+ 1 - 1
core/src/test/java/org/springframework/security/converter/RsaKeyConvertersTest.java → 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" +

+ 1 - 1
crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTest.java → 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;

+ 1 - 1
crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorTest.java → 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;

+ 1 - 1
messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java → 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<Object> delegate;
 

+ 1 - 1
messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java → 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<Object> delegate;
 

+ 1 - 1
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/registration/ClientRegistrationsTest.java → 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

+ 1 - 1
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/ServerOAuth2AuthorizationCodeAuthenticationTokenConverterTest.java → 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;
 

+ 1 - 1
oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverterTest.java → 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;
 

+ 1 - 1
oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTest.java → 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;
 

+ 1 - 1
rsocket/src/test/java/org/springframework/security/rsocket/authorization/PayloadExchangeMatcherReactiveAuthorizationManagerTest.java → 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<PayloadExchangeAuthorizationContext> authz;

+ 1 - 1
saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/web/Saml2MetadataFilterTest.java → 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;

+ 1 - 1
web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java → 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<HttpServletRequest> requestCaptor;
 	@Captor

+ 1 - 1
web/src/test/java/org/springframework/security/web/server/authentication/ReactivePreAuthenticatedAuthenticationManagerTest.java → 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);