From fb4ab827c563f01500a2bb6699feda268395a3ee Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 21 Feb 2025 11:45:27 +0000 Subject: [PATCH] Name test classes consistently Closes gh-1468 --- ...AbstractWebServiceMessageFactoryTest.java} | 2 +- ...ava => AbstractWebServiceMessageTest.java} | 4 ++-- ...p11WebServiceTemplateIntegrationTest.java} | 2 +- ...p12WebServiceTemplateIntegrationTest.java} | 2 +- ...ap11WebServiceTemplateIntegrationTest.java | 2 +- ...ap12WebServiceTemplateIntegrationTest.java | 2 +- ...Case.java => AbstractMimeMessageTest.java} | 6 ++--- .../ws/pox/dom/DomPoxMessageFactoryTest.java | 4 ++-- ...estCase.java => AbstractEndpointTest.java} | 2 +- ....java => AbstractMessageEndpointTest.java} | 2 +- ....java => AbstractPayloadEndpointTest.java} | 2 +- .../endpoint/Dom4jPayloadEndpointTest.java | 2 +- .../endpoint/DomPayloadEndpointTest.java | 2 +- .../endpoint/JDomPayloadEndpointTest.java | 2 +- .../endpoint/SaxPayloadEndpointTest.java | 2 +- .../StaxEventPayloadEndpointTest.java | 2 +- .../StaxStreamPayloadEndpointTest.java | 2 +- .../endpoint/XomPayloadEndpointTest.java | 2 +- ...> AbstractMethodArgumentResolverTest.java} | 2 +- ...> AbstractPayloadMethodProcessorTest.java} | 2 +- ...MarshallingPayloadMethodProcessorTest.java | 2 +- .../SourcePayloadMethodProcessorTest.java | 2 +- ...StaxPayloadMethodArgumentResolverTest.java | 2 +- .../dom/Dom4jPayloadMethodProcessorTest.java | 4 ++-- .../dom/DomPayloadMethodProcessorTest.java | 4 ++-- .../dom/JDomPayloadMethodProcessorTest.java | 4 ++-- .../dom/XomPayloadMethodProcessorTest.java | 4 ++-- ...estCase.java => AbstractSoapBodyTest.java} | 2 +- ...Case.java => AbstractSoapElementTest.java} | 2 +- ...ase.java => AbstractSoapEnvelopeTest.java} | 2 +- ...tCase.java => AbstractSoapHeaderTest.java} | 2 +- ...va => AbstractSoapMessageFactoryTest.java} | 4 ++-- ...Case.java => AbstractSoapMessageTest.java} | 4 ++-- ...ase.java => AbstractWsAddressingTest.java} | 4 ++-- ...e.java => AbstractActionCallbackTest.java} | 4 ++-- .../client/ActionCallback10Test.java | 2 +- .../client/ActionCallback200408Test.java | 2 +- ...=> AbstractAddressingInterceptorTest.java} | 4 ++-- .../server/AddressingInterceptor10Test.java | 2 +- .../AddressingInterceptor200408Test.java | 2 +- .../SimpleActionEndpointMappingTest.java | 4 ++-- .../ws/soap/saaj/SaajSoap11BodyTest.java | 4 ++-- .../ws/soap/saaj/SaajSoap11EnvelopeTest.java | 4 ++-- .../ws/soap/saaj/SaajSoap11HeaderTest.java | 4 ++-- .../saaj/SaajSoap11MessageFactoryTest.java | 4 ++-- .../ws/soap/saaj/SaajSoap11MessageTest.java | 4 ++-- .../ws/soap/saaj/SaajSoap12BodyTest.java | 4 ++-- .../ws/soap/saaj/SaajSoap12EnvelopeTest.java | 4 ++-- .../ws/soap/saaj/SaajSoap12HeaderTest.java | 4 ++-- .../saaj/SaajSoap12MessageFactoryTest.java | 4 ++-- .../ws/soap/saaj/SaajSoap12MessageTest.java | 4 ++-- ...aderElementMethodArgumentResolverTest.java | 4 ++-- .../SoapMethodArgumentResolverTest.java | 4 ++-- ...tCase.java => AbstractSoap11BodyTest.java} | 4 ++-- ...e.java => AbstractSoap11EnvelopeTest.java} | 4 ++-- ...ase.java => AbstractSoap11HeaderTest.java} | 4 ++-- ... => AbstractSoap11MessageFactoryTest.java} | 22 +++++++++---------- ...se.java => AbstractSoap11MessageTest.java} | 6 ++--- ...tCase.java => AbstractSoap12BodyTest.java} | 4 ++-- ...e.java => AbstractSoap12EnvelopeTest.java} | 4 ++-- ...ase.java => AbstractSoap12HeaderTest.java} | 4 ++-- ... => AbstractSoap12MessageFactoryTest.java} | 14 ++++++------ ...se.java => AbstractSoap12MessageTest.java} | 8 +++---- ...bServiceMessageSenderIntegrationTest.java} | 2 +- ...tpRequestMessageSenderIntegrationTest.java | 2 +- ...mmonsHttpMessageSenderIntegrationTest.java | 2 +- ...Components5ContentTypeIntegrationTest.java | 2 +- ...mponents5MessageSenderIntegrationTest.java | 2 +- ...omponentsMessageSenderIntegrationTest.java | 2 +- ...onnectionMessageSenderIntegrationTest.java | 2 +- ...ttpClientMessageSenderIntegrationTest.java | 2 +- .../wss4j2/SaajWss4jInterceptorTest.java | 2 +- ...Wss4jMessageInterceptorEncryptionTest.java | 2 +- ...SaajWss4jMessageInterceptorHeaderTest.java | 2 +- .../SaajWss4jMessageInterceptorSamlTest.java | 2 +- .../SaajWss4jMessageInterceptorSignTest.java | 2 +- ...Wss4jMessageInterceptorSoapActionTest.java | 2 +- ...ptorSpringSecurityCallbackHandlerTest.java | 2 +- ...jWss4jMessageInterceptorTimestampTest.java | 2 +- ...InterceptorUsernameTokenSignatureTest.java | 2 +- ...4jMessageInterceptorUsernameTokenTest.java | 2 +- .../SaajWss4jMessageInterceptorX509Test.java | 2 +- ...jWss4jSecurityInterceptorDefaultsTest.java | 2 +- ...estCase.java => Wss4jInterceptorTest.java} | 2 +- ...ss4jMessageInterceptorEncryptionTest.java} | 2 +- ...=> Wss4jMessageInterceptorHeaderTest.java} | 2 +- ...a => Wss4jMessageInterceptorSamlTest.java} | 2 +- ...a => Wss4jMessageInterceptorSignTest.java} | 2 +- ...ss4jMessageInterceptorSoapActionTest.java} | 2 +- ...torSpringSecurityCallbackHandlerTest.java} | 2 +- ...Wss4jMessageInterceptorTimestampTest.java} | 2 +- ...nterceptorUsernameTokenSignatureTest.java} | 2 +- ...jMessageInterceptorUsernameTokenTest.java} | 2 +- ...a => Wss4jMessageInterceptorX509Test.java} | 2 +- .../{Wss4jTestCase.java => Wss4jTest.java} | 2 +- ...java => AbstractValidatorFactoryTest.java} | 18 +++++++-------- .../Jaxp13ValidatorFactoryTest.java | 2 +- .../Jaxp15ValidatorFactoryTest.java | 2 +- .../validation/XmlValidatorFactoryTest.java | 4 ++-- ...> AbstractXPathExpressionFactoryTest.java} | 2 +- ...se.java => AbstractXPathTemplateTest.java} | 19 ++++++++-------- .../JaxenXPathExpressionFactoryTest.java | 2 +- .../xml/xpath/JaxenXPathTemplateTest.java | 2 +- .../Jaxp13XPathExpressionFactoryTest.java | 2 +- .../xml/xpath/Jaxp13XPathTemplateTest.java | 2 +- ...stCase.java => AbstractXsdSchemaTest.java} | 20 ++++++++--------- .../xml/xsd/SimpleXsdSchemaTest.java | 2 +- .../CommonsXsdSchemaCollectionTest.java | 18 +++++++-------- .../xml/xsd/commons/CommonsXsdSchemaTest.java | 6 ++--- 109 files changed, 198 insertions(+), 199 deletions(-) rename spring-ws-core/src/test/java/org/springframework/ws/{AbstractWebServiceMessageFactoryTestCase.java => AbstractWebServiceMessageFactoryTest.java} (94%) rename spring-ws-core/src/test/java/org/springframework/ws/{AbstractWebServiceMessageTestCase.java => AbstractWebServiceMessageTest.java} (98%) rename spring-ws-core/src/test/java/org/springframework/ws/client/core/{AbstractSoap11WebServiceTemplateIntegrationTestCase.java => AbstractSoap11WebServiceTemplateIntegrationTest.java} (99%) rename spring-ws-core/src/test/java/org/springframework/ws/client/core/{AbstractSoap12WebServiceTemplateIntegrationTestCase.java => AbstractSoap12WebServiceTemplateIntegrationTest.java} (99%) rename spring-ws-core/src/test/java/org/springframework/ws/mime/{AbstractMimeMessageTestCase.java => AbstractMimeMessageTest.java} (93%) rename spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/{AbstractEndpointTestCase.java => AbstractEndpointTest.java} (98%) rename spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/{AbstractMessageEndpointTestCase.java => AbstractMessageEndpointTest.java} (96%) rename spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/{AbstractPayloadEndpointTestCase.java => AbstractPayloadEndpointTest.java} (96%) rename spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/{AbstractMethodArgumentResolverTestCase.java => AbstractMethodArgumentResolverTest.java} (97%) rename spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/{AbstractPayloadMethodProcessorTestCase.java => AbstractPayloadMethodProcessorTest.java} (97%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/{AbstractSoapBodyTestCase.java => AbstractSoapBodyTest.java} (97%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/{AbstractSoapElementTestCase.java => AbstractSoapElementTest.java} (97%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/{AbstractSoapEnvelopeTestCase.java => AbstractSoapEnvelopeTest.java} (93%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/{AbstractSoapHeaderTestCase.java => AbstractSoapHeaderTest.java} (98%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/{AbstractSoapMessageFactoryTestCase.java => AbstractSoapMessageFactoryTest.java} (93%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/{AbstractSoapMessageTestCase.java => AbstractSoapMessageTest.java} (97%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/{AbstractWsAddressingTestCase.java => AbstractWsAddressingTest.java} (94%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/{AbstractActionCallbackTestCase.java => AbstractActionCallbackTest.java} (98%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/{AbstractAddressingInterceptorTestCase.java => AbstractAddressingInterceptorTest.java} (98%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/{AbstractSoap11BodyTestCase.java => AbstractSoap11BodyTest.java} (98%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/{AbstractSoap11EnvelopeTestCase.java => AbstractSoap11EnvelopeTest.java} (90%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/{AbstractSoap11HeaderTestCase.java => AbstractSoap11HeaderTest.java} (96%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/{AbstractSoap11MessageFactoryTestCase.java => AbstractSoap11MessageFactoryTest.java} (87%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/{AbstractSoap11MessageTestCase.java => AbstractSoap11MessageTest.java} (97%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/{AbstractSoap12BodyTestCase.java => AbstractSoap12BodyTest.java} (98%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/{AbstractSoap12EnvelopeTestCase.java => AbstractSoap12EnvelopeTest.java} (90%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/{AbstractSoap12HeaderTestCase.java => AbstractSoap12HeaderTest.java} (97%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/{AbstractSoap12MessageFactoryTestCase.java => AbstractSoap12MessageFactoryTest.java} (88%) rename spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/{AbstractSoap12MessageTestCase.java => AbstractSoap12MessageTest.java} (97%) rename spring-ws-core/src/test/java/org/springframework/ws/transport/http/{AbstractHttpWebServiceMessageSenderIntegrationTestCase.java => AbstractHttpWebServiceMessageSenderIntegrationTest.java} (99%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jInterceptorTestCase.java => Wss4jInterceptorTest.java} (98%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorEncryptionTestCase.java => Wss4jMessageInterceptorEncryptionTest.java} (97%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorHeaderTestCase.java => Wss4jMessageInterceptorHeaderTest.java} (98%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorSamlTestCase.java => Wss4jMessageInterceptorSamlTest.java} (98%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorSignTestCase.java => Wss4jMessageInterceptorSignTest.java} (98%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorSoapActionTestCase.java => Wss4jMessageInterceptorSoapActionTest.java} (97%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java => Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java} (99%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorTimestampTestCase.java => Wss4jMessageInterceptorTimestampTest.java} (98%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorUsernameTokenSignatureTestCase.java => Wss4jMessageInterceptorUsernameTokenSignatureTest.java} (98%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorUsernameTokenTestCase.java => Wss4jMessageInterceptorUsernameTokenTest.java} (98%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jMessageInterceptorX509TestCase.java => Wss4jMessageInterceptorX509Test.java} (96%) rename spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/{Wss4jTestCase.java => Wss4jTest.java} (99%) rename spring-xml/src/test/java/org/springframework/xml/validation/{AbstractValidatorFactoryTestCase.java => AbstractValidatorFactoryTest.java} (91%) rename spring-xml/src/test/java/org/springframework/xml/xpath/{AbstractXPathExpressionFactoryTestCase.java => AbstractXPathExpressionFactoryTest.java} (99%) rename spring-xml/src/test/java/org/springframework/xml/xpath/{AbstractXPathTemplateTestCase.java => AbstractXPathTemplateTest.java} (89%) rename spring-xml/src/test/java/org/springframework/xml/xsd/{AbstractXsdSchemaTestCase.java => AbstractXsdSchemaTest.java} (94%) diff --git a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTest.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTest.java index b9e7a2f9..f372cdda 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java index d83ee053..c7bbbeb2 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTestCase.java +++ b/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 diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java index b0c024ee..bba509c5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java index e818d448..4673ff80 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTest.java index d4b5b4ee..b980259b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTest.java index 4df53833..0eb5162f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java similarity index 93% rename from spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java index 01c83d5a..ecfa08df 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java index 24bd645b..03fc9395 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTest.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTest.java index 9aad3758..dd2082b0 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTestCase.java +++ b/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"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTest.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTest.java index 628fdd51..d2d733fe 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTest.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTest.java index c3cac787..c664e5b3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java index 700633a6..5931543c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java index a8c1661a..d20581ca 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java index a07a9f0a..9354f63f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java index 886e6192..8c6d0af9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java index 0a4ee164..28c76ef1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java index 077b14b2..1c832a5f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java index 07f217e4..2b544af9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTest.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTest.java index 1f6f8288..b9772f68 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTestCase.java +++ b/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"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTest.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTest.java index ff3192f6..d96a60f7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java index 730c9b0a..af52cca8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java index 5f9336e0..3d2794bf 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java index 5950f7f4..235c4807 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java index 91c038a7..41d972cb 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java index b59d0c12..b32ce07f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTest.java index 6b53ca76..91cb617d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTest.java index 86b8042e..4a8ae230 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java index 27d55ebb..9bbfc6d7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTest.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTest.java index 4f12d17e..51e855e4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTest.java similarity index 93% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTest.java index f9586965..05860ee7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTest.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTest.java index eb6dec14..aad6799b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTest.java similarity index 93% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTest.java index bce5ff1c..42862afb 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTestCase.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.java index 7594923a..bbc74dc7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java +++ b/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(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java index 34e5b938..e9619b79 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java +++ b/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(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java index da5bd8dc..b10364d4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java index 6d4e826e..273fee46 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java index 480a6881..4f177509 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java index 36f8c051..9055635b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTestCase.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java index f3a4fccc..56eb3486 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java index 7c3b7a3c..ad3635b1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java index f717df21..9b6b0547 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java index 1a080f18..1a6380ad 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java index b2a08101..2afc8259 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java index 62ee5f06..d12a2daa 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java index 3b946057..c6c3ca80 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java index dc6285a3..f4f39393 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java index 5db3c486..f361fa7f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java index ef1c3975..1ef0c7a5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java index 2260ac0c..ef21e249 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java index 9f154888..58ecbda5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java +++ b/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 { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java index ec50e343..8803e014 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java index 221d1739..d412cc6c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java +++ b/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"); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java index be1d8c64..40ccbf1b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java +++ b/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; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTest.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTest.java index a10f935f..ab7839aa 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTestCase.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTest.java similarity index 90% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTest.java index 8ef520d9..2f3f8bad 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTestCase.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTest.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTest.java index 79c6f799..df0c54b8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTestCase.java +++ b/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"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTest.java similarity index 87% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTest.java index c81b18fd..4d562c73 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTestCase.java +++ b/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 headers = new HashMap(); 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 headers = new HashMap(); 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 headers = new HashMap(); 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 headers = new HashMap(); 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 headers = new HashMap(); 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 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 headers = new HashMap(); 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 headers = new HashMap(); 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); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTest.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTest.java index 6fe370e7..39ed99b8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java +++ b/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 diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTest.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTest.java index 1f6163fb..69f1cc12 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTestCase.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTest.java similarity index 90% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTest.java index fdb33421..41195c64 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTestCase.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTest.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTest.java index 980c742a..4d82f835 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTestCase.java +++ b/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() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTest.java similarity index 88% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTest.java index ef3dbcf5..0a49b5c3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTestCase.java +++ b/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 headers = new HashMap(); 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 headers = new HashMap(); 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 headers = new HashMap(); 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 headers = new HashMap(); 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); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTest.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTest.java index 8b204d20..08e21244 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java +++ b/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 diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java index 424b5e29..33e268a5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java +++ b/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 { +public abstract class AbstractHttpWebServiceMessageSenderIntegrationTest { private Server jettyServer; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSenderIntegrationTest.java index 8d677b99..c4d61a70 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSenderIntegrationTest.java +++ b/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 { + extends AbstractHttpWebServiceMessageSenderIntegrationTest { @Override protected ClientHttpRequestMessageSender createMessageSender() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java index 6df6ef06..e8a0fcc9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java +++ b/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 { + extends AbstractHttpWebServiceMessageSenderIntegrationTest { @Override protected CommonsHttpMessageSender createMessageSender() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java index 0442c3a9..98fdd502 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java +++ b/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 { + extends AbstractHttpWebServiceMessageSenderIntegrationTest { @Override protected HttpComponents5MessageSender createMessageSender() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderIntegrationTest.java index 0d6d0da2..eec284c7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderIntegrationTest.java +++ b/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 { + extends AbstractHttpWebServiceMessageSenderIntegrationTest { @Override protected HttpComponents5MessageSender createMessageSender() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTest.java index 6855c4d0..714e6394 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTest.java +++ b/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 { + extends AbstractHttpWebServiceMessageSenderIntegrationTest { @Override protected HttpComponentsMessageSender createMessageSender() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java index 6f3aa4e0..9d616cba 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java +++ b/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 { + extends AbstractHttpWebServiceMessageSenderIntegrationTest { @Override protected HttpUrlConnectionMessageSender createMessageSender() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTest.java index 7a1df471..b2aad9c5 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTest.java +++ b/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 { + extends AbstractHttpWebServiceMessageSenderIntegrationTest { @Override protected JdkHttpClientMessageSender createMessageSender() { diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTest.java index cb8f21d9..dd868587 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTest.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTest.java index f085b858..d38acaea 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTest.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTest.java index 170fe97d..2ae6775e 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTest.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTest.java index 7efc0d4b..1f597d12 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTest.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java index a2f4bc61..d26bde57 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java +++ b/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 = "QQQ"; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTest.java index 9e901f45..2a21587b 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTest.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java index 9373da61..90b4768e 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTest.java index cd0e10ea..c9e469c6 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTest.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTest.java index 89b49434..35bc474a 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTest.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTest.java index 42dc3aa1..c6266508 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTest.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Test.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Test.java index 4c70bb29..6d905df7 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Test.java +++ b/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 { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTest.java index 9a0b8588..56fbf4e4 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTest.java +++ b/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 = "QQQ"; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTest.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTest.java index 38942f61..426f03cd 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTestCase.java +++ b/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 { diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java index c79b01bc..f3a75b12 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTestCase.java +++ b/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; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java index 2468a577..164d238f 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTestCase.java +++ b/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; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java index eda08983..30b6bb10 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTestCase.java +++ b/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; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java index 6da38a6a..577d4021 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTestCase.java +++ b/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; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java index f3f886c1..afe4b238 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTestCase.java +++ b/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\""; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java similarity index 99% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java index 3a433d94..a54fb10f 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java +++ b/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(); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java index 9559c43e..4eaf9223 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTestCase.java +++ b/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 { diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTest.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTest.java index dd555ebe..0f811cec 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTestCase.java +++ b/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 { diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java index fe0df23b..af0ff4ce 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTestCase.java +++ b/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(); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509TestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java similarity index 96% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509TestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java index e96afc74..6cdbb74d 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509TestCase.java +++ b/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; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTestCase.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java similarity index 99% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTestCase.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java index 2d61927c..1a108fd3 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTestCase.java +++ b/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; diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java similarity index 91% rename from spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java rename to spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java index 1ba892d4..14e4c6eb 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTestCase.java +++ b/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(); diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java index f9201989..60915aa8 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java +++ b/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 { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTest.java index 9296e21c..bcd91492 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTest.java +++ b/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 { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java index bb6fcc69..bcbaff13 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java +++ b/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 { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java similarity index 99% rename from spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java index 8844bc84..eca79c7d 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTestCase.java +++ b/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; diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java similarity index 89% rename from spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java index ba57dd38..d0390094 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTestCase.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java @@ -48,7 +48,7 @@ import org.springframework.xml.transform.ResourceSource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public abstract class AbstractXPathTemplateTestCase { +public abstract class AbstractXPathTemplateTest { XPathOperations template; @@ -59,9 +59,8 @@ public abstract class AbstractXPathTemplateTestCase { @BeforeEach public final void setUp() throws Exception { template = createTemplate(); - namespaces = new ResourceSource(new ClassPathResource("namespaces.xml", AbstractXPathTemplateTestCase.class)); - nonamespaces = new ResourceSource( - new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTestCase.class)); + namespaces = new ResourceSource(new ClassPathResource("namespaces.xml", AbstractXPathTemplateTest.class)); + nonamespaces = new ResourceSource(new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTest.class)); } protected abstract XPathOperations createTemplate() throws Exception; @@ -156,8 +155,8 @@ public abstract class AbstractXPathTemplateTestCase { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); - Document document = documentBuilder.parse(SaxUtils - .createInputSource(new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTestCase.class))); + Document document = documentBuilder.parse( + SaxUtils.createInputSource(new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTest.class))); String result = template.evaluateAsString("/root/child/text", new DOMSource(document)); @@ -167,7 +166,7 @@ public abstract class AbstractXPathTemplateTestCase { @Test public void testEvaluateSAXSource() throws Exception { - InputStream in = AbstractXPathTemplateTestCase.class.getResourceAsStream("nonamespaces.xml"); + InputStream in = AbstractXPathTemplateTest.class.getResourceAsStream("nonamespaces.xml"); SAXSource source = new SAXSource(new InputSource(in)); String result = template.evaluateAsString("/root/child/text", source); @@ -177,7 +176,7 @@ public abstract class AbstractXPathTemplateTestCase { @Test public void testEvaluateStaxSource() throws Exception { - InputStream in = AbstractXPathTemplateTestCase.class.getResourceAsStream("nonamespaces.xml"); + InputStream in = AbstractXPathTemplateTest.class.getResourceAsStream("nonamespaces.xml"); XMLStreamReader streamReader = XMLInputFactory.newFactory().createXMLStreamReader(in); StAXSource source = new StAXSource(streamReader); String result = template.evaluateAsString("/root/child/text", source); @@ -188,7 +187,7 @@ public abstract class AbstractXPathTemplateTestCase { @Test public void testEvaluateStreamSourceInputStream() throws IOException, SAXException, ParserConfigurationException { - InputStream in = AbstractXPathTemplateTestCase.class.getResourceAsStream("nonamespaces.xml"); + InputStream in = AbstractXPathTemplateTest.class.getResourceAsStream("nonamespaces.xml"); StreamSource source = new StreamSource(in); String result = template.evaluateAsString("/root/child/text", source); @@ -198,7 +197,7 @@ public abstract class AbstractXPathTemplateTestCase { @Test public void testEvaluateStreamSourceSystemId() throws IOException, SAXException, ParserConfigurationException { - URL url = AbstractXPathTemplateTestCase.class.getResource("nonamespaces.xml"); + URL url = AbstractXPathTemplateTest.class.getResource("nonamespaces.xml"); String result = template.evaluateAsString("/root/child/text", new StreamSource(url.toString())); assertThat(result).isEqualTo("text"); diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java index b2435095..ca4d2fb2 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java @@ -21,7 +21,7 @@ import java.util.Map; import org.xml.sax.SAXException; -public class JaxenXPathExpressionFactoryTest extends AbstractXPathExpressionFactoryTestCase { +public class JaxenXPathExpressionFactoryTest extends AbstractXPathExpressionFactoryTest { @Override protected XPathExpression createXPathExpression(String expression) { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java index be605d09..7a6b0cc9 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java @@ -19,7 +19,7 @@ package org.springframework.xml.xpath; import java.util.HashMap; import java.util.Map; -public class JaxenXPathTemplateTest extends AbstractXPathTemplateTestCase { +public class JaxenXPathTemplateTest extends AbstractXPathTemplateTest { @Override protected XPathOperations createTemplate() { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java index 4624f069..b19e42ab 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java @@ -18,7 +18,7 @@ package org.springframework.xml.xpath; import java.util.Map; -public class Jaxp13XPathExpressionFactoryTest extends AbstractXPathExpressionFactoryTestCase { +public class Jaxp13XPathExpressionFactoryTest extends AbstractXPathExpressionFactoryTest { @Override protected XPathExpression createXPathExpression(String expression) { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java index 873d2ada..f4e4c85d 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java @@ -19,7 +19,7 @@ package org.springframework.xml.xpath; import java.util.HashMap; import java.util.Map; -public class Jaxp13XPathTemplateTest extends AbstractXPathTemplateTestCase { +public class Jaxp13XPathTemplateTest extends AbstractXPathTemplateTest { @Override protected XPathOperations createTemplate() { diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java similarity index 94% rename from spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java rename to spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java index 9102a180..65725d66 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java @@ -36,7 +36,7 @@ import org.springframework.xml.validation.XmlValidator; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractXsdSchemaTestCase { +public abstract class AbstractXsdSchemaTest { private DocumentBuilder documentBuilder; @@ -55,12 +55,12 @@ public abstract class AbstractXsdSchemaTestCase { @Test public void testSingle() throws Exception { - Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTestCase.class); + Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); XsdSchema single = createSchema(resource); assertThat(single.getTargetNamespace()).isEqualTo("http://www.springframework.org/spring-ws/single/schema"); - resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTestCase.class); + resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); transformer.transform(single.getSource(), domResult); @@ -72,12 +72,12 @@ public abstract class AbstractXsdSchemaTestCase { @Test public void testIncludes() throws Exception { - Resource resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTestCase.class); + Resource resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTest.class); XsdSchema including = createSchema(resource); assertThat(including.getTargetNamespace()).isEqualTo("http://www.springframework.org/spring-ws/include/schema"); - resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTestCase.class); + resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTest.class); Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); transformer.transform(including.getSource(), domResult); @@ -89,13 +89,13 @@ public abstract class AbstractXsdSchemaTestCase { @Test public void testImports() throws Exception { - Resource resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTestCase.class); + Resource resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTest.class); XsdSchema importing = createSchema(resource); assertThat(importing.getTargetNamespace()) .isEqualTo("http://www.springframework.org/spring-ws/importing/schema"); - resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTestCase.class); + resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTest.class); Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); transformer.transform(importing.getSource(), domResult); @@ -107,12 +107,12 @@ public abstract class AbstractXsdSchemaTestCase { @Test public void testXmlNamespace() throws Exception { - Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTestCase.class); + Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTest.class); XsdSchema importing = createSchema(resource); assertThat(importing.getTargetNamespace()).isEqualTo("http://www.springframework.org/spring-ws/xmlNamespace"); - resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTestCase.class); + resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTest.class); Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); transformer.transform(importing.getSource(), domResult); @@ -124,7 +124,7 @@ public abstract class AbstractXsdSchemaTestCase { @Test public void testCreateValidator() throws Exception { - Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTestCase.class); + Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); XsdSchema single = createSchema(resource); XmlValidator validator = single.createValidator(); diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java index 77efc6ac..c70957a6 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; import org.springframework.core.io.Resource; -public class SimpleXsdSchemaTest extends AbstractXsdSchemaTestCase { +public class SimpleXsdSchemaTest extends AbstractXsdSchemaTest { @Override protected XsdSchema createSchema(Resource resource) throws Exception { diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java index fb717f13..890b270c 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java @@ -33,7 +33,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import org.springframework.xml.sax.SaxUtils; import org.springframework.xml.transform.TransformerFactoryUtils; import org.springframework.xml.validation.XmlValidator; -import org.springframework.xml.xsd.AbstractXsdSchemaTestCase; +import org.springframework.xml.xsd.AbstractXsdSchemaTest; import org.springframework.xml.xsd.XsdSchema; import static org.assertj.core.api.Assertions.assertThat; @@ -61,7 +61,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testSingle() throws Exception { - Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTestCase.class); + Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); collection.setXsds(resource); collection.afterPropertiesSet(); @@ -71,7 +71,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testInlineComplex() throws Exception { - Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTestCase.class); + Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTest.class); collection.setXsds(a); collection.setInline(true); collection.afterPropertiesSet(); @@ -80,7 +80,7 @@ public class CommonsXsdSchemaCollectionTest { assertThat(schemas).hasSize(2); assertThat(schemas[0].getTargetNamespace()).isEqualTo("urn:1"); - Resource abc = new ClassPathResource("ABC.xsd", AbstractXsdSchemaTestCase.class); + Resource abc = new ClassPathResource("ABC.xsd", AbstractXsdSchemaTest.class); Document expected = documentBuilder.parse(SaxUtils.createInputSource(abc)); DOMResult domResult = new DOMResult(); transformer.transform(schemas[0].getSource(), domResult); @@ -91,7 +91,7 @@ public class CommonsXsdSchemaCollectionTest { .areIdentical(); assertThat(schemas[1].getTargetNamespace()).isEqualTo("urn:2"); - Resource cd = new ClassPathResource("CD.xsd", AbstractXsdSchemaTestCase.class); + Resource cd = new ClassPathResource("CD.xsd", AbstractXsdSchemaTest.class); expected = documentBuilder.parse(SaxUtils.createInputSource(cd)); domResult = new DOMResult(); transformer.transform(schemas[1].getSource(), domResult); @@ -105,7 +105,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testCircular() throws Exception { - Resource resource = new ClassPathResource("circular-1.xsd", AbstractXsdSchemaTestCase.class); + Resource resource = new ClassPathResource("circular-1.xsd", AbstractXsdSchemaTest.class); collection.setXsds(resource); collection.setInline(true); collection.afterPropertiesSet(); @@ -117,7 +117,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testXmlNamespace() throws Exception { - Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTestCase.class); + Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTest.class); collection.setXsds(resource); collection.setInline(true); collection.afterPropertiesSet(); @@ -129,7 +129,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testCreateValidator() throws Exception { - Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTestCase.class); + Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTest.class); collection.setXsds(a); collection.setInline(true); collection.afterPropertiesSet(); @@ -142,7 +142,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testInvalidSchema() throws Exception { - Resource invalid = new ClassPathResource("invalid.xsd", AbstractXsdSchemaTestCase.class); + Resource invalid = new ClassPathResource("invalid.xsd", AbstractXsdSchemaTest.class); collection.setXsds(invalid); assertThatExceptionOfType(CommonsXsdSchemaException.class).isThrownBy(() -> collection.afterPropertiesSet()); diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java index c9d1f016..213c5263 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java @@ -27,12 +27,12 @@ import org.w3c.dom.Element; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.xml.sax.SaxUtils; -import org.springframework.xml.xsd.AbstractXsdSchemaTestCase; +import org.springframework.xml.xsd.AbstractXsdSchemaTest; import org.springframework.xml.xsd.XsdSchema; import static org.assertj.core.api.Assertions.assertThat; -public class CommonsXsdSchemaTest extends AbstractXsdSchemaTestCase { +public class CommonsXsdSchemaTest extends AbstractXsdSchemaTest { @Override protected XsdSchema createSchema(Resource resource) throws Exception { @@ -46,7 +46,7 @@ public class CommonsXsdSchemaTest extends AbstractXsdSchemaTestCase { @Test public void testXmime() throws Exception { - Resource resource = new ClassPathResource("xmime.xsd", AbstractXsdSchemaTestCase.class); + Resource resource = new ClassPathResource("xmime.xsd", AbstractXsdSchemaTest.class); XsdSchema schema = createSchema(resource); String namespace = "urn:test";