Merge branch '4.0.x'

Closes gh-1529

spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java

@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractWebServiceMessageFactoryTest {
+public abstract class AbstractWebServiceMessageFactoryTests {
 
 	protected WebServiceMessageFactory messageFactory;
 

spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java

@@ -61,7 +61,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.xmlunit.assertj.XmlAssert.assertThat;
 
-public abstract class AbstractWebServiceMessageTest {
+public abstract class AbstractWebServiceMessageTests {
 
 	protected Transformer transformer;
 
@@ -83,7 +83,7 @@ public abstract class AbstractWebServiceMessageTest {
 		TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance();
 		this.transformer = transformerFactory.newTransformer();
 		this.webServiceMessage = createWebServiceMessage();
-		this.payload = new ClassPathResource("payload.xml", AbstractWebServiceMessageTest.class);
+		this.payload = new ClassPathResource("payload.xml", AbstractWebServiceMessageTests.class);
 	}
 
 	@Test

spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java

@@ -71,7 +71,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public abstract class AbstractSoap11WebServiceTemplateIntegrationTest {
+public abstract class AbstractSoap11WebServiceTemplateIntegrationTests {
 
 	private static Server jettyServer;
 
@@ -168,7 +168,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest {
 				assertThat(requestObject).isEqualTo(graph);
 				try {
 					transformer.transform(
-							new StringSource(AbstractSoap11WebServiceTemplateIntegrationTest.this.messagePayload),
+							new StringSource(AbstractSoap11WebServiceTemplateIntegrationTests.this.messagePayload),
 							result);
 				}
 				catch (TransformerException e) {
@@ -222,7 +222,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest {
 				assertThat(requestObject).isEqualTo(graph);
 				try {
 					transformer.transform(
-							new StringSource(AbstractSoap11WebServiceTemplateIntegrationTest.this.messagePayload),
+							new StringSource(AbstractSoap11WebServiceTemplateIntegrationTests.this.messagePayload),
 							result);
 				}
 				catch (TransformerException e) {

spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java

@@ -70,7 +70,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public abstract class AbstractSoap12WebServiceTemplateIntegrationTest {
+public abstract class AbstractSoap12WebServiceTemplateIntegrationTests {
 
 	private static Server jettyServer;
 
@@ -173,7 +173,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest {
 				assertThat(requestObject).isEqualTo(graph);
 				try {
 					transformer.transform(
-							new StringSource(AbstractSoap12WebServiceTemplateIntegrationTest.this.messagePayload),
+							new StringSource(AbstractSoap12WebServiceTemplateIntegrationTests.this.messagePayload),
 							result);
 				}
 				catch (TransformerException e) {
@@ -227,7 +227,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest {
 
 				try {
 					transformer.transform(
-							new StringSource(AbstractSoap12WebServiceTemplateIntegrationTest.this.messagePayload),
+							new StringSource(AbstractSoap12WebServiceTemplateIntegrationTests.this.messagePayload),
 							result);
 				}
 				catch (TransformerException e) {

spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomNonStreamingSoap11WebServiceTemplateIntegrationTests.java

@@ -22,8 +22,8 @@ import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
 /**
  * @author Arjen Poutsma
  */
-public class AxiomNonStreamingSoap11WebServiceTemplateIntegrationTest
-		extends AbstractSoap11WebServiceTemplateIntegrationTest {
+public class AxiomNonStreamingSoap11WebServiceTemplateIntegrationTests
+		extends AbstractSoap11WebServiceTemplateIntegrationTests {
 
 	@Override
 	public SoapMessageFactory createMessageFactory() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomNonStreamingSoap12WebServiceTemplateIntegrationTests.java

@@ -23,8 +23,8 @@ import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
 /**
  * @author Arjen Poutsma
  */
-public class AxiomNonStreamingSoap12WebServiceTemplateIntegrationTest
-		extends AbstractSoap12WebServiceTemplateIntegrationTest {
+public class AxiomNonStreamingSoap12WebServiceTemplateIntegrationTests
+		extends AbstractSoap12WebServiceTemplateIntegrationTests {
 
 	@Override
 	public SoapMessageFactory createMessageFactory() {

spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomStreamingSoap11WebServiceTemplateIntegrationTests.java

@@ -22,8 +22,8 @@ import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
 /**
  * @author Arjen Poutsma
  */
-public class AxiomStreamingSoap11WebServiceTemplateIntegrationTest
-		extends AbstractSoap11WebServiceTemplateIntegrationTest {
+public class AxiomStreamingSoap11WebServiceTemplateIntegrationTests
+		extends AbstractSoap11WebServiceTemplateIntegrationTests {
 
 	@Override
 	public SoapMessageFactory createMessageFactory() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomStreamingSoap12WebServiceTemplateIntegrationTests.java

@@ -23,8 +23,8 @@ import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
 /**
  * @author Arjen Poutsma
  */
-public class AxiomStreamingSoap12WebServiceTemplateIntegrationTest
-		extends AbstractSoap12WebServiceTemplateIntegrationTest {
+public class AxiomStreamingSoap12WebServiceTemplateIntegrationTests
+		extends AbstractSoap12WebServiceTemplateIntegrationTests {
 
 	@Override
 	public SoapMessageFactory createMessageFactory() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java

@@ -52,7 +52,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public class DomPoxWebServiceTemplateIntegrationTest {
+public class DomPoxWebServiceTemplateIntegrationTests {
 
 	private static Server jettyServer;
 

spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTests.java

@@ -25,7 +25,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 /**
  * @author Arjen Poutsma
  */
-public class SaajSoap11WebServiceTemplateIntegrationTest extends AbstractSoap11WebServiceTemplateIntegrationTest {
+public class SaajSoap11WebServiceTemplateIntegrationTests extends AbstractSoap11WebServiceTemplateIntegrationTests {
 
 	@Override
 	public SoapMessageFactory createMessageFactory() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTests.java

@@ -25,7 +25,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 /**
  * @author Arjen Poutsma
  */
-public class SaajSoap12WebServiceTemplateIntegrationTest extends AbstractSoap12WebServiceTemplateIntegrationTest {
+public class SaajSoap12WebServiceTemplateIntegrationTests extends AbstractSoap12WebServiceTemplateIntegrationTests {
 
 	@Override
 	public SoapMessageFactory createMessageFactory() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java

@@ -28,7 +28,7 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public class SimpleFaultMessageResolverTest {
+public class SimpleFaultMessageResolverTests {
 
 	private SimpleFaultMessageResolver resolver;
 

spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java

@@ -59,7 +59,7 @@ import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
 @SuppressWarnings("unchecked")
-public class WebServiceTemplateTest {
+public class WebServiceTemplateTests {
 
 	private WebServiceTemplate template;
 
@@ -79,7 +79,7 @@ public class WebServiceTemplateTest {
 
 			@Override
 			public WebServiceConnection createConnection(URI uri) {
-				return WebServiceTemplateTest.this.connectionMock;
+				return WebServiceTemplateTests.this.connectionMock;
 			}
 
 			@Override
@@ -317,7 +317,7 @@ public class WebServiceTemplateTest {
 
 			@Override
 			public WebServiceConnection createConnection(URI uri) {
-				return WebServiceTemplateTest.this.connectionMock;
+				return WebServiceTemplateTests.this.connectionMock;
 			}
 
 			@Override
@@ -574,7 +574,7 @@ public class WebServiceTemplateTest {
 
 			@Override
 			public WebServiceConnection createConnection(URI uri) {
-				return WebServiceTemplateTest.this.connectionMock;
+				return WebServiceTemplateTests.this.connectionMock;
 			}
 
 			@Override

spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTests.java

@@ -27,7 +27,7 @@ import org.springframework.core.io.Resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class Wsdl11DestinationProviderTest {
+public class Wsdl11DestinationProviderTests {
 
 	private Wsdl11DestinationProvider provider;
 

spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTests.java

@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Greg Turnquist
  */
-public class ClientInterceptorAdapterTest {
+public class ClientInterceptorAdapterTests {
 
 	@Test
 	public void handleEmptyInterceptor() {

spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTests.java

@@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
-public class PayloadValidatingInterceptorTest {
+public class PayloadValidatingInterceptorTests {
 
 	private PayloadValidatingInterceptor interceptor;
 
@@ -158,7 +158,7 @@ public class PayloadValidatingInterceptorTest {
 
 		try {
 			PayloadValidatingInterceptor interceptor = new PayloadValidatingInterceptor();
-			interceptor.setSchema(new ClassPathResource(SCHEMA2, PayloadValidatingInterceptorTest.class));
+			interceptor.setSchema(new ClassPathResource(SCHEMA2, PayloadValidatingInterceptorTests.class));
 			interceptor.afterPropertiesSet();
 			MessageFactory messageFactory = MessageFactory.newInstance();
 			SOAPMessage saajMessage = SaajUtils.loadMessage(new ClassPathResource(VALID_SOAP_MESSAGE, getClass()),

spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTests.java

@@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Arjen Poutsma
  */
-public class AnnotationDrivenBeanDefinitionParserTest {
+public class AnnotationDrivenBeanDefinitionParserTests {
 
 	private ApplicationContext applicationContext;
 

spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTests.java

@@ -30,7 +30,7 @@ import org.springframework.ws.soap.server.endpoint.interceptor.SoapActionSmartEn
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class InterceptorsBeanDefinitionParserTest {
+public class InterceptorsBeanDefinitionParserTests {
 
 	@Test
 	public void namespace() {

spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTests.java

@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Arjen Poutsma
  */
-public class WsdlBeanDefinitionParserTest {
+public class WsdlBeanDefinitionParserTests {
 
 	private ApplicationContext applicationContext;
 

spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTests.java

@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Arjen Poutsma
  */
-public class DefaultWsConfigurationTest {
+public class DefaultWsConfigurationTests {
 
 	private ApplicationContext applicationContext;
 

spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTests.java

@@ -24,10 +24,10 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.ws.config.annotation.WsConfigurationSupportTest.CustomArgumentResolverConfig.MyArgumentResolver;
-import org.springframework.ws.config.annotation.WsConfigurationSupportTest.CustomDefaultMethodEndpointAdapterConfig.MyDefaultMethodEndpointAdapter;
-import org.springframework.ws.config.annotation.WsConfigurationSupportTest.CustomInterceptorConfig.MyInterceptor;
-import org.springframework.ws.config.annotation.WsConfigurationSupportTest.CustomReturnValueHandlerConfig.MyReturnValueHandler;
+import org.springframework.ws.config.annotation.WsConfigurationSupportTests.CustomArgumentResolverConfig.MyArgumentResolver;
+import org.springframework.ws.config.annotation.WsConfigurationSupportTests.CustomDefaultMethodEndpointAdapterConfig.MyDefaultMethodEndpointAdapter;
+import org.springframework.ws.config.annotation.WsConfigurationSupportTests.CustomInterceptorConfig.MyInterceptor;
+import org.springframework.ws.config.annotation.WsConfigurationSupportTests.CustomReturnValueHandlerConfig.MyReturnValueHandler;
 import org.springframework.ws.server.EndpointInterceptor;
 import org.springframework.ws.server.endpoint.adapter.DefaultMethodEndpointAdapter;
 import org.springframework.ws.server.endpoint.adapter.method.MethodArgumentResolver;
@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Arjen Poutsma
  * @author Stephane Nicoll
  */
-class WsConfigurationSupportTest {
+class WsConfigurationSupportTests {
 
 	@Test
 	void interceptors() {

spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTests.java

@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Arjen Poutsma
  */
 @Deprecated
-public class WsConfigurerAdapterTest {
+public class WsConfigurerAdapterTests {
 
 	private ApplicationContext applicationContext;
 

spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTests.java

@@ -29,7 +29,7 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public class DefaultMessageContextTest {
+public class DefaultMessageContextTests {
 
 	private DefaultMessageContext context;
 

spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTests.java

@@ -24,12 +24,12 @@ import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.util.FileCopyUtils;
-import org.springframework.ws.AbstractWebServiceMessageTest;
+import org.springframework.ws.AbstractWebServiceMessageTests;
 import org.springframework.ws.WebServiceMessage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageTest {
+public abstract class AbstractMimeMessageTests extends AbstractWebServiceMessageTests {
 
 	protected MimeMessage mimeMessage;
 
@@ -43,7 +43,7 @@ public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageT
 	protected final WebServiceMessage createWebServiceMessage() throws Exception {
 
 		this.mimeMessage = createMimeMessage();
-		this.picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTest.class);
+		this.picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTests.class);
 		this.contentId = "spring-ws";
 		this.contentType = "image/png";
 		return this.mimeMessage;

spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.ws.pox.dom;
 
-import org.springframework.ws.AbstractWebServiceMessageFactoryTest;
+import org.springframework.ws.AbstractWebServiceMessageFactoryTests;
 import org.springframework.ws.WebServiceMessageFactory;
 
-public class DomPoxMessageFactoryTest extends AbstractWebServiceMessageFactoryTest {
+public class DomPoxMessageFactoryTests extends AbstractWebServiceMessageFactoryTests {
 
 	@Override
 	protected WebServiceMessageFactory createMessageFactory() {

spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTests.java

@@ -35,7 +35,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.xmlunit.assertj.XmlAssert.assertThat;
 
-public class DomPoxMessageTest {
+public class DomPoxMessageTests {
 
 	private DomPoxMessage message;
 

spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTests.java

@@ -41,7 +41,7 @@ import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public class MessageDispatcherTest {
+public class MessageDispatcherTests {
 
 	private MessageDispatcher dispatcher;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTests.java

@@ -43,7 +43,7 @@ import org.springframework.xml.XMLInputFactoryUtils;
 import org.springframework.xml.sax.SaxUtils;
 
 @SuppressWarnings("Since15")
-public abstract class AbstractEndpointTest {
+public abstract class AbstractEndpointTests {
 
 	protected static final String NAMESPACE_URI = "http://springframework.org/ws";
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTests.java

@@ -30,7 +30,7 @@ import org.springframework.xml.transform.StringSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractMessageEndpointTest extends AbstractEndpointTest {
+public abstract class AbstractMessageEndpointTests extends AbstractEndpointTests {
 
 	private MessageEndpoint endpoint;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTests.java

@@ -29,7 +29,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractPayloadEndpointTest extends AbstractEndpointTest {
+public abstract class AbstractPayloadEndpointTests extends AbstractEndpointTests {
 
 	private PayloadEndpoint endpoint;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/CompositeEndpointExceptionResolverTests.java

@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Stephane Nicoll
  */
-class CompositeEndpointExceptionResolverTest {
+class CompositeEndpointExceptionResolverTests {
 
 	@Test
 	void logExceptionIsInvokedOnlyOnResolvedInstance() {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTests.java

@@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Tareq Abed Rabbo
  * @author Arjen Poutsma
  */
-public class EndpointExceptionResolverTest {
+public class EndpointExceptionResolverTests {
 
 	private MethodEndpoint methodEndpoint;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTests.java

@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MethodEndpointTest {
+public class MethodEndpointTests {
 
 	private MethodEndpoint endpoint;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTests.java

@@ -45,7 +45,7 @@ import static org.easymock.EasyMock.verify;
 /**
  * @author Arjen Poutsma
  */
-public class DefaultMethodEndpointAdapterTest {
+public class DefaultMethodEndpointAdapterTests {
 
 	private DefaultMethodEndpointAdapter adapter;
 
@@ -84,7 +84,7 @@ public class DefaultMethodEndpointAdapterTest {
 	public void initDefaultStrategies() throws Exception {
 
 		this.adapter = new DefaultMethodEndpointAdapter();
-		this.adapter.setBeanClassLoader(DefaultMethodEndpointAdapterTest.class.getClassLoader());
+		this.adapter.setBeanClassLoader(DefaultMethodEndpointAdapterTests.class.getClassLoader());
 		this.adapter.afterPropertiesSet();
 
 		assertThat(this.adapter.getMethodArgumentResolvers()).isNotEmpty();

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTests.java

@@ -29,7 +29,7 @@ import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public class MessageEndpointAdapterTest {
+public class MessageEndpointAdapterTests {
 
 	private MessageEndpointAdapter adapter;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTests.java

@@ -42,7 +42,7 @@ import static org.easymock.EasyMock.isA;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public class PayloadEndpointAdapterTest {
+public class PayloadEndpointAdapterTests {
 
 	private PayloadEndpointAdapter adapter;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTests.java

@@ -35,7 +35,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.xml.transform.StringSource;
 import org.springframework.xml.transform.TransformerObjectSupport;
 
-public class AbstractMethodArgumentResolverTest extends TransformerObjectSupport {
+public class AbstractMethodArgumentResolverTests extends TransformerObjectSupport {
 
 	protected static final String NAMESPACE_URI = "http://springframework.org/ws";
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTests.java

@@ -28,7 +28,7 @@ import org.springframework.xml.transform.StringResult;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractPayloadMethodProcessorTest extends AbstractMethodArgumentResolverTest {
+public abstract class AbstractPayloadMethodProcessorTests extends AbstractMethodArgumentResolverTests {
 
 	private AbstractPayloadSourceMethodProcessor processor;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTests.java

@@ -40,7 +40,7 @@ import static org.easymock.EasyMock.isA;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public class MarshallingPayloadMethodProcessorTest extends AbstractMethodArgumentResolverTest {
+public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgumentResolverTests {
 
 	private MarshallingPayloadMethodProcessor processor;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTests.java

@@ -26,7 +26,7 @@ import org.springframework.ws.context.MessageContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MessageContextMethodArgumentResolverTest {
+public class MessageContextMethodArgumentResolverTests {
 
 	private MessageContextMethodArgumentResolver resolver;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTests.java

@@ -30,7 +30,7 @@ import org.springframework.xml.transform.StringSource;
 /**
  * @author Arjen Poutsma
  */
-public class SourcePayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest {
+public class SourcePayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests {
 
 	@Override
 	protected AbstractPayloadSourceMethodProcessor createProcessor() {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTests.java

@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Arjen Poutsma
  */
 @SuppressWarnings("Since15")
-public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumentResolverTest {
+public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests {
 
 	private StaxPayloadMethodArgumentResolver resolver;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTests.java

@@ -35,7 +35,7 @@ import org.springframework.ws.server.endpoint.annotation.XPathParam;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Namespaces(@Namespace(prefix = "tns", uri = "http://springframework.org/spring-ws"))
-public class XPathParamMethodArgumentResolverTest {
+public class XPathParamMethodArgumentResolverTests {
 
 	private static final String CONTENTS = "<root><child><text>text</text><number>42</number></child></root>";
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTests.java

@@ -21,14 +21,14 @@ import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 
 import org.springframework.core.MethodParameter;
-import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTests;
 import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
 import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class Dom4jPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest {
+public class Dom4jPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests {
 
 	@Override
 	protected AbstractPayloadSourceMethodProcessor createProcessor() {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTests.java

@@ -24,7 +24,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import org.springframework.core.MethodParameter;
-import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTests;
 import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
 import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
@@ -32,7 +32,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest {
+public class DomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests {
 
 	@Override
 	protected AbstractPayloadSourceMethodProcessor createProcessor() {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTests.java

@@ -19,14 +19,14 @@ package org.springframework.ws.server.endpoint.adapter.method.dom;
 import org.jdom2.Element;
 
 import org.springframework.core.MethodParameter;
-import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTests;
 import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
 import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class JDomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest {
+public class JDomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests {
 
 	@Override
 	protected AbstractPayloadSourceMethodProcessor createProcessor() {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTests.java

@@ -19,14 +19,14 @@ package org.springframework.ws.server.endpoint.adapter.method.dom;
 import nu.xom.Element;
 
 import org.springframework.core.MethodParameter;
-import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTests;
 import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
 import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class XomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest {
+public class XomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests {
 
 	@Override
 	protected AbstractPayloadSourceMethodProcessor createProcessor() {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTests.java

@@ -44,7 +44,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class JaxbElementPayloadMethodProcessorTest {
+public class JaxbElementPayloadMethodProcessorTests {
 
 	private JaxbElementPayloadMethodProcessor processor;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTests.java

@@ -53,7 +53,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class XmlRootElementPayloadMethodProcessorTest {
+public class XmlRootElementPayloadMethodProcessorTests {
 
 	private XmlRootElementPayloadMethodProcessor processor;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTests.java

@@ -44,7 +44,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
-public class PayloadTransformingInterceptorTest {
+public class PayloadTransformingInterceptorTests {
 
 	private PayloadTransformingInterceptor interceptor;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTests.java

@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration("bridged-method-registration.xml")
-public class BridgedMethodRegistrationTest {
+public class BridgedMethodRegistrationTests {
 
 	@Autowired
 	private PayloadRootAnnotationMethodEndpointMapping mapping;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTests.java

@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration("cglib-proxy-registration.xml")
-public class CgLibProxyRegistrationTest {
+public class CgLibProxyRegistrationTests {
 
 	@Autowired
 	private PayloadRootAnnotationMethodEndpointMapping mapping;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTests.java

@@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify;
 /**
  * Test case for {@link AbstractEndpointMapping}.
  */
-public class EndpointMappingTest {
+public class EndpointMappingTests {
 
 	private MessageContext messageContext;
 
@@ -53,7 +53,7 @@ public class EndpointMappingTest {
 		AbstractEndpointMapping mapping = new AbstractEndpointMapping() {
 			@Override
 			protected Object getEndpointInternal(MessageContext givenRequest) {
-				assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext);
+				assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext);
 				return null;
 			}
 		};
@@ -72,7 +72,7 @@ public class EndpointMappingTest {
 		AbstractEndpointMapping mapping = new AbstractEndpointMapping() {
 			@Override
 			protected Object getEndpointInternal(MessageContext givenRequest) {
-				assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext);
+				assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext);
 				return endpoint;
 			}
 		};
@@ -91,7 +91,7 @@ public class EndpointMappingTest {
 		AbstractEndpointMapping mapping = new AbstractEndpointMapping() {
 			@Override
 			protected Object getEndpointInternal(MessageContext givenRequest) {
-				assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext);
+				assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext);
 				return endpoint;
 			}
 		};
@@ -114,7 +114,7 @@ public class EndpointMappingTest {
 		AbstractEndpointMapping mapping = new AbstractEndpointMapping() {
 			@Override
 			protected Object getEndpointInternal(MessageContext givenRequest) {
-				assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext);
+				assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext);
 				return endpoint;
 			}
 		};
@@ -142,7 +142,7 @@ public class EndpointMappingTest {
 		AbstractEndpointMapping mapping = new AbstractEndpointMapping() {
 			@Override
 			protected Object getEndpointInternal(MessageContext givenRequest) {
-				assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext);
+				assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext);
 				return endpoint;
 			}
 		};
@@ -165,7 +165,7 @@ public class EndpointMappingTest {
 		AbstractEndpointMapping mapping = new AbstractEndpointMapping() {
 			@Override
 			protected Object getEndpointInternal(MessageContext givenRequest) {
-				assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext);
+				assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext);
 				return endpoint;
 			}
 		};
@@ -187,7 +187,7 @@ public class EndpointMappingTest {
 
 			@Override
 			protected Object getEndpointInternal(MessageContext message) {
-				assertThat(message).isEqualTo(EndpointMappingTest.this.messageContext);
+				assertThat(message).isEqualTo(EndpointMappingTests.this.messageContext);
 				return "endpoint";
 			}
 		};
@@ -208,7 +208,7 @@ public class EndpointMappingTest {
 
 			@Override
 			protected Object getEndpointInternal(MessageContext message) {
-				assertThat(message).isEqualTo(EndpointMappingTest.this.messageContext);
+				assertThat(message).isEqualTo(EndpointMappingTests.this.messageContext);
 				return "noSuchBean";
 			}
 		};
@@ -229,7 +229,7 @@ public class EndpointMappingTest {
 
 			@Override
 			protected Object getEndpointInternal(MessageContext message) {
-				assertThat(message).isEqualTo(EndpointMappingTest.this.messageContext);
+				assertThat(message).isEqualTo(EndpointMappingTests.this.messageContext);
 				return "endpoint";
 			}
 		};

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTests.java

@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration("jdk-proxy-registration.xml")
-public class JdkProxyRegistrationTest {
+public class JdkProxyRegistrationTests {
 
 	@Autowired
 	private PayloadRootAnnotationMethodEndpointMapping mapping;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTests.java

@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * Test case for AbstractMapBasedEndpointMapping.
  */
-public class MapBasedSoapEndpointMappingTest {
+public class MapBasedSoapEndpointMappingTests {
 
 	@Test
 	public void testBeanNames() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTests.java

@@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration("payloadRootAnnotationMethodEndpointMapping.xml")
-public class PayloadRootAnnotationMethodEndpointMappingTest {
+public class PayloadRootAnnotationMethodEndpointMappingTests {
 
 	@Autowired
 	private PayloadRootAnnotationMethodEndpointMapping mapping;

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTests.java

@@ -28,7 +28,7 @@ import org.springframework.ws.context.MessageContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PayloadRootQNameEndpointMappingTest {
+public class PayloadRootQNameEndpointMappingTests {
 
 	private PayloadRootQNameEndpointMapping mapping;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTests.java

@@ -26,7 +26,7 @@ import org.springframework.ws.context.MessageContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleMethodEndpointMappingTest {
+public class SimpleMethodEndpointMappingTests {
 
 	private SimpleMethodEndpointMapping mapping;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTests.java

@@ -35,7 +35,7 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public class UriEndpointMappingTest {
+public class UriEndpointMappingTests {
 
 	private UriEndpointMapping mapping;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTests.java

@@ -26,7 +26,7 @@ import org.springframework.ws.context.MessageContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class XPathPayloadEndpointMappingTest {
+public class XPathPayloadEndpointMappingTests {
 
 	private XPathPayloadEndpointMapping mapping;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTests.java

@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class XmlRootElementEndpointMappingTest {
+public class XmlRootElementEndpointMappingTests {
 
 	private XmlRootElementEndpointMapping mapping;
 

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTests.java

@@ -29,7 +29,7 @@ import org.springframework.ws.server.endpoint.annotation.Namespaces;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Namespaces({ @Namespace(prefix = "prefix1", uri = "class1"), @Namespace(uri = "class2") })
-public class NamespaceUtilsTest {
+public class NamespaceUtilsTests {
 
 	@Test
 	public void getNamespaceContextMethod() throws NoSuchMethodException {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTests.java

@@ -41,7 +41,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PayloadRootUtilsTest {
+public class PayloadRootUtilsTests {
 
 	@Test
 	public void testGetQNameForDomSource() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTests.java

@@ -31,7 +31,7 @@ import org.springframework.xml.transform.StringSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoapBodyTest extends AbstractSoapElementTest {
+public abstract class AbstractSoapBodyTests extends AbstractSoapElementTests {
 
 	protected SoapBody soapBody;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTests.java

@@ -29,7 +29,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoapElementTest {
+public abstract class AbstractSoapElementTests {
 
 	private SoapElement soapElement;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTests.java

@@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoapEnvelopeTest extends AbstractSoapElementTest {
+public abstract class AbstractSoapEnvelopeTests extends AbstractSoapElementTests {
 
 	protected SoapEnvelope soapEnvelope;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTests.java

@@ -28,7 +28,7 @@ import org.springframework.xml.transform.StringSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest {
+public abstract class AbstractSoapHeaderTests extends AbstractSoapElementTests {
 
 	protected SoapHeader soapHeader;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTests.java

@@ -18,14 +18,14 @@ package org.springframework.ws.soap;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.ws.AbstractWebServiceMessageFactoryTest;
+import org.springframework.ws.AbstractWebServiceMessageFactoryTests;
 import org.springframework.ws.InvalidXmlException;
 import org.springframework.ws.WebServiceMessage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public abstract class AbstractSoapMessageFactoryTest extends AbstractWebServiceMessageFactoryTest {
+public abstract class AbstractSoapMessageFactoryTests extends AbstractWebServiceMessageFactoryTests {
 
 	@Test
 	public void testCreateEmptySoapMessage() {

spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTests.java

@@ -31,7 +31,7 @@ import org.xmlunit.assertj.XmlAssert;
 
 import org.springframework.core.io.Resource;
 import org.springframework.util.StringUtils;
-import org.springframework.ws.mime.AbstractMimeMessageTest;
+import org.springframework.ws.mime.AbstractMimeMessageTests;
 import org.springframework.ws.mime.MimeMessage;
 import org.springframework.ws.stream.StreamingPayload;
 import org.springframework.ws.stream.StreamingWebServiceMessage;
@@ -44,7 +44,7 @@ import org.springframework.xml.validation.XmlValidatorFactory;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest {
+public abstract class AbstractSoapMessageTests extends AbstractMimeMessageTests {
 
 	protected abstract String getNS();
 

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTests.java

@@ -31,7 +31,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractWsAddressingTest {
+public abstract class AbstractWsAddressingTests {
 
 	protected MessageFactory messageFactory;
 
@@ -44,7 +44,7 @@ public abstract class AbstractWsAddressingTest {
 
 		MimeHeaders mimeHeaders = new MimeHeaders();
 		mimeHeaders.addHeader("Content-Type", " application/soap+xml");
-		InputStream is = AbstractWsAddressingTest.class.getResourceAsStream(fileName);
+		InputStream is = AbstractWsAddressingTests.class.getResourceAsStream(fileName);
 
 		try (is) {
 			assertThat(is).isNotNull();

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTests.java

@@ -29,7 +29,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.ws.soap.addressing.AbstractWsAddressingTest;
+import org.springframework.ws.soap.addressing.AbstractWsAddressingTests;
 import org.springframework.ws.soap.addressing.core.EndpointReference;
 import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy;
 import org.springframework.ws.soap.addressing.version.AddressingVersion;
@@ -44,7 +44,7 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public abstract class AbstractActionCallbackTest extends AbstractWsAddressingTest {
+public abstract class AbstractActionCallbackTests extends AbstractWsAddressingTests {
 
 	private ActionCallback callback;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Tests.java

@@ -19,7 +19,7 @@ package org.springframework.ws.soap.addressing.client;
 import org.springframework.ws.soap.addressing.version.Addressing10;
 import org.springframework.ws.soap.addressing.version.AddressingVersion;
 
-public class ActionCallback10Test extends AbstractActionCallbackTest {
+public class ActionCallback10Tests extends AbstractActionCallbackTests {
 
 	@Override
 	protected AddressingVersion getVersion() {

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Tests.java

@@ -19,7 +19,7 @@ package org.springframework.ws.soap.addressing.client;
 import org.springframework.ws.soap.addressing.version.Addressing200408;
 import org.springframework.ws.soap.addressing.version.AddressingVersion;
 
-public class ActionCallback200408Test extends AbstractActionCallbackTest {
+public class ActionCallback200408Tests extends AbstractActionCallbackTests {
 
 	@Override
 	protected AddressingVersion getVersion() {

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTests.java

@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class UuidMessageIdStrategyTest {
+public class UuidMessageIdStrategyTests {
 
 	private MessageIdStrategy strategy;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTests.java

@@ -27,7 +27,7 @@ import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapHeaderElement;
 import org.springframework.ws.soap.SoapMessage;
-import org.springframework.ws.soap.addressing.AbstractWsAddressingTest;
+import org.springframework.ws.soap.addressing.AbstractWsAddressingTests;
 import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy;
 import org.springframework.ws.soap.addressing.version.AddressingVersion;
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
@@ -42,7 +42,7 @@ import static org.easymock.EasyMock.isA;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddressingTest {
+public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddressingTests {
 
 	protected AddressingEndpointInterceptor interceptor;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Tests.java

@@ -31,7 +31,7 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public class AddressingInterceptor10Test extends AbstractAddressingInterceptorTest {
+public class AddressingInterceptor10Tests extends AbstractAddressingInterceptorTests {
 
 	@Override
 	protected AddressingVersion getVersion() {

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Tests.java

@@ -19,7 +19,7 @@ package org.springframework.ws.soap.addressing.server;
 import org.springframework.ws.soap.addressing.version.Addressing200408;
 import org.springframework.ws.soap.addressing.version.AddressingVersion;
 
-public class AddressingInterceptor200408Test extends AbstractAddressingInterceptorTest {
+public class AddressingInterceptor200408Tests extends AbstractAddressingInterceptorTests {
 
 	@Override
 	protected AddressingVersion getVersion() {

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTests.java

@@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Arjen Poutsma
  * @author Nate Stoddard
  */
-public class AnnotationActionMethodEndpointMappingTest {
+public class AnnotationActionMethodEndpointMappingTests {
 
 	private StaticApplicationContext applicationContext;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTests.java

@@ -28,14 +28,14 @@ import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.server.EndpointInterceptor;
 import org.springframework.ws.server.EndpointInvocationChain;
 import org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor;
-import org.springframework.ws.soap.addressing.AbstractWsAddressingTest;
+import org.springframework.ws.soap.addressing.AbstractWsAddressingTests;
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
 import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.ws.soap.server.endpoint.interceptor.PayloadValidatingInterceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SimpleActionEndpointMappingTest extends AbstractWsAddressingTest {
+public class SimpleActionEndpointMappingTests extends AbstractWsAddressingTests {
 
 	private SimpleActionEndpointMapping mapping;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11BodyTests.java

@@ -21,10 +21,10 @@ import org.apache.axiom.soap.SOAPFactory;
 import org.junit.jupiter.api.Test;
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapVersion;
-import org.springframework.ws.soap.soap11.AbstractSoap11BodyTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11BodyTests;
 import org.springframework.xml.transform.StringSource;
 
-public class AxiomSoap11BodyTest extends AbstractSoap11BodyTest {
+public class AxiomSoap11BodyTests extends AbstractSoap11BodyTests {
 
 	@Override
 	protected SoapBody createSoapBody() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11EnvelopeTests.java

@@ -19,9 +19,9 @@ package org.springframework.ws.soap.axiom;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.springframework.ws.soap.SoapEnvelope;
-import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTests;
 
-public class AxiomSoap11EnvelopeTest extends AbstractSoap11EnvelopeTest {
+public class AxiomSoap11EnvelopeTests extends AbstractSoap11EnvelopeTests {
 
 	@Override
 	protected SoapEnvelope createSoapEnvelope() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11HeaderTests.java

@@ -19,9 +19,9 @@ package org.springframework.ws.soap.axiom;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.springframework.ws.soap.SoapHeader;
-import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTests;
 
-public class AxiomSoap11HeaderTest extends AbstractSoap11HeaderTest {
+public class AxiomSoap11HeaderTests extends AbstractSoap11HeaderTests {
 
 	@Override
 	protected SoapHeader createSoapHeader() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageFactoryTests.java

@@ -28,7 +28,7 @@ import org.xmlunit.assertj.XmlAssert;
 import org.springframework.ws.InvalidXmlException;
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.WebServiceMessageFactory;
-import org.springframework.ws.soap.soap11.AbstractSoap11MessageFactoryTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11MessageFactoryTests;
 import org.springframework.ws.transport.MockTransportInputStream;
 import org.springframework.ws.transport.TransportInputStream;
 import org.springframework.xml.transform.StringResult;
@@ -37,7 +37,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public class AxiomSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryTest {
+public class AxiomSoap11MessageFactoryTests extends AbstractSoap11MessageFactoryTests {
 
 	private Transformer transformer;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTests.java

@@ -19,9 +19,9 @@ package org.springframework.ws.soap.axiom;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.springframework.ws.soap.SoapMessage;
-import org.springframework.ws.soap.soap11.AbstractSoap11MessageTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11MessageTests;
 
-public class AxiomSoap11MessageTest extends AbstractSoap11MessageTest {
+public class AxiomSoap11MessageTests extends AbstractSoap11MessageTests {
 
 	@Override
 	protected String getNS() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingBodyTests.java

@@ -18,9 +18,9 @@ package org.springframework.ws.soap.axiom;
 
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapVersion;
-import org.springframework.ws.soap.soap11.AbstractSoap11BodyTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11BodyTests;
 
-public class AxiomSoap11NonCachingBodyTest extends AbstractSoap11BodyTest {
+public class AxiomSoap11NonCachingBodyTests extends AbstractSoap11BodyTests {
 
 	@Override
 	protected SoapBody createSoapBody() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTests.java

@@ -21,11 +21,11 @@ import org.apache.axiom.om.OMSourcedElement;
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.SoapVersion;
-import org.springframework.ws.soap.soap11.AbstractSoap11MessageTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11MessageTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class AxiomSoap11NonCachingMessageTest extends AbstractSoap11MessageTest {
+public class AxiomSoap11NonCachingMessageTests extends AbstractSoap11MessageTests {
 
 	@Override
 	protected String getNS() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12BodyTests.java

@@ -21,10 +21,10 @@ import org.apache.axiom.soap.SOAPFactory;
 import org.junit.jupiter.api.Test;
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapVersion;
-import org.springframework.ws.soap.soap12.AbstractSoap12BodyTest;
+import org.springframework.ws.soap.soap12.AbstractSoap12BodyTests;
 import org.springframework.xml.transform.StringSource;
 
-public class AxiomSoap12BodyTest extends AbstractSoap12BodyTest {
+public class AxiomSoap12BodyTests extends AbstractSoap12BodyTests {
 
 	@Override
 	protected SoapBody createSoapBody() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12EnvelopeTests.java

@@ -19,9 +19,9 @@ package org.springframework.ws.soap.axiom;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.springframework.ws.soap.SoapEnvelope;
-import org.springframework.ws.soap.soap12.AbstractSoap12EnvelopeTest;
+import org.springframework.ws.soap.soap12.AbstractSoap12EnvelopeTests;
 
-public class AxiomSoap12EnvelopeTest extends AbstractSoap12EnvelopeTest {
+public class AxiomSoap12EnvelopeTests extends AbstractSoap12EnvelopeTests {
 
 	@Override
 	protected SoapEnvelope createSoapEnvelope() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12HeaderTests.java

@@ -19,9 +19,9 @@ package org.springframework.ws.soap.axiom;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.springframework.ws.soap.SoapHeader;
-import org.springframework.ws.soap.soap12.AbstractSoap12HeaderTest;
+import org.springframework.ws.soap.soap12.AbstractSoap12HeaderTests;
 
-public class AxiomSoap12HeaderTest extends AbstractSoap12HeaderTest {
+public class AxiomSoap12HeaderTests extends AbstractSoap12HeaderTests {
 
 	@Override
 	protected SoapHeader createSoapHeader() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageFactoryTests.java

@@ -19,9 +19,9 @@ package org.springframework.ws.soap.axiom;
 import org.springframework.ws.InvalidXmlException;
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.soap.SoapVersion;
-import org.springframework.ws.soap.soap12.AbstractSoap12MessageFactoryTest;
+import org.springframework.ws.soap.soap12.AbstractSoap12MessageFactoryTests;
 
-public class AxiomSoap12MessageFactoryTest extends AbstractSoap12MessageFactoryTest {
+public class AxiomSoap12MessageFactoryTests extends AbstractSoap12MessageFactoryTests {
 
 	@Override
 	protected WebServiceMessageFactory createMessageFactory() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTests.java

@@ -19,9 +19,9 @@ package org.springframework.ws.soap.axiom;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.soap.SOAPFactory;
 import org.springframework.ws.soap.SoapMessage;
-import org.springframework.ws.soap.soap12.AbstractSoap12MessageTest;
+import org.springframework.ws.soap.soap12.AbstractSoap12MessageTests;
 
-public class AxiomSoap12MessageTest extends AbstractSoap12MessageTest {
+public class AxiomSoap12MessageTests extends AbstractSoap12MessageTests {
 
 	@Override
 	protected String getNS() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingBodyTests.java

@@ -18,9 +18,9 @@ package org.springframework.ws.soap.axiom;
 
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapVersion;
-import org.springframework.ws.soap.soap12.AbstractSoap12BodyTest;
+import org.springframework.ws.soap.soap12.AbstractSoap12BodyTests;
 
-public class AxiomSoap12NonCachingBodyTest extends AbstractSoap12BodyTest {
+public class AxiomSoap12NonCachingBodyTests extends AbstractSoap12BodyTests {
 
 	@Override
 	protected SoapBody createSoapBody() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTests.java

@@ -21,11 +21,11 @@ import org.apache.axiom.om.OMSourcedElement;
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.SoapVersion;
-import org.springframework.ws.soap.soap12.AbstractSoap12MessageTest;
+import org.springframework.ws.soap.soap12.AbstractSoap12MessageTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class AxiomSoap12NonCachingMessageTest extends AbstractSoap12MessageTest {
+public class AxiomSoap12NonCachingMessageTests extends AbstractSoap12MessageTests {
 
 	@Override
 	protected String getNS() {

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoapFaultDetailTests.java

@@ -30,7 +30,7 @@ import org.springframework.ws.soap.SoapFaultDetail;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SuppressWarnings("Since15")
-public class AxiomSoapFaultDetailTest {
+public class AxiomSoapFaultDetailTests {
 
 	private static final String FAILING_FAULT = "<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" "
 			+ "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" "

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/NonCachingPayloadTests.java

@@ -31,7 +31,7 @@ import org.springframework.util.xml.StaxUtils;
 import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 @SuppressWarnings("Since15")
-public class NonCachingPayloadTest {
+public class NonCachingPayloadTests {
 
 	private Payload payload;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/support/AxiomUtilsTests.java

@@ -44,7 +44,7 @@ import org.springframework.xml.sax.SaxUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class AxiomUtilsTest {
+public class AxiomUtilsTests {
 
 	private OMElement element;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTests.java

@@ -32,7 +32,7 @@ import org.springframework.ws.transport.TransportConstants;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SaajSoapActionCallbackTest {
+public class SaajSoapActionCallbackTests {
 
 	private SaajSoapMessageFactory saaj11Factory = new SaajSoapMessageFactory();
 

spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTests.java

@@ -25,11 +25,11 @@ import jakarta.xml.soap.SOAPMessage;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.ws.soap.SoapBody;
-import org.springframework.ws.soap.soap11.AbstractSoap11BodyTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11BodyTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SaajSoap11BodyTest extends AbstractSoap11BodyTest {
+public class SaajSoap11BodyTests extends AbstractSoap11BodyTests {
 
 	@Override
 	protected SoapBody createSoapBody() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTests.java

@@ -21,9 +21,9 @@ import jakarta.xml.soap.SOAPConstants;
 import jakarta.xml.soap.SOAPMessage;
 
 import org.springframework.ws.soap.SoapEnvelope;
-import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTests;
 
-public class SaajSoap11EnvelopeTest extends AbstractSoap11EnvelopeTest {
+public class SaajSoap11EnvelopeTests extends AbstractSoap11EnvelopeTests {
 
 	@Override
 	protected SoapEnvelope createSoapEnvelope() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTests.java

@@ -21,9 +21,9 @@ import jakarta.xml.soap.SOAPConstants;
 import jakarta.xml.soap.SOAPMessage;
 
 import org.springframework.ws.soap.SoapHeader;
-import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTest;
+import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTests;
 
-public class SaajSoap11HeaderTest extends AbstractSoap11HeaderTest {
+public class SaajSoap11HeaderTests extends AbstractSoap11HeaderTests {
 
 	@Override
 	protected SoapHeader createSoapHeader() throws Exception {