Name test classes consistently

Closes gh-1468

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

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

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

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

spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.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 AbstractSoap11WebServiceTemplateIntegrationTestCase {
+public abstract class AbstractSoap11WebServiceTemplateIntegrationTest {
 
 	private static Server jettyServer;
 

spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.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 AbstractSoap12WebServiceTemplateIntegrationTestCase {
+public abstract class AbstractSoap12WebServiceTemplateIntegrationTest {
 
 	private static Server jettyServer;
 

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

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

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

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

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

@@ -25,10 +25,10 @@ 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.AbstractWebServiceMessageTestCase;
+import org.springframework.ws.AbstractWebServiceMessageTest;
 import org.springframework.ws.WebServiceMessage;
 
-public abstract class AbstractMimeMessageTestCase extends AbstractWebServiceMessageTestCase {
+public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageTest {
 
 	protected MimeMessage mimeMessage;
 
@@ -42,7 +42,7 @@ public abstract class AbstractMimeMessageTestCase extends AbstractWebServiceMess
 	protected final WebServiceMessage createWebServiceMessage() throws Exception {
 
 		mimeMessage = createMimeMessage();
-		picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTestCase.class);
+		picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTest.class);
 		contentId = "spring-ws";
 		contentType = "image/png";
 		return mimeMessage;

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

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

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

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

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

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

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

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

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

@@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.*;
 import org.dom4j.Document;
 import org.dom4j.Element;
 
-public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTestCase {
+public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override
 	protected PayloadEndpoint createResponseEndpoint() {

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

@@ -21,7 +21,7 @@ import org.w3c.dom.Element;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class DomPayloadEndpointTest extends AbstractPayloadEndpointTestCase {
+public class DomPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override
 	protected PayloadEndpoint createNoResponseEndpoint() throws Exception {

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

@@ -21,7 +21,7 @@ import org.jdom2.Namespace;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTestCase {
+public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override
 	protected PayloadEndpoint createNoResponseEndpoint() throws Exception {

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

@@ -27,7 +27,7 @@ import org.springframework.xml.transform.StringSource;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public class SaxPayloadEndpointTest extends AbstractPayloadEndpointTestCase {
+public class SaxPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override
 	protected PayloadEndpoint createNoResponseEndpoint() {

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

@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @see AbstractStaxEventPayloadEndpoint
  */
 @SuppressWarnings("Since15")
-public class StaxEventPayloadEndpointTest extends AbstractMessageEndpointTestCase {
+public class StaxEventPayloadEndpointTest extends AbstractMessageEndpointTest {
 
 	@Override
 	protected MessageEndpoint createNoResponseEndpoint() {

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

@@ -42,7 +42,7 @@ import org.xmlunit.assertj.XmlAssert;
  * @see AbstractStaxStreamPayloadEndpoint
  */
 @SuppressWarnings("Since15")
-public class StaxStreamPayloadEndpointTest extends AbstractMessageEndpointTestCase {
+public class StaxStreamPayloadEndpointTest extends AbstractMessageEndpointTest {
 
 	@Override
 	protected MessageEndpoint createNoResponseEndpoint() {

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

@@ -20,7 +20,7 @@ import static org.assertj.core.api.Assertions.*;
 
 import nu.xom.Element;
 
-public class XomPayloadEndpointTest extends AbstractPayloadEndpointTestCase {
+public class XomPayloadEndpointTest extends AbstractPayloadEndpointTest {
 
 	@Override
 	protected PayloadEndpoint createNoResponseEndpoint() {

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

@@ -31,7 +31,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.xml.transform.StringSource;
 import org.springframework.xml.transform.TransformerObjectSupport;
 
-public class AbstractMethodArgumentResolverTestCase extends TransformerObjectSupport {
+public class AbstractMethodArgumentResolverTest 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/AbstractPayloadMethodProcessorTest.java

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

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.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 AbstractMethodArgumentResolverTestCase {
+public class MarshallingPayloadMethodProcessorTest extends AbstractMethodArgumentResolverTest {
 
 	private MarshallingPayloadMethodProcessor processor;
 

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

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

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

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

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

@@ -22,12 +22,12 @@ import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.springframework.core.MethodParameter;
-import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTestCase;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest;
 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;
 
-public class Dom4jPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTestCase {
+public class Dom4jPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest {
 
 	@Override
 	protected AbstractPayloadSourceMethodProcessor createProcessor() {

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

@@ -23,7 +23,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.springframework.core.MethodParameter;
-import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTestCase;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest;
 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;
@@ -31,7 +31,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-public class DomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTestCase {
+public class DomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest {
 
 	@Override
 	protected AbstractPayloadSourceMethodProcessor createProcessor() {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTest.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.AbstractPayloadMethodProcessorTestCase;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest;
 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 AbstractPayloadMethodProcessorTestCase {
+public class JDomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest {
 
 	@Override
 	protected AbstractPayloadSourceMethodProcessor createProcessor() {

spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTest.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.AbstractPayloadMethodProcessorTestCase;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest;
 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 AbstractPayloadMethodProcessorTestCase {
+public class XomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest {
 
 	@Override
 	protected AbstractPayloadSourceMethodProcessor createProcessor() {

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

@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xmlunit.assertj.XmlAssert;
 
-public abstract class AbstractSoapBodyTestCase extends AbstractSoapElementTestCase {
+public abstract class AbstractSoapBodyTest extends AbstractSoapElementTest {
 
 	protected SoapBody soapBody;
 

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

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

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

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

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

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

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

@@ -18,14 +18,14 @@ package org.springframework.ws.soap;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.ws.AbstractWebServiceMessageFactoryTestCase;
+import org.springframework.ws.AbstractWebServiceMessageFactoryTest;
 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 AbstractSoapMessageFactoryTestCase extends AbstractWebServiceMessageFactoryTestCase {
+public abstract class AbstractSoapMessageFactoryTest extends AbstractWebServiceMessageFactoryTest {
 
 	@Test
 	public void testCreateEmptySoapMessage() {

spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.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.AbstractMimeMessageTestCase;
+import org.springframework.ws.mime.AbstractMimeMessageTest;
 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 AbstractSoapMessageTestCase extends AbstractMimeMessageTestCase {
+public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest {
 
 	protected abstract String getNS();
 

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

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

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

@@ -31,7 +31,7 @@ import javax.xml.namespace.QName;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.ws.soap.addressing.AbstractWsAddressingTestCase;
+import org.springframework.ws.soap.addressing.AbstractWsAddressingTest;
 import org.springframework.ws.soap.addressing.core.EndpointReference;
 import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy;
 import org.springframework.ws.soap.addressing.version.AddressingVersion;
@@ -41,7 +41,7 @@ import org.springframework.ws.transport.context.DefaultTransportContext;
 import org.springframework.ws.transport.context.TransportContext;
 import org.springframework.ws.transport.context.TransportContextHolder;
 
-public abstract class AbstractActionCallbackTestCase extends AbstractWsAddressingTestCase {
+public abstract class AbstractActionCallbackTest extends AbstractWsAddressingTest {
 
 	private ActionCallback callback;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.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 AbstractActionCallbackTestCase {
+public class ActionCallback10Test extends AbstractActionCallbackTest {
 
 	@Override
 	protected AddressingVersion getVersion() {

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.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 AbstractActionCallbackTestCase {
+public class ActionCallback200408Test extends AbstractActionCallbackTest {
 
 	@Override
 	protected AddressingVersion getVersion() {

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

@@ -29,7 +29,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.AbstractWsAddressingTestCase;
+import org.springframework.ws.soap.addressing.AbstractWsAddressingTest;
 import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy;
 import org.springframework.ws.soap.addressing.version.AddressingVersion;
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
@@ -37,7 +37,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.ws.transport.WebServiceConnection;
 import org.springframework.ws.transport.WebServiceMessageSender;
 
-public abstract class AbstractAddressingInterceptorTestCase extends AbstractWsAddressingTestCase {
+public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddressingTest {
 
 	protected AddressingEndpointInterceptor interceptor;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.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 AbstractAddressingInterceptorTestCase {
+public class AddressingInterceptor10Test extends AbstractAddressingInterceptorTest {
 
 	@Override
 	protected AddressingVersion getVersion() {

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.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 AbstractAddressingInterceptorTestCase {
+public class AddressingInterceptor200408Test extends AbstractAddressingInterceptorTest {
 
 	@Override
 	protected AddressingVersion getVersion() {

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.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.AbstractWsAddressingTestCase;
+import org.springframework.ws.soap.addressing.AbstractWsAddressingTest;
 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 AbstractWsAddressingTestCase {
+public class SimpleActionEndpointMappingTest extends AbstractWsAddressingTest {
 
 	private SimpleActionEndpointMapping mapping;
 

spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.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.AbstractSoap11BodyTestCase;
+import org.springframework.ws.soap.soap11.AbstractSoap11BodyTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SaajSoap11BodyTest extends AbstractSoap11BodyTestCase {
+public class SaajSoap11BodyTest extends AbstractSoap11BodyTest {
 
 	@Override
 	protected SoapBody createSoapBody() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.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.AbstractSoap11EnvelopeTestCase;
+import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTest;
 
-public class SaajSoap11EnvelopeTest extends AbstractSoap11EnvelopeTestCase {
+public class SaajSoap11EnvelopeTest extends AbstractSoap11EnvelopeTest {
 
 	@Override
 	protected SoapEnvelope createSoapEnvelope() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.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.AbstractSoap11HeaderTestCase;
+import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTest;
 
-public class SaajSoap11HeaderTest extends AbstractSoap11HeaderTestCase {
+public class SaajSoap11HeaderTest extends AbstractSoap11HeaderTest {
 
 	@Override
 	protected SoapHeader createSoapHeader() throws Exception {

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

@@ -29,11 +29,11 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.soap.SoapMessage;
-import org.springframework.ws.soap.soap11.AbstractSoap11MessageFactoryTestCase;
+import org.springframework.ws.soap.soap11.AbstractSoap11MessageFactoryTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SaajSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryTestCase {
+public class SaajSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryTest {
 
 	@Override
 	protected WebServiceMessageFactory createMessageFactory() throws Exception {

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

@@ -31,12 +31,12 @@ import javax.xml.transform.Source;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.ws.soap.SoapMessage;
-import org.springframework.ws.soap.soap11.AbstractSoap11MessageTestCase;
+import org.springframework.ws.soap.soap11.AbstractSoap11MessageTest;
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 import org.xmlunit.assertj.XmlAssert;
 
-public class SaajSoap11MessageTest extends AbstractSoap11MessageTestCase {
+public class SaajSoap11MessageTest extends AbstractSoap11MessageTest {
 
 	private SOAPMessage saajMessage;
 

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

@@ -21,9 +21,9 @@ import jakarta.xml.soap.SOAPConstants;
 import jakarta.xml.soap.SOAPMessage;
 
 import org.springframework.ws.soap.SoapBody;
-import org.springframework.ws.soap.soap12.AbstractSoap12BodyTestCase;
+import org.springframework.ws.soap.soap12.AbstractSoap12BodyTest;
 
-public class SaajSoap12BodyTest extends AbstractSoap12BodyTestCase {
+public class SaajSoap12BodyTest extends AbstractSoap12BodyTest {
 
 	@Override
 	protected SoapBody createSoapBody() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.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.soap12.AbstractSoap12EnvelopeTestCase;
+import org.springframework.ws.soap.soap12.AbstractSoap12EnvelopeTest;
 
-public class SaajSoap12EnvelopeTest extends AbstractSoap12EnvelopeTestCase {
+public class SaajSoap12EnvelopeTest extends AbstractSoap12EnvelopeTest {
 
 	@Override
 	protected SoapEnvelope createSoapEnvelope() throws Exception {

spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.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.soap12.AbstractSoap12HeaderTestCase;
+import org.springframework.ws.soap.soap12.AbstractSoap12HeaderTest;
 
-public class SaajSoap12HeaderTest extends AbstractSoap12HeaderTestCase {
+public class SaajSoap12HeaderTest extends AbstractSoap12HeaderTest {
 
 	@Override
 	protected SoapHeader createSoapHeader() throws Exception {

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

@@ -20,9 +20,9 @@ import jakarta.xml.soap.MessageFactory;
 import jakarta.xml.soap.SOAPConstants;
 
 import org.springframework.ws.WebServiceMessageFactory;
-import org.springframework.ws.soap.soap12.AbstractSoap12MessageFactoryTestCase;
+import org.springframework.ws.soap.soap12.AbstractSoap12MessageFactoryTest;
 
-public class SaajSoap12MessageFactoryTest extends AbstractSoap12MessageFactoryTestCase {
+public class SaajSoap12MessageFactoryTest extends AbstractSoap12MessageFactoryTest {
 
 	@Override
 	protected WebServiceMessageFactory createMessageFactory() throws Exception {

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

@@ -26,12 +26,12 @@ import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 
 import org.springframework.ws.soap.SoapMessage;
-import org.springframework.ws.soap.soap12.AbstractSoap12MessageTestCase;
+import org.springframework.ws.soap.soap12.AbstractSoap12MessageTest;
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
 import org.xmlunit.assertj.XmlAssert;
 
-public class SaajSoap12MessageTest extends AbstractSoap12MessageTestCase {
+public class SaajSoap12MessageTest extends AbstractSoap12MessageTest {
 
 	@Override
 	protected String getNS() {

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

@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.ws.context.MessageContext;
-import org.springframework.ws.server.endpoint.adapter.method.AbstractMethodArgumentResolverTestCase;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractMethodArgumentResolverTest;
 import org.springframework.ws.soap.SoapHeaderElement;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.server.endpoint.annotation.SoapHeader;
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 /**
  * @author Tareq Abedrabbo
  */
-public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodArgumentResolverTestCase {
+public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodArgumentResolverTest {
 
 	private static final QName HEADER_QNAME = new QName(NAMESPACE_URI, "header");
 

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

@@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.ws.context.MessageContext;
-import org.springframework.ws.server.endpoint.adapter.method.AbstractMethodArgumentResolverTestCase;
+import org.springframework.ws.server.endpoint.adapter.method.AbstractMethodArgumentResolverTest;
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapEnvelope;
 import org.springframework.ws.soap.SoapHeader;
@@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Arjen Poutsma
  */
-public class SoapMethodArgumentResolverTest extends AbstractMethodArgumentResolverTestCase {
+public class SoapMethodArgumentResolverTest extends AbstractMethodArgumentResolverTest {
 
 	private SoapMethodArgumentResolver resolver;
 

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

@@ -23,7 +23,7 @@ import javax.xml.namespace.QName;
 import org.junit.jupiter.api.Test;
 import org.xmlunit.assertj.XmlAssert;
 
-import org.springframework.ws.soap.AbstractSoapBodyTestCase;
+import org.springframework.ws.soap.AbstractSoapBodyTest;
 import org.springframework.ws.soap.SoapFault;
 import org.springframework.ws.soap.SoapFaultDetail;
 import org.springframework.ws.soap.SoapFaultDetailElement;
@@ -33,7 +33,7 @@ import org.springframework.xml.transform.StringSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap11BodyTestCase extends AbstractSoapBodyTestCase {
+public abstract class AbstractSoap11BodyTest extends AbstractSoapBodyTest {
 
 	@Test
 	public void testGetType() {

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

@@ -21,13 +21,13 @@ import javax.xml.namespace.QName;
 import org.junit.jupiter.api.Test;
 import org.xmlunit.assertj.XmlAssert;
 
-import org.springframework.ws.soap.AbstractSoapEnvelopeTestCase;
+import org.springframework.ws.soap.AbstractSoapEnvelopeTest;
 import org.springframework.ws.soap.SoapVersion;
 import org.springframework.xml.transform.StringResult;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap11EnvelopeTestCase extends AbstractSoapEnvelopeTestCase {
+public abstract class AbstractSoap11EnvelopeTest extends AbstractSoapEnvelopeTest {
 
 	@Test
 	public void testGetName() {

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

@@ -24,14 +24,14 @@ import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.Test;
 import org.xmlunit.assertj.XmlAssert;
 
-import org.springframework.ws.soap.AbstractSoapHeaderTestCase;
+import org.springframework.ws.soap.AbstractSoapHeaderTest;
 import org.springframework.ws.soap.SoapHeaderElement;
 import org.springframework.ws.soap.SoapVersion;
 import org.springframework.xml.transform.StringResult;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap11HeaderTestCase extends AbstractSoapHeaderTestCase {
+public abstract class AbstractSoap11HeaderTest extends AbstractSoapHeaderTest {
 
 	private static final String PREFIX = "spring";
 

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

@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.mime.Attachment;
-import org.springframework.ws.soap.AbstractSoapMessageFactoryTestCase;
+import org.springframework.ws.soap.AbstractSoapMessageFactoryTest;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.SoapVersion;
 import org.springframework.ws.transport.MockTransportInputStream;
@@ -34,7 +34,7 @@ import org.springframework.ws.transport.TransportInputStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapMessageFactoryTestCase {
+public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessageFactoryTest {
 
 	@Test
 	public void testCreateEmptySoap11Message() {
@@ -51,7 +51,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void testCreateSoapMessageNoAttachment() throws Exception {
 
-		InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11.xml");
+		InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11.xml");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type", "text/xml");
 		String soapAction = "\"http://springframework.org/spring-ws/Action\"";
@@ -72,7 +72,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void doTestCreateSoapMessageIllFormedXml() throws Exception {
 
-		InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11-ill-formed.xml");
+		InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-ill-formed.xml");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type", "text/xml");
 		TransportInputStream tis = new MockTransportInputStream(is, headers);
@@ -83,7 +83,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void testCreateSoapMessageSwA() throws Exception {
 
-		InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11-attachment.bin");
+		InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-attachment.bin");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type",
 				"multipart/related;" + "type=\"text/xml\";" + "boundary=\"----=_Part_0_11416420.1149699787554\"");
@@ -111,7 +111,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void testCreateSoapMessageMtom() throws Exception {
 
-		InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11-mtom.bin");
+		InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-mtom.bin");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type",
 				"multipart/related;" + "start-info=\"text/xml\";" + "type=\"application/xop+xml\";"
@@ -140,7 +140,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM
 	@Test
 	public void testCreateSoapMessageMtomWeirdStartInfo() throws Exception {
 
-		InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11-mtom.bin");
+		InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-mtom.bin");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type",
 				"multipart/related;" + "startinfo=\"text/xml\";" + "type=\"application/xop+xml\";"
@@ -165,7 +165,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM
 	@Test
 	public void testCreateSoapMessageUtf8ByteOrderMark() throws Exception {
 
-		InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11-utf8-bom.xml");
+		InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-utf8-bom.xml");
 		Map<String, String> headers = new HashMap<>();
 		headers.put("Content-Type", "text/xml; charset=UTF-8");
 		TransportInputStream tis = new MockTransportInputStream(is, headers);
@@ -178,7 +178,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM
 	@Test
 	public void testCreateSoapMessageUtf16BigEndianByteOrderMark() throws Exception {
 
-		InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11-utf16-be-bom.xml");
+		InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-utf16-be-bom.xml");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type", "text/xml; charset=UTF-16");
 		TransportInputStream tis = new MockTransportInputStream(is, headers);
@@ -191,7 +191,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM
 	@Test
 	public void testCreateSoapMessageUtf16LittleEndianByteOrderMark() throws Exception {
 
-		InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11-utf16-le-bom.xml");
+		InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-utf16-le-bom.xml");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type", "text/xml; charset=UTF-16");
 		TransportInputStream tis = new MockTransportInputStream(is, headers);
@@ -204,7 +204,7 @@ public abstract class AbstractSoap11MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void testCreateSoapMessageMissingContentType() throws Exception {
 
-		InputStream is = AbstractSoap11MessageFactoryTestCase.class.getResourceAsStream("soap11.xml");
+		InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11.xml");
 		TransportInputStream tis = new MockTransportInputStream(is, Collections.emptyMap());
 
 		WebServiceMessage message = messageFactory.createWebServiceMessage(tis);

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

@@ -33,7 +33,7 @@ import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.InputStreamSource;
 import org.springframework.core.io.Resource;
-import org.springframework.ws.soap.AbstractSoapMessageTestCase;
+import org.springframework.ws.soap.AbstractSoapMessageTest;
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapVersion;
 import org.springframework.ws.transport.MockTransportOutputStream;
@@ -42,11 +42,11 @@ import org.springframework.xml.transform.StringSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageTestCase {
+public abstract class AbstractSoap11MessageTest extends AbstractSoapMessageTest {
 
 	@Override
 	protected final Resource[] getSoapSchemas() {
-		return new Resource[] { new ClassPathResource("soap11.xsd", AbstractSoap11MessageTestCase.class) };
+		return new Resource[] { new ClassPathResource("soap11.xsd", AbstractSoap11MessageTest.class) };
 	}
 
 	@Override

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

@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
 import org.junit.jupiter.api.Test;
 import org.xmlunit.assertj.XmlAssert;
 
-import org.springframework.ws.soap.AbstractSoapBodyTestCase;
+import org.springframework.ws.soap.AbstractSoapBodyTest;
 import org.springframework.ws.soap.SoapFault;
 import org.springframework.ws.soap.SoapFaultDetail;
 import org.springframework.ws.soap.SoapFaultDetailElement;
@@ -34,7 +34,7 @@ import org.springframework.xml.transform.StringSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap12BodyTestCase extends AbstractSoapBodyTestCase {
+public abstract class AbstractSoap12BodyTest extends AbstractSoapBodyTest {
 
 	@Test
 	public void testGetType() {

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

@@ -21,13 +21,13 @@ import javax.xml.namespace.QName;
 import org.junit.jupiter.api.Test;
 import org.xmlunit.assertj.XmlAssert;
 
-import org.springframework.ws.soap.AbstractSoapEnvelopeTestCase;
+import org.springframework.ws.soap.AbstractSoapEnvelopeTest;
 import org.springframework.ws.soap.SoapVersion;
 import org.springframework.xml.transform.StringResult;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap12EnvelopeTestCase extends AbstractSoapEnvelopeTestCase {
+public abstract class AbstractSoap12EnvelopeTest extends AbstractSoapEnvelopeTest {
 
 	@Test
 	public void testGetName() {

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

@@ -24,14 +24,14 @@ import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.Test;
 import org.xmlunit.assertj.XmlAssert;
 
-import org.springframework.ws.soap.AbstractSoapHeaderTestCase;
+import org.springframework.ws.soap.AbstractSoapHeaderTest;
 import org.springframework.ws.soap.SoapHeaderElement;
 import org.springframework.ws.soap.SoapVersion;
 import org.springframework.xml.transform.StringResult;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap12HeaderTestCase extends AbstractSoapHeaderTestCase {
+public abstract class AbstractSoap12HeaderTest extends AbstractSoapHeaderTest {
 
 	@Test
 	public void testGetType() {

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

@@ -24,7 +24,7 @@ import java.util.Map;
 
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.mime.Attachment;
-import org.springframework.ws.soap.AbstractSoapMessageFactoryTestCase;
+import org.springframework.ws.soap.AbstractSoapMessageFactoryTest;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.SoapVersion;
 import org.springframework.ws.transport.MockTransportInputStream;
@@ -33,7 +33,7 @@ import org.springframework.ws.transport.TransportInputStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapMessageFactoryTestCase {
+public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessageFactoryTest {
 
 	@Override
 	public void testCreateEmptyMessage() {
@@ -50,7 +50,7 @@ public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void testCreateSoapMessageNoAttachment() throws Exception {
 
-		InputStream is = AbstractSoap12MessageFactoryTestCase.class.getResourceAsStream("soap12.xml");
+		InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12.xml");
 		Map<String, String> headers = new HashMap<String, String>();
 		String soapAction = "\"http://springframework.org/spring-ws/Action\"";
 		headers.put(TransportConstants.HEADER_CONTENT_TYPE, "application/soap+xml; action=" + soapAction);
@@ -68,7 +68,7 @@ public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void doTestCreateSoapMessageIllFormedXml() throws Exception {
 
-		InputStream is = AbstractSoap12MessageFactoryTestCase.class.getResourceAsStream("soap12-ill-formed.xml");
+		InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12-ill-formed.xml");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put(TransportConstants.HEADER_CONTENT_TYPE, "application/soap+xml");
 		TransportInputStream tis = new MockTransportInputStream(is, headers);
@@ -79,7 +79,7 @@ public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void testCreateSoapMessageSwA() throws Exception {
 
-		InputStream is = AbstractSoap12MessageFactoryTestCase.class.getResourceAsStream("soap12-attachment.bin");
+		InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12-attachment.bin");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type", "multipart/related;" + "type=\"application/soap+xml\";"
 				+ "boundary=\"----=_Part_0_11416420.1149699787554\"");
@@ -102,7 +102,7 @@ public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void testCreateSoapMessageMtom() throws Exception {
 
-		InputStream is = AbstractSoap12MessageFactoryTestCase.class.getResourceAsStream("soap12-mtom.bin");
+		InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12-mtom.bin");
 		Map<String, String> headers = new HashMap<String, String>();
 		headers.put("Content-Type",
 				"multipart/related;" + "start-info=\"application/soap+xml\";" + "type=\"application/xop+xml\";"
@@ -129,7 +129,7 @@ public abstract class AbstractSoap12MessageFactoryTestCase extends AbstractSoapM
 	@Override
 	public void testCreateSoapMessageMissingContentType() throws Exception {
 
-		InputStream is = AbstractSoap12MessageFactoryTestCase.class.getResourceAsStream("soap12.xml");
+		InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12.xml");
 		TransportInputStream tis = new MockTransportInputStream(is, Collections.emptyMap());
 
 		WebServiceMessage message = messageFactory.createWebServiceMessage(tis);

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

@@ -33,7 +33,7 @@ import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.InputStreamSource;
 import org.springframework.core.io.Resource;
-import org.springframework.ws.soap.AbstractSoapMessageTestCase;
+import org.springframework.ws.soap.AbstractSoapMessageTest;
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapVersion;
 import org.springframework.ws.transport.MockTransportOutputStream;
@@ -43,7 +43,7 @@ import org.springframework.xml.transform.StringSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageTestCase {
+public abstract class AbstractSoap12MessageTest extends AbstractSoapMessageTest {
 
 	@Override
 	public void testGetVersion() {
@@ -53,8 +53,8 @@ public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageT
 	@Override
 	protected final Resource[] getSoapSchemas() {
 
-		return new Resource[] { new ClassPathResource("xml.xsd", AbstractSoap12MessageTestCase.class),
-				new ClassPathResource("soap12.xsd", AbstractSoap12MessageTestCase.class) };
+		return new Resource[] { new ClassPathResource("xml.xsd", AbstractSoap12MessageTest.class),
+				new ClassPathResource("soap12.xsd", AbstractSoap12MessageTest.class) };
 	}
 
 	@Override

spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java

@@ -61,7 +61,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractHttpWebServiceMessageSenderIntegrationTestCase<T extends AbstractHttpWebServiceMessageSender> {
+public abstract class AbstractHttpWebServiceMessageSenderIntegrationTest<T extends AbstractHttpWebServiceMessageSender> {
 
 	private Server jettyServer;
 

spring-ws-core/src/test/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSenderIntegrationTest.java

@@ -17,7 +17,7 @@
 package org.springframework.ws.transport.http;
 
 public class ClientHttpRequestMessageSenderIntegrationTest
-		extends AbstractHttpWebServiceMessageSenderIntegrationTestCase<ClientHttpRequestMessageSender> {
+		extends AbstractHttpWebServiceMessageSenderIntegrationTest<ClientHttpRequestMessageSender> {
 
 	@Override
 	protected ClientHttpRequestMessageSender createMessageSender() {

spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java

@@ -40,7 +40,7 @@ import org.springframework.ws.transport.WebServiceConnection;
 import org.springframework.ws.transport.support.FreePortScanner;
 
 public class CommonsHttpMessageSenderIntegrationTest
-		extends AbstractHttpWebServiceMessageSenderIntegrationTestCase<CommonsHttpMessageSender> {
+		extends AbstractHttpWebServiceMessageSenderIntegrationTest<CommonsHttpMessageSender> {
 
 	@Override
 	protected CommonsHttpMessageSender createMessageSender() {

spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java

@@ -23,7 +23,7 @@ import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 class HttpComponents5ContentTypeIntegrationTest
-		extends AbstractHttpWebServiceMessageSenderIntegrationTestCase<HttpComponents5MessageSender> {
+		extends AbstractHttpWebServiceMessageSenderIntegrationTest<HttpComponents5MessageSender> {
 
 	@Override
 	protected HttpComponents5MessageSender createMessageSender() {

spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderIntegrationTest.java

@@ -46,7 +46,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.springframework.ws.transport.http.HttpComponents5ClientFactory.getPort;
 
 class HttpComponents5MessageSenderIntegrationTest
-		extends AbstractHttpWebServiceMessageSenderIntegrationTestCase<HttpComponents5MessageSender> {
+		extends AbstractHttpWebServiceMessageSenderIntegrationTest<HttpComponents5MessageSender> {
 
 	@Override
 	protected HttpComponents5MessageSender createMessageSender() {

spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTest.java

@@ -46,7 +46,7 @@ import org.springframework.ws.transport.support.FreePortScanner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class HttpComponentsMessageSenderIntegrationTest
-		extends AbstractHttpWebServiceMessageSenderIntegrationTestCase<HttpComponentsMessageSender> {
+		extends AbstractHttpWebServiceMessageSenderIntegrationTest<HttpComponentsMessageSender> {
 
 	@Override
 	protected HttpComponentsMessageSender createMessageSender() {

spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java

@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class HttpUrlConnectionMessageSenderIntegrationTest
-		extends AbstractHttpWebServiceMessageSenderIntegrationTestCase<HttpUrlConnectionMessageSender> {
+		extends AbstractHttpWebServiceMessageSenderIntegrationTest<HttpUrlConnectionMessageSender> {
 
 	@Override
 	protected HttpUrlConnectionMessageSender createMessageSender() {

spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTest.java

@@ -17,7 +17,7 @@
 package org.springframework.ws.transport.http;
 
 public class JdkHttpClientMessageSenderIntegrationTest
-		extends AbstractHttpWebServiceMessageSenderIntegrationTestCase<JdkHttpClientMessageSender> {
+		extends AbstractHttpWebServiceMessageSenderIntegrationTest<JdkHttpClientMessageSender> {
 
 	@Override
 	protected JdkHttpClientMessageSender createMessageSender() {

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTest.java

@@ -16,6 +16,6 @@
 
 package org.springframework.ws.soap.security.wss4j2;
 
-public class SaajWss4jInterceptorTest extends Wss4jInterceptorTestCase {
+public class SaajWss4jInterceptorTest extends Wss4jInterceptorTest {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTest.java

@@ -16,6 +16,6 @@
 
 package org.springframework.ws.soap.security.wss4j2;
 
-public class SaajWss4jMessageInterceptorEncryptionTest extends Wss4jMessageInterceptorEncryptionTestCase {
+public class SaajWss4jMessageInterceptorEncryptionTest extends Wss4jMessageInterceptorEncryptionTest {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTest.java

@@ -16,6 +16,6 @@
 
 package org.springframework.ws.soap.security.wss4j2;
 
-public class SaajWss4jMessageInterceptorHeaderTest extends Wss4jMessageInterceptorHeaderTestCase {
+public class SaajWss4jMessageInterceptorHeaderTest extends Wss4jMessageInterceptorHeaderTest {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTest.java

@@ -16,6 +16,6 @@
 
 package org.springframework.ws.soap.security.wss4j2;
 
-public class SaajWss4jMessageInterceptorSamlTest extends Wss4jMessageInterceptorSamlTestCase {
+public class SaajWss4jMessageInterceptorSamlTest extends Wss4jMessageInterceptorSamlTest {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java

@@ -40,7 +40,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptorSignTestCase {
+public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptorSignTest {
 
 	private static final String PAYLOAD = "<tru:StockSymbol xmlns:tru=\"http://fabrikam123.com/payloads\">QQQ</tru:StockSymbol>";
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTest.java

@@ -16,6 +16,6 @@
 
 package org.springframework.ws.soap.security.wss4j2;
 
-public class SaajWss4jMessageInterceptorSoapActionTest extends Wss4jMessageInterceptorSoapActionTestCase {
+public class SaajWss4jMessageInterceptorSoapActionTest extends Wss4jMessageInterceptorSoapActionTest {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java

@@ -17,6 +17,6 @@
 package org.springframework.ws.soap.security.wss4j2;
 
 public class SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest
-		extends Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase {
+		extends Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTest.java

@@ -16,6 +16,6 @@
 
 package org.springframework.ws.soap.security.wss4j2;
 
-public class SaajWss4jMessageInterceptorTimestampTest extends Wss4jMessageInterceptorTimestampTestCase {
+public class SaajWss4jMessageInterceptorTimestampTest extends Wss4jMessageInterceptorTimestampTest {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTest.java

@@ -17,6 +17,6 @@
 package org.springframework.ws.soap.security.wss4j2;
 
 public class SaajWss4jMessageInterceptorUsernameTokenSignatureTest
-		extends Wss4jMessageInterceptorUsernameTokenSignatureTestCase {
+		extends Wss4jMessageInterceptorUsernameTokenSignatureTest {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTest.java

@@ -16,6 +16,6 @@
 
 package org.springframework.ws.soap.security.wss4j2;
 
-public class SaajWss4jMessageInterceptorUsernameTokenTest extends Wss4jMessageInterceptorUsernameTokenTestCase {
+public class SaajWss4jMessageInterceptorUsernameTokenTest extends Wss4jMessageInterceptorUsernameTokenTest {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Test.java

@@ -19,6 +19,6 @@ package org.springframework.ws.soap.security.wss4j2;
 /**
  * @author tareq
  */
-public class SaajWss4jMessageInterceptorX509Test extends Wss4jMessageInterceptorX509TestCase {
+public class SaajWss4jMessageInterceptorX509Test extends Wss4jMessageInterceptorX509Test {
 
 }

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTest.java

@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.springframework.test.util.AssertionErrors.assertEquals;
 
-public class SaajWss4jSecurityInterceptorDefaultsTest extends Wss4jTestCase {
+public class SaajWss4jSecurityInterceptorDefaultsTest extends Wss4jTest {
 
 	private static final String PAYLOAD = "<tru:StockSymbol xmlns:tru=\"http://fabrikam123.com/payloads\">QQQ</tru:StockSymbol>";
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTest.java

@@ -29,7 +29,7 @@ import org.springframework.ws.soap.security.WsSecurityValidationException;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-public abstract class Wss4jInterceptorTestCase extends Wss4jTestCase {
+public abstract class Wss4jInterceptorTest extends Wss4jTest {
 
 	@Test
 	public void testHandleRequest() throws Exception {

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java

@@ -27,7 +27,7 @@ import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.security.wss4j2.callback.KeyStoreCallbackHandler;
 import org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean;
 
-public abstract class Wss4jMessageInterceptorEncryptionTestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorEncryptionTest extends Wss4jTest {
 
 	protected Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java

@@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.fail;
  * @author Tareq Abedrabbo
  * @author Greg Turnquist
  */
-public abstract class Wss4jMessageInterceptorHeaderTestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorHeaderTest extends Wss4jTest {
 
 	private Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java

@@ -37,7 +37,7 @@ import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean;
 
-public abstract class Wss4jMessageInterceptorSamlTestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorSamlTest extends Wss4jTest {
 
 	protected Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java

@@ -29,7 +29,7 @@ import org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class Wss4jMessageInterceptorSignTestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorSignTest extends Wss4jTest {
 
 	protected Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java

@@ -29,7 +29,7 @@ import org.springframework.ws.soap.security.wss4j2.callback.SimplePasswordValida
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class Wss4jMessageInterceptorSoapActionTestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorSoapActionTest extends Wss4jTest {
 
 	private static final String SOAP_ACTION = "\"http://test\"";
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java

@@ -36,7 +36,7 @@ import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
-public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest extends Wss4jTest {
 
 	private Properties users = new Properties();
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java

@@ -30,7 +30,7 @@ import org.springframework.ws.soap.security.WsSecurityValidationException;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public abstract class Wss4jMessageInterceptorTimestampTestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorTimestampTest extends Wss4jTest {
 
 	@Test
 	public void testAddTimestamp() throws Exception {

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTest.java

@@ -22,7 +22,7 @@ import org.w3c.dom.Document;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapMessage;
 
-public abstract class Wss4jMessageInterceptorUsernameTokenSignatureTestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorUsernameTokenSignatureTest extends Wss4jTest {
 
 	@Test
 	public void testAddUsernameTokenSignature() throws Exception {

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java

@@ -29,7 +29,7 @@ import org.springframework.ws.soap.security.wss4j2.callback.SimplePasswordValida
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class Wss4jMessageInterceptorUsernameTokenTestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorUsernameTokenTest extends Wss4jTest {
 
 	private Properties users = new Properties();
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java

@@ -25,7 +25,7 @@ import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean;
 
-public abstract class Wss4jMessageInterceptorX509TestCase extends Wss4jTestCase {
+public abstract class Wss4jMessageInterceptorX509Test extends Wss4jTest {
 
 	protected Wss4jSecurityInterceptor interceptor;
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java

@@ -45,7 +45,7 @@ import org.springframework.xml.xpath.Jaxp13XPathTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class Wss4jTestCase {
+public abstract class Wss4jTest {
 
 	protected MessageFactory saajSoap11MessageFactory;
 

spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java

@@ -39,7 +39,7 @@ import org.springframework.xml.transform.ResourceSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class AbstractValidatorFactoryTestCase {
+public abstract class AbstractValidatorFactoryTest {
 
 	private XmlValidator validator;
 
@@ -51,10 +51,10 @@ public abstract class AbstractValidatorFactoryTestCase {
 	public void setUp() throws Exception {
 
 		Resource[] schemaResource = new Resource[] {
-				new ClassPathResource("schema.xsd", AbstractValidatorFactoryTestCase.class) };
+				new ClassPathResource("schema.xsd", AbstractValidatorFactoryTest.class) };
 		validator = createValidator(schemaResource, XmlValidatorFactory.SCHEMA_W3C_XML);
-		validInputStream = AbstractValidatorFactoryTestCase.class.getResourceAsStream("validDocument.xml");
-		invalidInputStream = AbstractValidatorFactoryTestCase.class.getResourceAsStream("invalidDocument.xml");
+		validInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("validDocument.xml");
+		invalidInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("invalidDocument.xml");
 	}
 
 	@AfterEach
@@ -78,7 +78,7 @@ public abstract class AbstractValidatorFactoryTestCase {
 	public void testValidateTwice() throws Exception {
 
 		validator.validate(new StreamSource(validInputStream));
-		validInputStream = AbstractValidatorFactoryTestCase.class.getResourceAsStream("validDocument.xml");
+		validInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("validDocument.xml");
 		validator.validate(new StreamSource(validInputStream));
 	}
 
@@ -133,19 +133,19 @@ public abstract class AbstractValidatorFactoryTestCase {
 	public void testMultipleSchemasValidMessage() throws Exception {
 
 		Resource[] schemaResources = new Resource[] {
-				new ClassPathResource("multipleSchemas1.xsd", AbstractValidatorFactoryTestCase.class),
-				new ClassPathResource("multipleSchemas2.xsd", AbstractValidatorFactoryTestCase.class) };
+				new ClassPathResource("multipleSchemas1.xsd", AbstractValidatorFactoryTest.class),
+				new ClassPathResource("multipleSchemas2.xsd", AbstractValidatorFactoryTest.class) };
 		validator = createValidator(schemaResources, XmlValidatorFactory.SCHEMA_W3C_XML);
 
 		Source document = new ResourceSource(
-				new ClassPathResource("multipleSchemas1.xml", AbstractValidatorFactoryTestCase.class));
+				new ClassPathResource("multipleSchemas1.xml", AbstractValidatorFactoryTest.class));
 		SAXParseException[] errors = validator.validate(document);
 
 		assertThat(errors).isEmpty();
 
 		validator = createValidator(schemaResources, XmlValidatorFactory.SCHEMA_W3C_XML);
 		document = new ResourceSource(
-				new ClassPathResource("multipleSchemas2.xml", AbstractValidatorFactoryTestCase.class));
+				new ClassPathResource("multipleSchemas2.xml", AbstractValidatorFactoryTest.class));
 		errors = validator.validate(document);
 
 		assertThat(errors).isEmpty();

spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 
 import org.springframework.core.io.Resource;
 
-public class Jaxp13ValidatorFactoryTest extends AbstractValidatorFactoryTestCase {
+public class Jaxp13ValidatorFactoryTest extends AbstractValidatorFactoryTest {
 
 	@Override
 	protected XmlValidator createValidator(Resource[] schemaResources, String schemaLanguage) throws IOException {

spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTest.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 
 import org.springframework.core.io.Resource;
 
-public class Jaxp15ValidatorFactoryTest extends AbstractValidatorFactoryTestCase {
+public class Jaxp15ValidatorFactoryTest extends AbstractValidatorFactoryTest {
 
 	@Override
 	protected XmlValidator createValidator(Resource[] schemaResources, String schemaLanguage) throws IOException {

spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java

@@ -36,7 +36,7 @@ public class XmlValidatorFactoryTest {
 	@Test
 	public void testCreateValidator() throws Exception {
 
-		Resource resource = new ClassPathResource("schema.xsd", AbstractValidatorFactoryTestCase.class);
+		Resource resource = new ClassPathResource("schema.xsd", AbstractValidatorFactoryTest.class);
 		XmlValidator validator = XmlValidatorFactory.createValidator(resource, XmlValidatorFactory.SCHEMA_W3C_XML);
 
 		assertThat(validator).isNotNull();
@@ -53,7 +53,7 @@ public class XmlValidatorFactoryTest {
 	public void testInvalidSchemaLanguage() {
 
 		assertThatIllegalArgumentException().isThrownBy(() -> XmlValidatorFactory
-			.createValidator(new ClassPathResource("schema.xsd", AbstractValidatorFactoryTestCase.class), "bla"));
+			.createValidator(new ClassPathResource("schema.xsd", AbstractValidatorFactoryTest.class), "bla"));
 	}
 
 	private static class NonExistentResource extends AbstractResource {

spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java

@@ -37,7 +37,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-public abstract class AbstractXPathExpressionFactoryTestCase {
+public abstract class AbstractXPathExpressionFactoryTest {
 
 	private Document noNamespacesDocument;