Rename Test* to *Tests

(Consistent with other Spring projects)

Fixes gh-153

pom.xml

@@ -324,6 +324,16 @@
               <version>1.0</version>
             </dependency>
           </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <skip>${skipTests}</skip>
+            <includes>
+              <include>**/*Tests.java</include>
+            </includes>
+          </configuration>  
         </plugin>
 	  </plugins>
     </pluginManagement>

samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/TestAdminEndpoints.java → samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/AdminEndpointsTests.java

@@ -27,7 +27,7 @@
 /**
  * @author Dave Syer
  */
-public class TestAdminEndpoints {
+public class AdminEndpointsTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();
@@ -128,7 +128,7 @@ public ResourceOwnerReadOnly(Object target) {
 			setScope(Arrays.asList("read"));
 			setUsername("marissa");
 			setPassword("koala");
-			TestAdminEndpoints test = (TestAdminEndpoints) target;
+			AdminEndpointsTests test = (AdminEndpointsTests) target;
 			setAccessTokenUri(test.serverRunning.getUrl("/sparklr2/oauth/token"));
 		}
 	}
@@ -138,7 +138,7 @@ public ClientCredentialsReadOnly(Object target) {
 			setClientId("my-client-with-registered-redirect");
 			setId(getClientId());
 			setScope(Arrays.asList("read"));
-			TestAdminEndpoints test = (TestAdminEndpoints) target;
+			AdminEndpointsTests test = (AdminEndpointsTests) target;
 			setAccessTokenUri(test.serverRunning.getUrl("/sparklr2/oauth/token"));
 		}
 	}

samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/TestAuthorizationCodeProvider.java → samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/AuthorizationCodeProviderTests.java

@@ -54,7 +54,7 @@
  * @author Dave Syer
  * @author Luke Taylor
  */
-public class TestAuthorizationCodeProvider {
+public class AuthorizationCodeProviderTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();
@@ -455,7 +455,7 @@ public MyLessTrustedClient(Object target) {
 			setClientId("my-less-trusted-client");
 			setScope(Arrays.asList("read"));
 			setId(getClientId());
-			TestAuthorizationCodeProvider test = (TestAuthorizationCodeProvider) target;
+			AuthorizationCodeProviderTests test = (AuthorizationCodeProviderTests) target;
 			setAccessTokenUri(test.serverRunning.getUrl("/sparklr2/oauth/token"));
 			setUserAuthorizationUri(test.serverRunning.getUrl("/sparklr2/oauth/authorize"));
 		}

samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/TestClientCredentialsProvider.java → samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/ClientCredentialsProviderTests.java

@@ -27,7 +27,7 @@
  * @author Ryan Heaton
  * @author Dave Syer
  */
-public class TestClientCredentialsProvider {
+public class ClientCredentialsProviderTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();
@@ -131,7 +131,7 @@ public ClientCredentials(Object target) {
 			setClientId("my-client-with-registered-redirect");
 			setScope(Arrays.asList("read"));
 			setId(getClientId());
-			TestClientCredentialsProvider test = (TestClientCredentialsProvider) target;
+			ClientCredentialsProviderTests test = (ClientCredentialsProviderTests) target;
 			setAccessTokenUri(test.serverRunning.getUrl("/sparklr2/oauth/token"));
 			test.resource = this;
 		}
@@ -148,7 +148,7 @@ static class NoScopeClientCredentials extends ClientCredentialsResourceDetails {
 		public NoScopeClientCredentials(Object target) {
 			setClientId("my-client-with-registered-redirect");
 			setId(getClientId());
-			TestClientCredentialsProvider test = (TestClientCredentialsProvider) target;
+			ClientCredentialsProviderTests test = (ClientCredentialsProviderTests) target;
 			setAccessTokenUri(test.serverRunning.getUrl("/sparklr2/oauth/token"));
 		}
 	}

samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/TestImplicitProvider.java → samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/ImplicitProviderTests.java

@@ -33,7 +33,7 @@
  * @author Ryan Heaton
  * @author Dave Syer
  */
-public class TestImplicitProvider {
+public class ImplicitProviderTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();
@@ -119,7 +119,7 @@ public AutoApproveImplicit(Object target) {
 			setClientId("my-less-trusted-autoapprove-client");
 			setId(getClientId());
 			setPreEstablishedRedirectUri("http://anywhere");
-			TestImplicitProvider test = (TestImplicitProvider) target;
+			ImplicitProviderTests test = (ImplicitProviderTests) target;
 			setAccessTokenUri(test.serverRunning.getUrl("/sparklr2/oauth/authorize"));
 			setUserAuthorizationUri(test.serverRunning.getUrl("/sparklr2/oauth/authorize"));
 		}

samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/TestRefreshTokenSupport.java → samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/RefreshTokenSupportTests.java

@@ -21,7 +21,7 @@
  * @author Ryan Heaton
  * @author Dave Syer
  */
-public class TestRefreshTokenSupport {
+public class RefreshTokenSupportTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();

samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/TestResourceOwnerPasswordProvider.java → samples/oauth2/sparklr/src/test/java/org/springframework/security/oauth2/provider/ResourceOwnerPasswordProviderTests.java

@@ -34,7 +34,7 @@
  * @author Ryan Heaton
  * @author Dave Syer
  */
-public class TestResourceOwnerPasswordProvider {
+public class ResourceOwnerPasswordProviderTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();
@@ -226,7 +226,7 @@ public ResourceOwner(Object target) {
 			setId(getClientId());
 			setUsername("marissa");
 			setPassword("koala");
-			TestResourceOwnerPasswordProvider test = (TestResourceOwnerPasswordProvider) target;
+			ResourceOwnerPasswordProviderTests test = (ResourceOwnerPasswordProviderTests) target;
 			setAccessTokenUri(test.serverRunning.getUrl("/sparklr2/oauth/token"));
 		}
 	}

samples/oauth2/tonr/src/test/java/org/springframework/security/oauth/examples/tonr/TestAuthorizationCodeGrant.java → samples/oauth2/tonr/src/test/java/org/springframework/security/oauth/examples/tonr/AuthorizationCodeGrantTests.java

@@ -29,7 +29,7 @@
  * @author Ryan Heaton
  * @author Dave Syer
  */
-public class TestAuthorizationCodeGrant {
+public class AuthorizationCodeGrantTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();

samples/oauth2/tonr/src/test/java/org/springframework/security/oauth/examples/tonr/TestClientCredentialsGrant.java → samples/oauth2/tonr/src/test/java/org/springframework/security/oauth/examples/tonr/ClientCredentialsGrantTests.java

@@ -19,7 +19,7 @@
  * @author Ryan Heaton
  * @author Dave Syer
  */
-public class TestClientCredentialsGrant {
+public class ClientCredentialsGrantTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();

samples/oauth2/tonr/src/test/java/org/springframework/security/oauth/examples/tonr/TestRefreshTokenGrant.java → samples/oauth2/tonr/src/test/java/org/springframework/security/oauth/examples/tonr/RefreshTokenGrantTests.java

@@ -26,7 +26,7 @@
 /**
  * @author Dave Syer
  */
-public class TestRefreshTokenGrant {
+public class RefreshTokenGrantTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();

samples/oauth2/tonr/src/test/java/org/springframework/security/oauth/examples/tonr/TestResourceOwnerPasswordGrant.java → samples/oauth2/tonr/src/test/java/org/springframework/security/oauth/examples/tonr/ResourceOwnerPasswordGrantTests.java

@@ -13,7 +13,7 @@
 /**
  * @author Dave Syer
  */
-public class TestResourceOwnerPasswordGrant {
+public class ResourceOwnerPasswordGrantTests {
 
 	@Rule
 	public ServerRunning serverRunning = ServerRunning.isRunning();

spring-security-oauth/.springBeans

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.8.1.201111220115-RELEASE]]></pluginVersion>
+	<pluginVersion><![CDATA[3.4.0.201310051539-RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
-		<config>src/test/resources/org/springframework/security/oauth/config/TestFilterChainInitialization-context.xml</config>
 	</configs>
 	<configSets>
 	</configSets>

spring-security-oauth/src/test/java/net/oauth/signature/TestGoogleCodeCompatibility.java → spring-security-oauth/src/test/java/net/oauth/signature/GoogleCodeCompatibilityTests.java

@@ -43,7 +43,7 @@
  * @author Dave Syer
  */
 @RunWith(MockitoJUnitRunner.class)
-public class TestGoogleCodeCompatibility {
+public class GoogleCodeCompatibilityTests {
 	@Mock
 	private HttpServletRequest request;
 

spring-security-oauth/src/test/java/org/springframework/security/oauth/common/TestOAuthCodec.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/common/OAuthCodecTests.java

@@ -24,7 +24,7 @@
 /**
  * @author Ryan Heaton
  */
-public class TestOAuthCodec {
+public class OAuthCodecTests {
 
 	/**
 	 * tests idempotent decode.

spring-security-oauth/src/test/java/org/springframework/security/oauth/common/signature/TestCoreOAuthSignatureMethodFactory.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/common/signature/CoreOAuthSignatureMethodFactoryTests.java

@@ -32,7 +32,7 @@
 /**
  * @author Ryan Heaton
  */
-public class TestCoreOAuthSignatureMethodFactory {
+public class CoreOAuthSignatureMethodFactoryTests {
 
 	/**
 	 * tests getting the signature method.

spring-security-oauth/src/test/java/org/springframework/security/oauth/common/signature/TestHMAC_SHA1SignatureMethod.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/common/signature/HMAC_SHA1SignatureMethodTests.java

@@ -25,7 +25,7 @@
 /**
  * @author Ryan Heaton
  */
-public class TestHMAC_SHA1SignatureMethod {
+public class HMAC_SHA1SignatureMethodTests {
 
 	/**
 	 * Test sign and verify.

spring-security-oauth/src/test/java/org/springframework/security/oauth/common/signature/TestPlainTextSignatureMethod.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/common/signature/PlainTextSignatureMethodTests.java

@@ -21,7 +21,7 @@
 /**
  * @author Ryan Heaton
  */
-public class TestPlainTextSignatureMethod {
+public class PlainTextSignatureMethodTests {
 
 	/**
 	 * tests signing and verifying.

spring-security-oauth/src/test/java/org/springframework/security/oauth/common/signature/TestRSA_SHA1SignatureMethod.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/common/signature/RSA_SHA1SignatureMethodTests.java

@@ -31,7 +31,7 @@
 /**
  * @author Ryan Heaton
  */
-public class TestRSA_SHA1SignatureMethod {
+public class RSA_SHA1SignatureMethodTests {
 
 	/**
 	 * tests signing and verifying.

spring-security-oauth/src/test/java/org/springframework/security/oauth/config/TestAuthorizationServerBeanDefinitionParser.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/config/AuthorizationServerBeanDefinitionParserTests.java

@@ -34,7 +34,7 @@
 
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class TestAuthorizationServerBeanDefinitionParser {
+public class AuthorizationServerBeanDefinitionParserTests {
 
   @Autowired
   private UserAuthorizationProcessingFilter filter;

spring-security-oauth/src/test/java/org/springframework/security/oauth/config/TestConsumerServiceBeanDefinitionParser.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/config/ConsumerServiceBeanDefinitionParserTests.java

@@ -14,7 +14,7 @@
 
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class TestConsumerServiceBeanDefinitionParser {
+public class ConsumerServiceBeanDefinitionParserTests {
 
 	@Autowired
 	private ConsumerDetailsService clientDetailsService;

spring-security-oauth/src/test/java/org/springframework/security/oauth/config/TestFilterChainInitialization.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/config/FilterChainInitializationTests.java

@@ -14,7 +14,7 @@
 
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
-public class TestFilterChainInitialization {
+public class FilterChainInitializationTests {
 
 	@Autowired
 	private ConsumerDetailsService clientDetailsService;

spring-security-oauth/src/test/java/org/springframework/security/oauth/consumer/TestGoogleOAuth.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/consumer/GoogleOAuthTests.java

@@ -11,7 +11,7 @@
 /**
  * @author Ryan Heaton
  */
-public class TestGoogleOAuth {
+public class GoogleOAuthTests {
 
 	/**
 	 * tests getting a request token.

spring-security-oauth/src/test/java/org/springframework/security/oauth/consumer/client/TestCoreOAuthConsumerSupport.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/consumer/client/CoreOAuthConsumerSupportTests.java

@@ -69,7 +69,7 @@
  */
 @SuppressWarnings("restriction")
 @RunWith(MockitoJUnitRunner.class)
-public class TestCoreOAuthConsumerSupport {
+public class CoreOAuthConsumerSupportTests {
 	@Mock
 	private ProtectedResourceDetails details;
 

spring-security-oauth/src/test/java/org/springframework/security/oauth/consumer/filter/TestOAuthConsumerContextFilter.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/consumer/filter/OAuthConsumerContextFilterTests.java

@@ -36,7 +36,7 @@
  * @author Ryan Heaton
  */
 @RunWith(MockitoJUnitRunner.class)
-public class TestOAuthConsumerContextFilter {
+public class OAuthConsumerContextFilterTests {
 	@Mock
 	private ProtectedResourceDetails details;
 	@Mock

spring-security-oauth/src/test/java/org/springframework/security/oauth/consumer/rememberme/TestHttpSessionOAuthRememberMeServices.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/consumer/rememberme/HttpSessionOAuthRememberMeServicesTests.java

@@ -29,7 +29,7 @@
 /**
  * @author Alex Rau
  */
-public class TestHttpSessionOAuthRememberMeServices {
+public class HttpSessionOAuthRememberMeServicesTests {
 
 	@Test
 	public void testEmptySession() {

spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/TestCoreOAuthProviderSupport.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/CoreOAuthProviderSupportTests.java

@@ -37,7 +37,7 @@
  * @author Ryan Heaton
  */
 @RunWith(MockitoJUnitRunner.class)
-public class TestCoreOAuthProviderSupport {
+public class CoreOAuthProviderSupportTests {
 	@Mock
 	private HttpServletRequest request;
 

spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/TestAccessTokenProcessingFilter.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/AccessTokenProcessingFilterTests.java

@@ -39,7 +39,7 @@
  * @author Ryan Heaton
  */
 @RunWith(MockitoJUnitRunner.class)
-public class TestAccessTokenProcessingFilter {
+public class AccessTokenProcessingFilterTests {
 	@Mock
 	private ConsumerDetails consumerDetails;
 	@Mock

spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/TestOAuthProcessingFilter.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/OAuthProcessingFilterTests.java

@@ -65,7 +65,7 @@
  * @author Ryan Heaton
  */
 @RunWith(MockitoJUnitRunner.class)
-public class TestOAuthProcessingFilter {
+public class OAuthProcessingFilterTests {
 	@Mock
 	private OAuthProviderSupport providerSupport;
 	@Mock

spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/TestOAuthUserAuthorizationProcessingFilter.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/OAuthUserAuthorizationProcessingFilterTests.java

@@ -36,7 +36,7 @@
 /**
  * @author Ryan Heaton
  */
-public class TestOAuthUserAuthorizationProcessingFilter {
+public class OAuthUserAuthorizationProcessingFilterTests {
 
 	/**
 	 * tests the attempt to authenticate.

spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/TestProtectedResourceProcessingFilter.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/ProtectedResourceProcessingFilterTests.java

@@ -38,7 +38,7 @@
 /**
  * @author Ryan Heaton
  */
-public class TestProtectedResourceProcessingFilter {
+public class ProtectedResourceProcessingFilterTests {
 
 	/**
 	 * test onValidSignature

spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/TestUnauthenticatedRequestTokenProcessingFilter.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/UnauthenticatedRequestTokenProcessingFilterTests.java

@@ -45,7 +45,7 @@
 /**
  * @author Ryan Heaton
  */
-public class TestUnauthenticatedRequestTokenProcessingFilter {
+public class UnauthenticatedRequestTokenProcessingFilterTests {
 
 	/**
 	 * test onValidSignature

spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/TestUserAuthorizationSuccessfulAuthenticationHandler.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/filter/UserAuthorizationSuccessfulAuthenticationHandlerTests.java

@@ -30,7 +30,7 @@
 /**
  * @author Andrew McCall
  */
-public class TestUserAuthorizationSuccessfulAuthenticationHandler {
+public class UserAuthorizationSuccessfulAuthenticationHandlerTests {
 
 	/**
 	 * test determineTargetUrl

spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/nonce/TestInMemoryNonceServices.java → spring-security-oauth/src/test/java/org/springframework/security/oauth/provider/nonce/InMemoryNonceServicesTests.java

@@ -14,7 +14,7 @@
  * @author Ryan Heaton
  * @author Jilles van Gurp
  */
-public class TestInMemoryNonceServices {
+public class InMemoryNonceServicesTests {
 
 	private long now;
 	private final InMemoryNonceServices nonceServices = new InMemoryNonceServices();

spring-security-oauth2/.springBeans

@@ -9,9 +9,7 @@
 	<configs>
 		<config>src/test/resources/org/springframework/security/oauth2/config/xml/authorization-server-custom-grant.xml</config>
 		<config>src/test/resources/org/springframework/security/oauth2/config/xml/authorization-server-vanilla.xml</config>
-		<config>src/test/resources/org/springframework/security/oauth2/config/xml/TestResourceBeanDefinitionParser-context.xml</config>
 		<config>src/test/resources/org/springframework/security/oauth2/config/xml/resource-server-context.xml</config>
-		<config>src/test/resources/org/springframework/security/oauth2/config/xml/TestClientDetailsServiceBeanDefinitionParser-context.xml</config>
 	</configs>
 	<configSets>
 	</configSets>

spring-security-oauth2/src/test/java/org/springframework/security/oauth2/client/TestOAuth2RestTemplate.java → spring-security-oauth2/src/test/java/org/springframework/security/oauth2/client/OAuth2RestTemplateTests.java

@@ -39,7 +39,7 @@
  * @author Ryan Heaton
  * @author Dave Syer
  */
-public class TestOAuth2RestTemplate {
+public class OAuth2RestTemplateTests {
 
 	private BaseOAuth2ProtectedResourceDetails resource;