diff --git a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java similarity index 95% rename from spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java index 6991de08..28f56dce 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageFactoryTests.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractWebServiceMessageFactoryTest { +public abstract class AbstractWebServiceMessageFactoryTests { protected WebServiceMessageFactory messageFactory; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java index 587e21ad..a776656a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/AbstractWebServiceMessageTests.java @@ -61,7 +61,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.xmlunit.assertj.XmlAssert.assertThat; -public abstract class AbstractWebServiceMessageTest { +public abstract class AbstractWebServiceMessageTests { protected Transformer transformer; @@ -83,7 +83,7 @@ public abstract class AbstractWebServiceMessageTest { TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance(); this.transformer = transformerFactory.newTransformer(); this.webServiceMessage = createWebServiceMessage(); - this.payload = new ClassPathResource("payload.xml", AbstractWebServiceMessageTest.class); + this.payload = new ClassPathResource("payload.xml", AbstractWebServiceMessageTests.class); } @Test diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java index 90ff6ebc..921cfbca 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java @@ -71,7 +71,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { +public abstract class AbstractSoap11WebServiceTemplateIntegrationTests { private static Server jettyServer; @@ -168,7 +168,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { assertThat(requestObject).isEqualTo(graph); try { transformer.transform( - new StringSource(AbstractSoap11WebServiceTemplateIntegrationTest.this.messagePayload), + new StringSource(AbstractSoap11WebServiceTemplateIntegrationTests.this.messagePayload), result); } catch (TransformerException e) { @@ -222,7 +222,7 @@ public abstract class AbstractSoap11WebServiceTemplateIntegrationTest { assertThat(requestObject).isEqualTo(graph); try { transformer.transform( - new StringSource(AbstractSoap11WebServiceTemplateIntegrationTest.this.messagePayload), + new StringSource(AbstractSoap11WebServiceTemplateIntegrationTests.this.messagePayload), result); } catch (TransformerException e) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java index c3171218..9327a23d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java @@ -70,7 +70,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { +public abstract class AbstractSoap12WebServiceTemplateIntegrationTests { private static Server jettyServer; @@ -173,7 +173,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { assertThat(requestObject).isEqualTo(graph); try { transformer.transform( - new StringSource(AbstractSoap12WebServiceTemplateIntegrationTest.this.messagePayload), + new StringSource(AbstractSoap12WebServiceTemplateIntegrationTests.this.messagePayload), result); } catch (TransformerException e) { @@ -227,7 +227,7 @@ public abstract class AbstractSoap12WebServiceTemplateIntegrationTest { try { transformer.transform( - new StringSource(AbstractSoap12WebServiceTemplateIntegrationTest.this.messagePayload), + new StringSource(AbstractSoap12WebServiceTemplateIntegrationTests.this.messagePayload), result); } catch (TransformerException e) { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java index cd19bb99..98489a4b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java @@ -52,7 +52,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class DomPoxWebServiceTemplateIntegrationTest { +public class DomPoxWebServiceTemplateIntegrationTests { private static Server jettyServer; 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/SaajSoap11WebServiceTemplateIntegrationTests.java similarity index 90% rename from spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTests.java index b980259b..91c67fdd 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/SaajSoap11WebServiceTemplateIntegrationTests.java @@ -25,7 +25,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; /** * @author Arjen Poutsma */ -public class SaajSoap11WebServiceTemplateIntegrationTest extends AbstractSoap11WebServiceTemplateIntegrationTest { +public class SaajSoap11WebServiceTemplateIntegrationTests extends AbstractSoap11WebServiceTemplateIntegrationTests { @Override public SoapMessageFactory createMessageFactory() throws Exception { 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/SaajSoap12WebServiceTemplateIntegrationTests.java similarity index 90% rename from spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap12WebServiceTemplateIntegrationTests.java index 0eb5162f..56ec3c25 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/SaajSoap12WebServiceTemplateIntegrationTests.java @@ -25,7 +25,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; /** * @author Arjen Poutsma */ -public class SaajSoap12WebServiceTemplateIntegrationTest extends AbstractSoap12WebServiceTemplateIntegrationTest { +public class SaajSoap12WebServiceTemplateIntegrationTests extends AbstractSoap12WebServiceTemplateIntegrationTests { @Override public SoapMessageFactory createMessageFactory() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java index 88386db1..52745c91 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/SimpleFaultMessageResolverTests.java @@ -28,7 +28,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SimpleFaultMessageResolverTest { +public class SimpleFaultMessageResolverTests { private SimpleFaultMessageResolver resolver; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java index 5707ea50..2fc51423 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTests.java @@ -50,7 +50,7 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; @SuppressWarnings("unchecked") -public class WebServiceTemplateTest { +public class WebServiceTemplateTests { private WebServiceTemplate template; @@ -70,7 +70,7 @@ public class WebServiceTemplateTest { @Override public WebServiceConnection createConnection(URI uri) { - return WebServiceTemplateTest.this.connectionMock; + return WebServiceTemplateTests.this.connectionMock; } @Override @@ -308,7 +308,7 @@ public class WebServiceTemplateTest { @Override public WebServiceConnection createConnection(URI uri) { - return WebServiceTemplateTest.this.connectionMock; + return WebServiceTemplateTests.this.connectionMock; } @Override @@ -430,7 +430,7 @@ public class WebServiceTemplateTest { @Override public WebServiceConnection createConnection(URI uri) { - return WebServiceTemplateTest.this.connectionMock; + return WebServiceTemplateTests.this.connectionMock; } @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTests.java index dac502d9..5d505757 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProviderTests.java @@ -27,7 +27,7 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; -public class Wsdl11DestinationProviderTest { +public class Wsdl11DestinationProviderTests { private Wsdl11DestinationProvider provider; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTests.java index d7dbad5e..34b0df87 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/ClientInterceptorAdapterTests.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Greg Turnquist */ -public class ClientInterceptorAdapterTest { +public class ClientInterceptorAdapterTests { @Test public void handleEmptyInterceptor() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTests.java index 2a44f5ca..b25183a0 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/client/support/interceptor/PayloadValidatingInterceptorTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class PayloadValidatingInterceptorTest { +public class PayloadValidatingInterceptorTests { private PayloadValidatingInterceptor interceptor; @@ -158,7 +158,7 @@ public class PayloadValidatingInterceptorTest { try { PayloadValidatingInterceptor interceptor = new PayloadValidatingInterceptor(); - interceptor.setSchema(new ClassPathResource(SCHEMA2, PayloadValidatingInterceptorTest.class)); + interceptor.setSchema(new ClassPathResource(SCHEMA2, PayloadValidatingInterceptorTests.class)); interceptor.afterPropertiesSet(); MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage saajMessage = SaajUtils.loadMessage(new ClassPathResource(VALID_SOAP_MESSAGE, getClass()), diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTests.java index c9bd3524..b5ed9056 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/AnnotationDrivenBeanDefinitionParserTests.java @@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class AnnotationDrivenBeanDefinitionParserTest { +public class AnnotationDrivenBeanDefinitionParserTests { private ApplicationContext applicationContext; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTests.java index 6b71b3fa..b48613cd 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/InterceptorsBeanDefinitionParserTests.java @@ -30,7 +30,7 @@ import org.springframework.ws.soap.server.endpoint.interceptor.SoapActionSmartEn import static org.assertj.core.api.Assertions.assertThat; -public class InterceptorsBeanDefinitionParserTest { +public class InterceptorsBeanDefinitionParserTests { @Test public void namespace() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTests.java index aa5d79e0..632b1fcc 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTests.java @@ -28,7 +28,7 @@ import org.springframework.ws.server.endpoint.adapter.MarshallingMethodEndpointA import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class WebServiceNamespaceHandlerTest { +public class WebServiceNamespaceHandlerTests { private ApplicationContext applicationContext; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTests.java index c55536e5..fc68f31f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTests.java @@ -29,7 +29,7 @@ import org.springframework.ws.server.endpoint.adapter.XPathParamAnnotationMethod import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class WebServicesNamespaceHandlerTigerTest { +public class WebServicesNamespaceHandlerTigerTests { private ApplicationContext applicationContext; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTests.java index 7a20fb74..90ed115b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/WsdlBeanDefinitionParserTests.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class WsdlBeanDefinitionParserTest { +public class WsdlBeanDefinitionParserTests { private ApplicationContext applicationContext; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTests.java index 5d1e59dd..1efafda8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/DefaultWsConfigurationTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class DefaultWsConfigurationTest { +public class DefaultWsConfigurationTests { private ApplicationContext applicationContext; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTests.java index 3e3547e4..c635f714 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurationSupportTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class WsConfigurationSupportTest { +public class WsConfigurationSupportTests { private ApplicationContext applicationContext; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTests.java index cc5f4ebf..b2fded62 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/config/annotation/WsConfigurerAdapterTests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Arjen Poutsma */ -public class WsConfigurerAdapterTest { +public class WsConfigurerAdapterTests { private ApplicationContext applicationContext; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java b/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTests.java index d739899d..ffe911c6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/context/DefaultMessageContextTests.java @@ -29,7 +29,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class DefaultMessageContextTest { +public class DefaultMessageContextTests { private DefaultMessageContext context; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTests.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTests.java index 47b516ad..0fcdd959 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/mime/AbstractMimeMessageTests.java @@ -24,12 +24,12 @@ import org.junit.jupiter.api.Test; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.util.FileCopyUtils; -import org.springframework.ws.AbstractWebServiceMessageTest; +import org.springframework.ws.AbstractWebServiceMessageTests; import org.springframework.ws.WebServiceMessage; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageTest { +public abstract class AbstractMimeMessageTests extends AbstractWebServiceMessageTests { protected MimeMessage mimeMessage; @@ -43,7 +43,7 @@ public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageT protected final WebServiceMessage createWebServiceMessage() throws Exception { this.mimeMessage = createMimeMessage(); - this.picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTest.class); + this.picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTests.class); this.contentId = "spring-ws"; this.contentType = "image/png"; return this.mimeMessage; 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/DomPoxMessageFactoryTests.java similarity index 90% rename from spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageFactoryTests.java index 1bdac9cd..3cd4e7b1 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/DomPoxMessageFactoryTests.java @@ -16,10 +16,10 @@ package org.springframework.ws.pox.dom; -import org.springframework.ws.AbstractWebServiceMessageFactoryTest; +import org.springframework.ws.AbstractWebServiceMessageFactoryTests; import org.springframework.ws.WebServiceMessageFactory; -public class DomPoxMessageFactoryTest extends AbstractWebServiceMessageFactoryTest { +public class DomPoxMessageFactoryTests extends AbstractWebServiceMessageFactoryTests { @Override protected WebServiceMessageFactory createMessageFactory() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTests.java index 342e6795..8ac6db2b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/pox/dom/DomPoxMessageTests.java @@ -35,7 +35,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class DomPoxMessageTest { +public class DomPoxMessageTests { private DomPoxMessage message; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTests.java index 39ee9058..29718e02 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/MessageDispatcherTests.java @@ -41,7 +41,7 @@ import static org.easymock.EasyMock.expectLastCall; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class MessageDispatcherTest { +public class MessageDispatcherTests { private MessageDispatcher dispatcher; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTests.java index 5b5d2ca7..d2a685ee 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractEndpointTests.java @@ -43,7 +43,7 @@ import org.springframework.xml.XMLInputFactoryUtils; import org.springframework.xml.sax.SaxUtils; @SuppressWarnings("Since15") -public abstract class AbstractEndpointTest { +public abstract class AbstractEndpointTests { protected static final String NAMESPACE_URI = "http://springframework.org/ws"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTests.java index 8a5478f5..d9f1a155 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractMessageEndpointTests.java @@ -30,7 +30,7 @@ import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractMessageEndpointTest extends AbstractEndpointTest { +public abstract class AbstractMessageEndpointTests extends AbstractEndpointTests { private MessageEndpoint endpoint; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTests.java index 5350c4c6..c639317c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/AbstractPayloadEndpointTests.java @@ -29,7 +29,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractPayloadEndpointTest extends AbstractEndpointTest { +public abstract class AbstractPayloadEndpointTests extends AbstractEndpointTests { private PayloadEndpoint endpoint; 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/Dom4jPayloadEndpointTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/Dom4jPayloadEndpointTests.java index b854ed4a..b03e29b4 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/Dom4jPayloadEndpointTests.java @@ -22,7 +22,7 @@ import org.dom4j.Element; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTest { +public class Dom4jPayloadEndpointTests extends AbstractPayloadEndpointTests { @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/DomPayloadEndpointTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/DomPayloadEndpointTests.java index 887a37f7..d5c34c25 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/DomPayloadEndpointTests.java @@ -22,7 +22,7 @@ import org.w3c.dom.Element; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class DomPayloadEndpointTest extends AbstractPayloadEndpointTest { +public class DomPayloadEndpointTests extends AbstractPayloadEndpointTests { @Override protected PayloadEndpoint createNoResponseEndpoint() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTests.java index 3c62eb94..6e133425 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/EndpointExceptionResolverTests.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Tareq Abed Rabbo * @author Arjen Poutsma */ -public class EndpointExceptionResolverTest { +public class EndpointExceptionResolverTests { private MethodEndpoint methodEndpoint; 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/JDomPayloadEndpointTests.java similarity index 95% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/JDomPayloadEndpointTests.java index 3ed96f91..7d88b71a 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/JDomPayloadEndpointTests.java @@ -22,7 +22,7 @@ import org.jdom2.Namespace; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTest { +public class JDomPayloadEndpointTests extends AbstractPayloadEndpointTests { @Override protected PayloadEndpoint createNoResponseEndpoint() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTests.java index 44e787c3..9cfcad2d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MarshallingPayloadEndpointTests.java @@ -55,7 +55,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class MarshallingPayloadEndpointTest { +public class MarshallingPayloadEndpointTests { private Transformer transformer; @@ -82,7 +82,7 @@ public class MarshallingPayloadEndpointTest { try { StringWriter writer = new StringWriter(); - MarshallingPayloadEndpointTest.this.transformer.transform(source, new StreamResult(writer)); + MarshallingPayloadEndpointTests.this.transformer.transform(source, new StreamResult(writer)); XmlAssert.assertThat(writer.toString()).and("").ignoreWhitespace().areIdentical(); @@ -104,7 +104,7 @@ public class MarshallingPayloadEndpointTest { assertThat(graph).isEqualTo("result"); try { - MarshallingPayloadEndpointTest.this.transformer + MarshallingPayloadEndpointTests.this.transformer .transform(new StreamSource(new StringReader("")), result); } catch (TransformerException e) { @@ -150,7 +150,7 @@ public class MarshallingPayloadEndpointTest { try { StringWriter writer = new StringWriter(); - MarshallingPayloadEndpointTest.this.transformer.transform(source, new StreamResult(writer)); + MarshallingPayloadEndpointTests.this.transformer.transform(source, new StreamResult(writer)); XmlAssert.assertThat(writer.toString()).and("").ignoreWhitespace().areIdentical(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTests.java index 6e98463c..3e87415e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/MethodEndpointTests.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class MethodEndpointTest { +public class MethodEndpointTests { private MethodEndpoint endpoint; 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/SaxPayloadEndpointTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/SaxPayloadEndpointTests.java index 252f4ce3..49543f9e 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/SaxPayloadEndpointTests.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @Deprecated -public class SaxPayloadEndpointTest extends AbstractPayloadEndpointTest { +public class SaxPayloadEndpointTests extends AbstractPayloadEndpointTests { @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/StaxEventPayloadEndpointTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxEventPayloadEndpointTests.java index 28d82744..8f125708 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/StaxEventPayloadEndpointTests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @see AbstractStaxEventPayloadEndpoint */ @Deprecated -public class StaxEventPayloadEndpointTest extends AbstractMessageEndpointTest { +public class StaxEventPayloadEndpointTests extends AbstractMessageEndpointTests { @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/StaxStreamPayloadEndpointTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/StaxStreamPayloadEndpointTests.java index 86f5b95d..20826951 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/StaxStreamPayloadEndpointTests.java @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @see AbstractStaxStreamPayloadEndpoint */ @Deprecated -public class StaxStreamPayloadEndpointTest extends AbstractMessageEndpointTest { +public class StaxStreamPayloadEndpointTests extends AbstractMessageEndpointTests { @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/XomPayloadEndpointTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/XomPayloadEndpointTests.java index e33d74a6..01dfb32f 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/XomPayloadEndpointTests.java @@ -21,7 +21,7 @@ import nu.xom.Element; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class XomPayloadEndpointTest extends AbstractPayloadEndpointTest { +public class XomPayloadEndpointTests extends AbstractPayloadEndpointTests { @Override protected PayloadEndpoint createNoResponseEndpoint() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTests.java index 4383bab5..2ba62a44 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTests.java @@ -45,7 +45,7 @@ import static org.easymock.EasyMock.verify; /** * @author Arjen Poutsma */ -public class DefaultMethodEndpointAdapterTest { +public class DefaultMethodEndpointAdapterTests { private DefaultMethodEndpointAdapter adapter; @@ -84,7 +84,7 @@ public class DefaultMethodEndpointAdapterTest { public void initDefaultStrategies() throws Exception { this.adapter = new DefaultMethodEndpointAdapter(); - this.adapter.setBeanClassLoader(DefaultMethodEndpointAdapterTest.class.getClassLoader()); + this.adapter.setBeanClassLoader(DefaultMethodEndpointAdapterTests.class.getClassLoader()); this.adapter.afterPropertiesSet(); assertThat(this.adapter.getMethodArgumentResolvers()).isNotEmpty(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTests.java index 42d4043c..f68360bc 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/GenericMarshallingMethodEndpointAdapterTests.java @@ -42,7 +42,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class GenericMarshallingMethodEndpointAdapterTest { +public class GenericMarshallingMethodEndpointAdapterTests { private GenericMarshallingMethodEndpointAdapter adapter; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTests.java index dafa63d2..245eda4a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapterTests.java @@ -40,7 +40,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class MarshallingMethodEndpointAdapterTest { +public class MarshallingMethodEndpointAdapterTests { private MarshallingMethodEndpointAdapter adapter; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTests.java index 6269b36e..1e55f728 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageEndpointAdapterTests.java @@ -29,7 +29,7 @@ import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class MessageEndpointAdapterTest { +public class MessageEndpointAdapterTests { private MessageEndpointAdapter adapter; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTests.java index 31c241c4..4dee2158 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapterTests.java @@ -27,7 +27,7 @@ import org.springframework.ws.server.endpoint.MethodEndpoint; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class MessageMethodEndpointAdapterTest { +public class MessageMethodEndpointAdapterTests { private MessageMethodEndpointAdapter adapter; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTests.java index bffa7427..ebb6e3f6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadEndpointAdapterTests.java @@ -42,7 +42,7 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class PayloadEndpointAdapterTest { +public class PayloadEndpointAdapterTests { private PayloadEndpointAdapter adapter; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTests.java index 14243a08..92a9003e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapterTests.java @@ -33,7 +33,7 @@ import org.springframework.ws.server.endpoint.MethodEndpoint; import static org.assertj.core.api.Assertions.assertThat; @Deprecated -public class PayloadMethodEndpointAdapterTest { +public class PayloadMethodEndpointAdapterTests { private PayloadMethodEndpointAdapter adapter; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTests.java index 0fc110e0..37cd7f43 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapterTests.java @@ -49,7 +49,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class XPathParamAnnotationMethodEndpointAdapterTest { +public class XPathParamAnnotationMethodEndpointAdapterTests { private static final String CONTENTS = "text42.0"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTests.java index b9772f68..01b117a6 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractMethodArgumentResolverTests.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 AbstractMethodArgumentResolverTest extends TransformerObjectSupport { +public class AbstractMethodArgumentResolverTests 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/AbstractPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTests.java index 639d9dfc..8c1954a9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/AbstractPayloadMethodProcessorTests.java @@ -28,7 +28,7 @@ import org.springframework.xml.transform.StringResult; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractPayloadMethodProcessorTest extends AbstractMethodArgumentResolverTest { +public abstract class AbstractPayloadMethodProcessorTests extends AbstractMethodArgumentResolverTests { private AbstractPayloadSourceMethodProcessor processor; 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/MarshallingPayloadMethodProcessorTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MarshallingPayloadMethodProcessorTests.java index cf6a890e..10bda393 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/MarshallingPayloadMethodProcessorTests.java @@ -40,7 +40,7 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class MarshallingPayloadMethodProcessorTest extends AbstractMethodArgumentResolverTest { +public class MarshallingPayloadMethodProcessorTests extends AbstractMethodArgumentResolverTests { private MarshallingPayloadMethodProcessor processor; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTests.java index 13f166c5..dad11e1e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/MessageContextMethodArgumentResolverTests.java @@ -26,7 +26,7 @@ import org.springframework.ws.context.MessageContext; import static org.assertj.core.api.Assertions.assertThat; -public class MessageContextMethodArgumentResolverTest { +public class MessageContextMethodArgumentResolverTests { private MessageContextMethodArgumentResolver resolver; 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/SourcePayloadMethodProcessorTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessorTests.java index 1fb557f7..0d73b280 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/SourcePayloadMethodProcessorTests.java @@ -30,7 +30,7 @@ import org.springframework.xml.transform.StringSource; /** * @author Arjen Poutsma */ -public class SourcePayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest { +public class SourcePayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { 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/StaxPayloadMethodArgumentResolverTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolverTests.java index f71f468a..e7541357 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/StaxPayloadMethodArgumentResolverTests.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Arjen Poutsma */ @SuppressWarnings("Since15") -public class StaxPayloadMethodArgumentResolverTest extends AbstractMethodArgumentResolverTest { +public class StaxPayloadMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests { private StaxPayloadMethodArgumentResolver resolver; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTests.java index 4f0dcc35..4c6c3bb1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolverTests.java @@ -35,7 +35,7 @@ import org.springframework.ws.server.endpoint.annotation.XPathParam; import static org.assertj.core.api.Assertions.assertThat; @Namespaces(@Namespace(prefix = "tns", uri = "http://springframework.org/spring-ws")) -public class XPathParamMethodArgumentResolverTest { +public class XPathParamMethodArgumentResolverTests { private static final String CONTENTS = "text42"; 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/Dom4jPayloadMethodProcessorTests.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/Dom4jPayloadMethodProcessorTests.java index b5409acf..efc96717 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/Dom4jPayloadMethodProcessorTests.java @@ -21,14 +21,14 @@ import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.springframework.core.MethodParameter; -import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest; +import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTests; import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor; import org.springframework.ws.server.endpoint.annotation.RequestPayload; import org.springframework.ws.server.endpoint.annotation.ResponsePayload; import static org.assertj.core.api.Assertions.assertThat; -public class Dom4jPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest { +public class Dom4jPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { 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/DomPayloadMethodProcessorTests.java similarity index 95% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/DomPayloadMethodProcessorTests.java index 91d94814..856a3d83 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/DomPayloadMethodProcessorTests.java @@ -24,7 +24,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.springframework.core.MethodParameter; -import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest; +import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTests; import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor; import org.springframework.ws.server.endpoint.annotation.RequestPayload; import org.springframework.ws.server.endpoint.annotation.ResponsePayload; @@ -32,7 +32,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class DomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest { +public class DomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { 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/JDomPayloadMethodProcessorTests.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/JDomPayloadMethodProcessorTests.java index 91cb617d..d6e6ceb5 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/JDomPayloadMethodProcessorTests.java @@ -19,14 +19,14 @@ package org.springframework.ws.server.endpoint.adapter.method.dom; import org.jdom2.Element; import org.springframework.core.MethodParameter; -import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest; +import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTests; import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor; import org.springframework.ws.server.endpoint.annotation.RequestPayload; import org.springframework.ws.server.endpoint.annotation.ResponsePayload; import static org.assertj.core.api.Assertions.assertThat; -public class JDomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest { +public class JDomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { 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/XomPayloadMethodProcessorTests.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessorTests.java index 4a8ae230..26b62cd6 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/XomPayloadMethodProcessorTests.java @@ -19,14 +19,14 @@ package org.springframework.ws.server.endpoint.adapter.method.dom; import nu.xom.Element; import org.springframework.core.MethodParameter; -import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTest; +import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadMethodProcessorTests; import org.springframework.ws.server.endpoint.adapter.method.AbstractPayloadSourceMethodProcessor; import org.springframework.ws.server.endpoint.annotation.RequestPayload; import org.springframework.ws.server.endpoint.annotation.ResponsePayload; import static org.assertj.core.api.Assertions.assertThat; -public class XomPayloadMethodProcessorTest extends AbstractPayloadMethodProcessorTest { +public class XomPayloadMethodProcessorTests extends AbstractPayloadMethodProcessorTests { @Override protected AbstractPayloadSourceMethodProcessor createProcessor() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTests.java index a8952b9e..de1d9403 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTests.java @@ -37,7 +37,7 @@ import org.springframework.ws.server.endpoint.annotation.ResponsePayload; import static org.assertj.core.api.Assertions.assertThat; -public class JaxbElementPayloadMethodProcessorTest { +public class JaxbElementPayloadMethodProcessorTests { private JaxbElementPayloadMethodProcessor processor; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTests.java index 4f38d577..4c900d39 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTests.java @@ -47,7 +47,7 @@ import org.springframework.xml.sax.AbstractXmlReader; import static org.assertj.core.api.Assertions.assertThat; -public class XmlRootElementPayloadMethodProcessorTest { +public class XmlRootElementPayloadMethodProcessorTests { private XmlRootElementPayloadMethodProcessor processor; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTests.java index 7ca85e33..10939d78 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/interceptor/PayloadTransformingInterceptorTests.java @@ -44,7 +44,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class PayloadTransformingInterceptorTest { +public class PayloadTransformingInterceptorTests { private PayloadTransformingInterceptor interceptor; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTests.java index 9b93d9f9..088b27de 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/BridgedMethodRegistrationTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("bridged-method-registration.xml") -public class BridgedMethodRegistrationTest { +public class BridgedMethodRegistrationTests { @Autowired private PayloadRootAnnotationMethodEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTests.java index 3b57e406..2d6da5a0 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/CgLibProxyRegistrationTests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("cglib-proxy-registration.xml") -public class CgLibProxyRegistrationTest { +public class CgLibProxyRegistrationTests { @Autowired private PayloadRootAnnotationMethodEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTests.java similarity index 92% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTests.java index 38cc1da7..e3988b07 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/EndpointMappingTests.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify; /** * Test case for {@link AbstractEndpointMapping}. */ -public class EndpointMappingTest { +public class EndpointMappingTests { private MessageContext messageContext; @@ -53,7 +53,7 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext); return null; } }; @@ -72,7 +72,7 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext); return endpoint; } }; @@ -91,7 +91,7 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext); return endpoint; } }; @@ -114,7 +114,7 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext); return endpoint; } }; @@ -142,7 +142,7 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext); return endpoint; } }; @@ -165,7 +165,7 @@ public class EndpointMappingTest { AbstractEndpointMapping mapping = new AbstractEndpointMapping() { @Override protected Object getEndpointInternal(MessageContext givenRequest) { - assertThat(givenRequest).isEqualTo(EndpointMappingTest.this.messageContext); + assertThat(givenRequest).isEqualTo(EndpointMappingTests.this.messageContext); return endpoint; } }; @@ -187,7 +187,7 @@ public class EndpointMappingTest { @Override protected Object getEndpointInternal(MessageContext message) { - assertThat(message).isEqualTo(EndpointMappingTest.this.messageContext); + assertThat(message).isEqualTo(EndpointMappingTests.this.messageContext); return "endpoint"; } }; @@ -208,7 +208,7 @@ public class EndpointMappingTest { @Override protected Object getEndpointInternal(MessageContext message) { - assertThat(message).isEqualTo(EndpointMappingTest.this.messageContext); + assertThat(message).isEqualTo(EndpointMappingTests.this.messageContext); return "noSuchBean"; } }; @@ -229,7 +229,7 @@ public class EndpointMappingTest { @Override protected Object getEndpointInternal(MessageContext message) { - assertThat(message).isEqualTo(EndpointMappingTest.this.messageContext); + assertThat(message).isEqualTo(EndpointMappingTests.this.messageContext); return "endpoint"; } }; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTests.java index 2a23b13a..e361169c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/JdkProxyRegistrationTests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("jdk-proxy-registration.xml") -public class JdkProxyRegistrationTest { +public class JdkProxyRegistrationTests { @Autowired private PayloadRootAnnotationMethodEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTests.java index b6d3e773..60f009bc 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/MapBasedSoapEndpointMappingTests.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Test case for AbstractMapBasedEndpointMapping. */ -public class MapBasedSoapEndpointMappingTest { +public class MapBasedSoapEndpointMappingTests { @Test public void testBeanNames() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTests.java index fe7ac16d..b4018108 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTests.java @@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("payloadRootAnnotationMethodEndpointMapping.xml") -public class PayloadRootAnnotationMethodEndpointMappingTest { +public class PayloadRootAnnotationMethodEndpointMappingTests { @Autowired private PayloadRootAnnotationMethodEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTests.java index 4e0252c9..91168124 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMappingTests.java @@ -28,7 +28,7 @@ import org.springframework.ws.context.MessageContext; import static org.assertj.core.api.Assertions.assertThat; -public class PayloadRootQNameEndpointMappingTest { +public class PayloadRootQNameEndpointMappingTests { private PayloadRootQNameEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTests.java index 0a204990..25d182a2 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/SimpleMethodEndpointMappingTests.java @@ -26,7 +26,7 @@ import org.springframework.ws.context.MessageContext; import static org.assertj.core.api.Assertions.assertThat; -public class SimpleMethodEndpointMappingTest { +public class SimpleMethodEndpointMappingTests { private SimpleMethodEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTests.java index 1a7b984e..1b2b74f2 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/UriEndpointMappingTests.java @@ -35,7 +35,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class UriEndpointMappingTest { +public class UriEndpointMappingTests { private UriEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTests.java index 74b6e40a..22e74563 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/XPathPayloadEndpointMappingTests.java @@ -26,7 +26,7 @@ import org.springframework.ws.context.MessageContext; import static org.assertj.core.api.Assertions.assertThat; -public class XPathPayloadEndpointMappingTest { +public class XPathPayloadEndpointMappingTests { private XPathPayloadEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTests.java index dea2f241..fedd560f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMappingTests.java @@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class XmlRootElementEndpointMappingTest { +public class XmlRootElementEndpointMappingTests { private XmlRootElementEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTests.java index 7e1931bb..a4d8beb2 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/NamespaceUtilsTests.java @@ -29,7 +29,7 @@ import org.springframework.ws.server.endpoint.annotation.Namespaces; import static org.assertj.core.api.Assertions.assertThat; @Namespaces({ @Namespace(prefix = "prefix1", uri = "class1"), @Namespace(uri = "class2") }) -public class NamespaceUtilsTest { +public class NamespaceUtilsTests { @Test public void getNamespaceContextMethod() throws NoSuchMethodException { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTests.java index a324a10e..3b4dae12 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/support/PayloadRootUtilsTests.java @@ -41,7 +41,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class PayloadRootUtilsTest { +public class PayloadRootUtilsTests { @Test public void testGetQNameForDomSource() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTests.java index 735aa645..ced4c43a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapBodyTests.java @@ -31,7 +31,7 @@ import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractSoapBodyTest extends AbstractSoapElementTest { +public abstract class AbstractSoapBodyTests extends AbstractSoapElementTests { protected SoapBody soapBody; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTests.java index b5f4470e..4f671c92 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapElementTests.java @@ -29,7 +29,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractSoapElementTest { +public abstract class AbstractSoapElementTests { private SoapElement soapElement; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTests.java similarity index 93% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTests.java index da973fe9..bb9f1327 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapEnvelopeTests.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractSoapEnvelopeTest extends AbstractSoapElementTest { +public abstract class AbstractSoapEnvelopeTests extends AbstractSoapElementTests { protected SoapEnvelope soapEnvelope; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTests.java index 506b8036..0e05e75f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapHeaderTests.java @@ -28,7 +28,7 @@ import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractSoapHeaderTest extends AbstractSoapElementTest { +public abstract class AbstractSoapHeaderTests extends AbstractSoapElementTests { protected SoapHeader soapHeader; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTests.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTests.java index 9fd47b59..c378ca10 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageFactoryTests.java @@ -18,14 +18,14 @@ package org.springframework.ws.soap; import org.junit.jupiter.api.Test; -import org.springframework.ws.AbstractWebServiceMessageFactoryTest; +import org.springframework.ws.AbstractWebServiceMessageFactoryTests; import org.springframework.ws.InvalidXmlException; import org.springframework.ws.WebServiceMessage; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public abstract class AbstractSoapMessageFactoryTest extends AbstractWebServiceMessageFactoryTest { +public abstract class AbstractSoapMessageFactoryTests extends AbstractWebServiceMessageFactoryTests { @Test public void testCreateEmptySoapMessage() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTests.java index fb292919..0b88371a 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTests.java @@ -31,7 +31,7 @@ import org.xmlunit.assertj.XmlAssert; import org.springframework.core.io.Resource; import org.springframework.util.StringUtils; -import org.springframework.ws.mime.AbstractMimeMessageTest; +import org.springframework.ws.mime.AbstractMimeMessageTests; import org.springframework.ws.mime.MimeMessage; import org.springframework.ws.stream.StreamingPayload; import org.springframework.ws.stream.StreamingWebServiceMessage; @@ -44,7 +44,7 @@ import org.springframework.xml.validation.XmlValidatorFactory; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -public abstract class AbstractSoapMessageTest extends AbstractMimeMessageTest { +public abstract class AbstractSoapMessageTests extends AbstractMimeMessageTests { protected abstract String getNS(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTests.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTests.java index 02aba499..69f41134 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTests.java @@ -31,7 +31,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessage; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractWsAddressingTest { +public abstract class AbstractWsAddressingTests { protected MessageFactory messageFactory; @@ -44,7 +44,7 @@ public abstract class AbstractWsAddressingTest { MimeHeaders mimeHeaders = new MimeHeaders(); mimeHeaders.addHeader("Content-Type", " application/soap+xml"); - InputStream is = AbstractWsAddressingTest.class.getResourceAsStream(fileName); + InputStream is = AbstractWsAddressingTests.class.getResourceAsStream(fileName); try (is) { assertThat(is).isNotNull(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTests.java index fe516435..397bea47 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTests.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.ws.soap.addressing.AbstractWsAddressingTest; +import org.springframework.ws.soap.addressing.AbstractWsAddressingTests; import org.springframework.ws.soap.addressing.core.EndpointReference; import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy; import org.springframework.ws.soap.addressing.version.AddressingVersion; @@ -44,7 +44,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public abstract class AbstractActionCallbackTest extends AbstractWsAddressingTest { +public abstract class AbstractActionCallbackTests extends AbstractWsAddressingTests { private ActionCallback callback; 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/ActionCallback10Tests.java similarity index 93% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Test.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback10Tests.java index 273fee46..e192e4c3 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/ActionCallback10Tests.java @@ -19,7 +19,7 @@ package org.springframework.ws.soap.addressing.client; import org.springframework.ws.soap.addressing.version.Addressing10; import org.springframework.ws.soap.addressing.version.AddressingVersion; -public class ActionCallback10Test extends AbstractActionCallbackTest { +public class ActionCallback10Tests extends AbstractActionCallbackTests { @Override protected AddressingVersion getVersion() { 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/ActionCallback200408Tests.java similarity index 92% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Test.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/ActionCallback200408Tests.java index 4f177509..d641f4af 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/ActionCallback200408Tests.java @@ -19,7 +19,7 @@ package org.springframework.ws.soap.addressing.client; import org.springframework.ws.soap.addressing.version.Addressing200408; import org.springframework.ws.soap.addressing.version.AddressingVersion; -public class ActionCallback200408Test extends AbstractActionCallbackTest { +public class ActionCallback200408Tests extends AbstractActionCallbackTests { @Override protected AddressingVersion getVersion() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTests.java index 6c47d7dd..ef351434 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/messageid/UuidMessageIdStrategyTests.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class UuidMessageIdStrategyTest { +public class UuidMessageIdStrategyTests { private MessageIdStrategy strategy; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTests.java index a599eae9..624bc7d8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AbstractAddressingInterceptorTests.java @@ -27,7 +27,7 @@ import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; -import org.springframework.ws.soap.addressing.AbstractWsAddressingTest; +import org.springframework.ws.soap.addressing.AbstractWsAddressingTests; import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy; import org.springframework.ws.soap.addressing.version.AddressingVersion; import org.springframework.ws.soap.saaj.SaajSoapMessage; @@ -42,7 +42,7 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public abstract class AbstractAddressingInterceptorTest extends AbstractWsAddressingTest { +public abstract class AbstractAddressingInterceptorTests extends AbstractWsAddressingTests { protected AddressingEndpointInterceptor interceptor; 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/AddressingInterceptor10Tests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Test.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor10Tests.java index 074c63ed..be6cc150 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/AddressingInterceptor10Tests.java @@ -31,7 +31,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class AddressingInterceptor10Test extends AbstractAddressingInterceptorTest { +public class AddressingInterceptor10Tests extends AbstractAddressingInterceptorTests { @Override protected AddressingVersion getVersion() { 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/AddressingInterceptor200408Tests.java similarity index 92% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Test.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AddressingInterceptor200408Tests.java index 88cdbf83..58d05653 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/AddressingInterceptor200408Tests.java @@ -19,7 +19,7 @@ package org.springframework.ws.soap.addressing.server; import org.springframework.ws.soap.addressing.version.Addressing200408; import org.springframework.ws.soap.addressing.version.AddressingVersion; -public class AddressingInterceptor200408Test extends AbstractAddressingInterceptorTest { +public class AddressingInterceptor200408Tests extends AbstractAddressingInterceptorTests { @Override protected AddressingVersion getVersion() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTests.java index f8ce00bd..e59c4fdf 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/AnnotationActionMethodEndpointMappingTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Arjen Poutsma * @author Nate Stoddard */ -public class AnnotationActionMethodEndpointMappingTest { +public class AnnotationActionMethodEndpointMappingTests { private StaticApplicationContext applicationContext; 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/SimpleActionEndpointMappingTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/server/SimpleActionEndpointMappingTests.java index 14576ff5..9c6f1092 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/SimpleActionEndpointMappingTests.java @@ -28,14 +28,14 @@ import org.springframework.ws.context.MessageContext; import org.springframework.ws.server.EndpointInterceptor; import org.springframework.ws.server.EndpointInvocationChain; import org.springframework.ws.server.endpoint.interceptor.PayloadLoggingInterceptor; -import org.springframework.ws.soap.addressing.AbstractWsAddressingTest; +import org.springframework.ws.soap.addressing.AbstractWsAddressingTests; import org.springframework.ws.soap.saaj.SaajSoapMessage; import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import org.springframework.ws.soap.server.endpoint.interceptor.PayloadValidatingInterceptor; import static org.assertj.core.api.Assertions.assertThat; -public class SimpleActionEndpointMappingTest extends AbstractWsAddressingTest { +public class SimpleActionEndpointMappingTests extends AbstractWsAddressingTests { private SimpleActionEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTests.java index 9e9c00af..9ccd66d0 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/client/core/SaajSoapActionCallbackTests.java @@ -32,7 +32,7 @@ import org.springframework.ws.transport.TransportConstants; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoapActionCallbackTest { +public class SaajSoapActionCallbackTests { private SaajSoapMessageFactory saaj11Factory = new SaajSoapMessageFactory(); 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/SaajSoap11BodyTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11BodyTests.java index 1a6380ad..53ca26cf 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/SaajSoap11BodyTests.java @@ -25,11 +25,11 @@ import jakarta.xml.soap.SOAPMessage; import org.junit.jupiter.api.Test; import org.springframework.ws.soap.SoapBody; -import org.springframework.ws.soap.soap11.AbstractSoap11BodyTest; +import org.springframework.ws.soap.soap11.AbstractSoap11BodyTests; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoap11BodyTest extends AbstractSoap11BodyTest { +public class SaajSoap11BodyTests extends AbstractSoap11BodyTests { @Override protected SoapBody createSoapBody() throws Exception { 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/SaajSoap11EnvelopeTests.java similarity index 93% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11EnvelopeTests.java index 2afc8259..05c0c1d0 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/SaajSoap11EnvelopeTests.java @@ -21,9 +21,9 @@ import jakarta.xml.soap.SOAPConstants; import jakarta.xml.soap.SOAPMessage; import org.springframework.ws.soap.SoapEnvelope; -import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTest; +import org.springframework.ws.soap.soap11.AbstractSoap11EnvelopeTests; -public class SaajSoap11EnvelopeTest extends AbstractSoap11EnvelopeTest { +public class SaajSoap11EnvelopeTests extends AbstractSoap11EnvelopeTests { @Override protected SoapEnvelope createSoapEnvelope() throws Exception { 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/SaajSoap11HeaderTests.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11HeaderTests.java index d12a2daa..9a62ab1d 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/SaajSoap11HeaderTests.java @@ -21,9 +21,9 @@ import jakarta.xml.soap.SOAPConstants; import jakarta.xml.soap.SOAPMessage; import org.springframework.ws.soap.SoapHeader; -import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTest; +import org.springframework.ws.soap.soap11.AbstractSoap11HeaderTests; -public class SaajSoap11HeaderTest extends AbstractSoap11HeaderTest { +public class SaajSoap11HeaderTests extends AbstractSoap11HeaderTests { @Override protected SoapHeader createSoapHeader() throws Exception { 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/SaajSoap11MessageFactoryTests.java similarity index 95% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageFactoryTests.java index 312169b6..914b4c53 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/SaajSoap11MessageFactoryTests.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.AbstractSoap11MessageFactoryTest; +import org.springframework.ws.soap.soap11.AbstractSoap11MessageFactoryTests; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoap11MessageFactoryTest extends AbstractSoap11MessageFactoryTest { +public class SaajSoap11MessageFactoryTests extends AbstractSoap11MessageFactoryTests { @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/SaajSoap11MessageTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTests.java index 2e0848bf..7ad8d7a1 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/SaajSoap11MessageTests.java @@ -30,13 +30,13 @@ import org.junit.jupiter.api.Test; import org.xmlunit.assertj.XmlAssert; import org.springframework.ws.soap.SoapMessage; -import org.springframework.ws.soap.soap11.AbstractSoap11MessageTest; +import org.springframework.ws.soap.soap11.AbstractSoap11MessageTests; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoap11MessageTest extends AbstractSoap11MessageTest { +public class SaajSoap11MessageTests extends AbstractSoap11MessageTests { 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/SaajSoap12BodyTests.java similarity index 94% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12BodyTests.java index f361fa7f..ea81b776 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/SaajSoap12BodyTests.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.AbstractSoap12BodyTest; +import org.springframework.ws.soap.soap12.AbstractSoap12BodyTests; -public class SaajSoap12BodyTest extends AbstractSoap12BodyTest { +public class SaajSoap12BodyTests extends AbstractSoap12BodyTests { @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/SaajSoap12EnvelopeTests.java similarity index 93% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12EnvelopeTests.java index 1ef0c7a5..0aed9b89 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/SaajSoap12EnvelopeTests.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.AbstractSoap12EnvelopeTest; +import org.springframework.ws.soap.soap12.AbstractSoap12EnvelopeTests; -public class SaajSoap12EnvelopeTest extends AbstractSoap12EnvelopeTest { +public class SaajSoap12EnvelopeTests extends AbstractSoap12EnvelopeTests { @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/SaajSoap12HeaderTests.java similarity index 93% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12HeaderTests.java index ef21e249..f1408f4c 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/SaajSoap12HeaderTests.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.AbstractSoap12HeaderTest; +import org.springframework.ws.soap.soap12.AbstractSoap12HeaderTests; -public class SaajSoap12HeaderTest extends AbstractSoap12HeaderTest { +public class SaajSoap12HeaderTests extends AbstractSoap12HeaderTests { @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/SaajSoap12MessageFactoryTests.java similarity index 91% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageFactoryTests.java index 58ecbda5..a4be0001 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/SaajSoap12MessageFactoryTests.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.AbstractSoap12MessageFactoryTest; +import org.springframework.ws.soap.soap12.AbstractSoap12MessageFactoryTests; -public class SaajSoap12MessageFactoryTest extends AbstractSoap12MessageFactoryTest { +public class SaajSoap12MessageFactoryTests extends AbstractSoap12MessageFactoryTests { @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/SaajSoap12MessageTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTests.java index 7902bdeb..491a6699 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/SaajSoap12MessageTests.java @@ -25,13 +25,13 @@ import jakarta.xml.soap.SOAPMessage; import org.xmlunit.assertj.XmlAssert; import org.springframework.ws.soap.SoapMessage; -import org.springframework.ws.soap.soap12.AbstractSoap12MessageTest; +import org.springframework.ws.soap.soap12.AbstractSoap12MessageTests; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; -public class SaajSoap12MessageTest extends AbstractSoap12MessageTest { +public class SaajSoap12MessageTests extends AbstractSoap12MessageTests { @Override protected String getNS() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTests.java index 9c7e2f99..82ea7eb3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajContentHandlerTests.java @@ -37,7 +37,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class SaajContentHandlerTest { +public class SaajContentHandlerTests { private SaajContentHandler handler; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTests.java index c542a2be..beb961ed 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajUtilsTests.java @@ -41,7 +41,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class SaajUtilsTest { +public class SaajUtilsTests { private MessageFactory messageFactory; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTests.java index 4933df5a..2f48d768 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/support/SaajXmlReaderTests.java @@ -33,7 +33,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class SaajXmlReaderTest { +public class SaajXmlReaderTests { private SaajXmlReader saajReader; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTests.java index 2174e59c..7f6f8308 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/SoapMessageDispatcherTests.java @@ -47,7 +47,7 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SoapMessageDispatcherTest { +public class SoapMessageDispatcherTests { private SoapMessageDispatcher dispatcher; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTests.java index 22782c87..a3b1f77b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/FaultCreatingValidatingMarshallingPayloadEndpointTests.java @@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @Deprecated -public class FaultCreatingValidatingMarshallingPayloadEndpointTest { +public class FaultCreatingValidatingMarshallingPayloadEndpointTests { private MessageContext messageContext; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTests.java index b6cab31e..74535e7d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SimpleSoapExceptionResolverTests.java @@ -34,7 +34,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SimpleSoapExceptionResolverTest { +public class SimpleSoapExceptionResolverTests { private SimpleSoapExceptionResolver exceptionResolver; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTests.java index 32e66a76..e5e776db 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultAnnotationExceptionResolverTests.java @@ -40,7 +40,7 @@ import org.springframework.ws.soap.soap12.Soap12Fault; import static org.assertj.core.api.Assertions.assertThat; -public class SoapFaultAnnotationExceptionResolverTest { +public class SoapFaultAnnotationExceptionResolverTests { private SoapFaultAnnotationExceptionResolver resolver; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTests.java index ea8c96e3..fc7f311d 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditorTests.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class SoapFaultDefinitionEditorTest { +public class SoapFaultDefinitionEditorTests { private SoapFaultDefinitionEditor editor; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTests.java index 920e6e4f..3fac8f1c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolverTests.java @@ -39,7 +39,7 @@ import org.springframework.ws.soap.soap12.Soap12Fault; import static org.assertj.core.api.Assertions.assertThat; -public class SoapFaultMappingExceptionResolverTest { +public class SoapFaultMappingExceptionResolverTests { private SoapFaultMappingExceptionResolver resolver; 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/SoapHeaderElementMethodArgumentResolverTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolverTests.java index db303ed9..ebd1ba0a 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/SoapHeaderElementMethodArgumentResolverTests.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.AbstractMethodArgumentResolverTest; +import org.springframework.ws.server.endpoint.adapter.method.AbstractMethodArgumentResolverTests; 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 AbstractMethodArgumentResolverTest { +public class SoapHeaderElementMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests { 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/SoapMethodArgumentResolverTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapMethodArgumentResolverTests.java index 2706d2af..c51580ae 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/SoapMethodArgumentResolverTests.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.AbstractMethodArgumentResolverTest; +import org.springframework.ws.server.endpoint.adapter.method.AbstractMethodArgumentResolverTests; 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 AbstractMethodArgumentResolverTest { +public class SoapMethodArgumentResolverTests extends AbstractMethodArgumentResolverTests { private SoapMethodArgumentResolver resolver; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTests.java index 8180e982..5b9ecea7 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadRootSmartSoapEndpointInterceptorTests.java @@ -29,7 +29,7 @@ import org.springframework.ws.server.endpoint.interceptor.EndpointInterceptorAda import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class PayloadRootSmartSoapEndpointInterceptorTest { +public class PayloadRootSmartSoapEndpointInterceptorTests { private EndpointInterceptor delegate; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTests.java index 4a52343a..cc5b05f8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTests.java @@ -49,7 +49,7 @@ import org.springframework.xml.xsd.SimpleXsdSchema; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class PayloadValidatingInterceptorTest { +public class PayloadValidatingInterceptorTests { private PayloadValidatingInterceptor interceptor; @@ -228,7 +228,7 @@ public class PayloadValidatingInterceptorTest { "org.apache.xerces.jaxp.validation.XMLSchemaFactory"); try { PayloadValidatingInterceptor interceptor = new PayloadValidatingInterceptor(); - interceptor.setSchema(new ClassPathResource(SCHEMA2, PayloadValidatingInterceptorTest.class)); + interceptor.setSchema(new ClassPathResource(SCHEMA2, PayloadValidatingInterceptorTests.class)); interceptor.afterPropertiesSet(); MessageFactory messageFactory = MessageFactory.newInstance(); SOAPMessage saajMessage = SaajUtils.loadMessage(new ClassPathResource(VALID_SOAP_MESSAGE, getClass()), diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTests.java index 797353d4..d50c93d9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/SoapActionSmartEndpointInterceptorTests.java @@ -29,7 +29,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class SoapActionSmartEndpointInterceptorTest { +public class SoapActionSmartEndpointInterceptorTests { private EndpointInterceptor delegate; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTests.java index 25a211c9..cdd0a8d0 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/DelegatingSoapEndpointMappingTests.java @@ -32,7 +32,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class DelegatingSoapEndpointMappingTest { +public class DelegatingSoapEndpointMappingTests { private DelegatingSoapEndpointMapping endpointMapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTests.java index c3e3118d..170881b9 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMappingTests.java @@ -38,7 +38,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SoapActionAnnotationMethodEndpointMappingTest { +public class SoapActionAnnotationMethodEndpointMappingTests { private SoapActionAnnotationMethodEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTests.java index bb87f672..53caa812 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionEndpointMappingTests.java @@ -27,7 +27,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import static org.assertj.core.api.Assertions.assertThat; -public class SoapActionEndpointMappingTest { +public class SoapActionEndpointMappingTests { private SoapActionEndpointMapping mapping; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTests.java index 9f0a84c4..143d2295 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11BodyTests.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.AbstractSoapBodyTest; +import org.springframework.ws.soap.AbstractSoapBodyTests; 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 AbstractSoap11BodyTest extends AbstractSoapBodyTest { +public abstract class AbstractSoap11BodyTests extends AbstractSoapBodyTests { @Test public void testGetType() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTests.java similarity index 90% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTests.java index 379abebd..4fff2ba2 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11EnvelopeTests.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.AbstractSoapEnvelopeTest; +import org.springframework.ws.soap.AbstractSoapEnvelopeTests; import org.springframework.ws.soap.SoapVersion; import org.springframework.xml.transform.StringResult; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractSoap11EnvelopeTest extends AbstractSoapEnvelopeTest { +public abstract class AbstractSoap11EnvelopeTests extends AbstractSoapEnvelopeTests { @Test public void testGetName() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTests.java index 23eb3fc6..013a5b61 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11HeaderTests.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.AbstractSoapHeaderTest; +import org.springframework.ws.soap.AbstractSoapHeaderTests; 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 AbstractSoap11HeaderTest extends AbstractSoapHeaderTest { +public abstract class AbstractSoap11HeaderTests extends AbstractSoapHeaderTests { private static final String PREFIX = "spring"; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTests.java similarity index 87% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTests.java index 14261e56..a6d68f57 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageFactoryTests.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.AbstractSoapMessageFactoryTest; +import org.springframework.ws.soap.AbstractSoapMessageFactoryTests; 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 AbstractSoap11MessageFactoryTest extends AbstractSoapMessageFactoryTest { +public abstract class AbstractSoap11MessageFactoryTests extends AbstractSoapMessageFactoryTests { @Test public void testCreateEmptySoap11Message() { @@ -51,7 +51,7 @@ public abstract class AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Override public void testCreateSoapMessageNoAttachment() throws Exception { - InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11.xml"); + InputStream is = AbstractSoap11MessageFactoryTests.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 AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Override public void doTestCreateSoapMessageIllFormedXml() throws Exception { - InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-ill-formed.xml"); + InputStream is = AbstractSoap11MessageFactoryTests.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 AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Override public void testCreateSoapMessageSwA() throws Exception { - InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-attachment.bin"); + InputStream is = AbstractSoap11MessageFactoryTests.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 AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Override public void testCreateSoapMessageMtom() throws Exception { - InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-mtom.bin"); + InputStream is = AbstractSoap11MessageFactoryTests.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 AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Test public void testCreateSoapMessageMtomWeirdStartInfo() throws Exception { - InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-mtom.bin"); + InputStream is = AbstractSoap11MessageFactoryTests.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 AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Test public void testCreateSoapMessageUtf8ByteOrderMark() throws Exception { - InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-utf8-bom.xml"); + InputStream is = AbstractSoap11MessageFactoryTests.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 AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Test public void testCreateSoapMessageUtf16BigEndianByteOrderMark() throws Exception { - InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-utf16-be-bom.xml"); + InputStream is = AbstractSoap11MessageFactoryTests.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 AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Test public void testCreateSoapMessageUtf16LittleEndianByteOrderMark() throws Exception { - InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11-utf16-le-bom.xml"); + InputStream is = AbstractSoap11MessageFactoryTests.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 AbstractSoap11MessageFactoryTest extends AbstractSoapMessa @Override public void testCreateSoapMessageMissingContentType() throws Exception { - InputStream is = AbstractSoap11MessageFactoryTest.class.getResourceAsStream("soap11.xml"); + InputStream is = AbstractSoap11MessageFactoryTests.class.getResourceAsStream("soap11.xml"); TransportInputStream tis = new MockTransportInputStream(is, Collections.emptyMap()); WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTests.java index b18ab40f..078d7dbf 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTests.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.AbstractSoapMessageTest; +import org.springframework.ws.soap.AbstractSoapMessageTests; 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 AbstractSoap11MessageTest extends AbstractSoapMessageTest { +public abstract class AbstractSoap11MessageTests extends AbstractSoapMessageTests { @Override protected final Resource[] getSoapSchemas() { - return new Resource[] { new ClassPathResource("soap11.xsd", AbstractSoap11MessageTest.class) }; + return new Resource[] { new ClassPathResource("soap11.xsd", AbstractSoap11MessageTests.class) }; } @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTests.java index 6b6d521f..441fcbd3 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12BodyTests.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.AbstractSoapBodyTest; +import org.springframework.ws.soap.AbstractSoapBodyTests; 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 AbstractSoap12BodyTest extends AbstractSoapBodyTest { +public abstract class AbstractSoap12BodyTests extends AbstractSoapBodyTests { @Test public void testGetType() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTests.java similarity index 90% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTests.java index 7be1c660..2a74fa6f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12EnvelopeTests.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.AbstractSoapEnvelopeTest; +import org.springframework.ws.soap.AbstractSoapEnvelopeTests; import org.springframework.ws.soap.SoapVersion; import org.springframework.xml.transform.StringResult; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractSoap12EnvelopeTest extends AbstractSoapEnvelopeTest { +public abstract class AbstractSoap12EnvelopeTests extends AbstractSoapEnvelopeTests { @Test public void testGetName() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTests.java index ed2fae0f..c9697157 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12HeaderTests.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.AbstractSoapHeaderTest; +import org.springframework.ws.soap.AbstractSoapHeaderTests; 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 AbstractSoap12HeaderTest extends AbstractSoapHeaderTest { +public abstract class AbstractSoap12HeaderTests extends AbstractSoapHeaderTests { @Test public void testGetType() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTests.java similarity index 89% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTests.java index 31056f70..ac6f288e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageFactoryTests.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.AbstractSoapMessageFactoryTest; +import org.springframework.ws.soap.AbstractSoapMessageFactoryTests; 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 AbstractSoap12MessageFactoryTest extends AbstractSoapMessageFactoryTest { +public abstract class AbstractSoap12MessageFactoryTests extends AbstractSoapMessageFactoryTests { @Override public void testCreateEmptyMessage() { @@ -50,7 +50,7 @@ public abstract class AbstractSoap12MessageFactoryTest extends AbstractSoapMessa @Override public void testCreateSoapMessageNoAttachment() throws Exception { - InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12.xml"); + InputStream is = AbstractSoap12MessageFactoryTests.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 AbstractSoap12MessageFactoryTest extends AbstractSoapMessa @Override public void doTestCreateSoapMessageIllFormedXml() throws Exception { - InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12-ill-formed.xml"); + InputStream is = AbstractSoap12MessageFactoryTests.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 AbstractSoap12MessageFactoryTest extends AbstractSoapMessa @Override public void testCreateSoapMessageSwA() throws Exception { - InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12-attachment.bin"); + InputStream is = AbstractSoap12MessageFactoryTests.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 AbstractSoap12MessageFactoryTest extends AbstractSoapMessa @Override public void testCreateSoapMessageMtom() throws Exception { - InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12-mtom.bin"); + InputStream is = AbstractSoap12MessageFactoryTests.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 AbstractSoap12MessageFactoryTest extends AbstractSoapMessa @Override public void testCreateSoapMessageMissingContentType() throws Exception { - InputStream is = AbstractSoap12MessageFactoryTest.class.getResourceAsStream("soap12.xml"); + InputStream is = AbstractSoap12MessageFactoryTests.class.getResourceAsStream("soap12.xml"); TransportInputStream tis = new MockTransportInputStream(is, Collections.emptyMap()); WebServiceMessage message = this.messageFactory.createWebServiceMessage(tis); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTests.java index 8b9badbc..26b0f69c 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTests.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.AbstractSoapMessageTest; +import org.springframework.ws.soap.AbstractSoapMessageTests; 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 AbstractSoap12MessageTest extends AbstractSoapMessageTest { +public abstract class AbstractSoap12MessageTests extends AbstractSoapMessageTests { @Override public void testGetVersion() { @@ -53,8 +53,8 @@ public abstract class AbstractSoap12MessageTest extends AbstractSoapMessageTest @Override protected final Resource[] getSoapSchemas() { - return new Resource[] { new ClassPathResource("xml.xsd", AbstractSoap12MessageTest.class), - new ClassPathResource("soap12.xsd", AbstractSoap12MessageTest.class) }; + return new Resource[] { new ClassPathResource("xml.xsd", AbstractSoap12MessageTests.class), + new ClassPathResource("soap12.xsd", AbstractSoap12MessageTests.class) }; } @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTests.java index ae37c479..dbad5893 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/support/SoapUtilsTests.java @@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class SoapUtilsTest { +public class SoapUtilsTests { @Test public void testExtractActionFromContentType() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTests.java index 277bb6a4..019a5457 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/support/DefaultStrategiesHelperTests.java @@ -32,7 +32,7 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class DefaultStrategiesHelperTest { +public class DefaultStrategiesHelperTests { @Test public void testGetDefaultStrategies() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTest.java b/spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTests.java index b930ee87..cf9bb4ef 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/support/MarshallingUtilsTests.java @@ -39,7 +39,7 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class MarshallingUtilsTest { +public class MarshallingUtilsTests { @Test public void testUnmarshal() throws Exception { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTests.java index 3e82b026..6e1b2aa4 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTests.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; /** * @author Andreas Veithen */ -public class AbstractHttpSenderConnectionTest { +public class AbstractHttpSenderConnectionTests { /** * Tests that {@link AbstractHttpSenderConnection} doesn't consume the response stream diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTests.java index e3110470..b25dd0be 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTests.java @@ -61,7 +61,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractHttpWebServiceMessageSenderIntegrationTest { +public abstract class AbstractHttpWebServiceMessageSenderIntegrationTests { 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/ClientHttpRequestMessageSenderIntegrationTests.java similarity index 83% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSenderIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/ClientHttpRequestMessageSenderIntegrationTests.java index c4d61a70..11610596 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/ClientHttpRequestMessageSenderIntegrationTests.java @@ -16,8 +16,8 @@ package org.springframework.ws.transport.http; -public class ClientHttpRequestMessageSenderIntegrationTest - extends AbstractHttpWebServiceMessageSenderIntegrationTest { +public class ClientHttpRequestMessageSenderIntegrationTests + extends AbstractHttpWebServiceMessageSenderIntegrationTests { @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/CommonsHttpMessageSenderIntegrationTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/CommonsHttpMessageSenderIntegrationTests.java index 93c9d74c..a6f9999d 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/CommonsHttpMessageSenderIntegrationTests.java @@ -40,8 +40,8 @@ import org.springframework.ws.transport.WebServiceConnection; import org.springframework.ws.transport.support.FreePortScanner; @Deprecated -public class CommonsHttpMessageSenderIntegrationTest - extends AbstractHttpWebServiceMessageSenderIntegrationTest { +public class CommonsHttpMessageSenderIntegrationTests + extends AbstractHttpWebServiceMessageSenderIntegrationTests { @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/HttpComponents5ContentTypeIntegrationTests.java similarity index 91% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5ContentTypeIntegrationTests.java index 3e8d82e9..7eeb41a6 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/HttpComponents5ContentTypeIntegrationTests.java @@ -22,8 +22,8 @@ import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -class HttpComponents5ContentTypeIntegrationTest - extends AbstractHttpWebServiceMessageSenderIntegrationTest { +class HttpComponents5ContentTypeIntegrationTests + extends AbstractHttpWebServiceMessageSenderIntegrationTests { @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/HttpComponents5MessageSenderIntegrationTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderIntegrationTests.java index eec284c7..46fc11d6 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/HttpComponents5MessageSenderIntegrationTests.java @@ -45,8 +45,8 @@ import org.springframework.ws.transport.support.FreePortScanner; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.springframework.ws.transport.http.HttpComponents5ClientFactory.getPort; -class HttpComponents5MessageSenderIntegrationTest - extends AbstractHttpWebServiceMessageSenderIntegrationTest { +class HttpComponents5MessageSenderIntegrationTests + extends AbstractHttpWebServiceMessageSenderIntegrationTests { @Override protected HttpComponents5MessageSender createMessageSender() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderTests.java index 97d7069f..9e21528f 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponents5MessageSenderTests.java @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; * @author Lars Uffmann * @author Stephane Nicoll */ -class HttpComponents5MessageSenderTest { +class HttpComponents5MessageSenderTests { @Test void afterPropertiesSetShouldProperlyInitializeHttpClient() throws Exception { 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/HttpComponentsMessageSenderIntegrationTests.java similarity index 97% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpComponentsMessageSenderIntegrationTests.java index 466512a1..82243ef1 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/HttpComponentsMessageSenderIntegrationTests.java @@ -46,8 +46,8 @@ import org.springframework.ws.transport.support.FreePortScanner; import static org.assertj.core.api.Assertions.assertThat; @SuppressWarnings("deprecation") -public class HttpComponentsMessageSenderIntegrationTest - extends AbstractHttpWebServiceMessageSenderIntegrationTest { +public class HttpComponentsMessageSenderIntegrationTests + extends AbstractHttpWebServiceMessageSenderIntegrationTests { @Override protected HttpComponentsMessageSender createMessageSender() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTests.java index f29c99d6..855c76af 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpServletConnectionTests.java @@ -41,7 +41,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class HttpServletConnectionTest { +public class HttpServletConnectionTests { private HttpServletConnection connection; 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/HttpUrlConnectionMessageSenderIntegrationTests.java similarity index 89% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/HttpUrlConnectionMessageSenderIntegrationTests.java index 9d616cba..e1f902c1 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/HttpUrlConnectionMessageSenderIntegrationTests.java @@ -22,8 +22,8 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class HttpUrlConnectionMessageSenderIntegrationTest - extends AbstractHttpWebServiceMessageSenderIntegrationTest { +public class HttpUrlConnectionMessageSenderIntegrationTests + extends AbstractHttpWebServiceMessageSenderIntegrationTests { @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/JdkHttpClientMessageSenderIntegrationTests.java similarity index 84% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/JdkHttpClientMessageSenderIntegrationTests.java index b2aad9c5..931b2a47 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/JdkHttpClientMessageSenderIntegrationTests.java @@ -16,8 +16,8 @@ package org.springframework.ws.transport.http; -public class JdkHttpClientMessageSenderIntegrationTest - extends AbstractHttpWebServiceMessageSenderIntegrationTest { +public class JdkHttpClientMessageSenderIntegrationTests + extends AbstractHttpWebServiceMessageSenderIntegrationTests { @Override protected JdkHttpClientMessageSender createMessageSender() { diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTests.java similarity index 98% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTests.java index 438c40ef..02a52471 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/LastModifiedHelperTests.java @@ -32,7 +32,7 @@ import org.springframework.xml.transform.ResourceSource; import static org.assertj.core.api.Assertions.assertThat; -public class LastModifiedHelperTest { +public class LastModifiedHelperTests { private Resource resource; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTests.java similarity index 96% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTests.java index 03af8cd2..582c8358 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletIntegrationTests.java @@ -43,7 +43,7 @@ import static org.xmlunit.assertj.XmlAssert.assertThat; /** * @author Arjen Poutsma */ -public class MessageDispatcherServletIntegrationTest { +public class MessageDispatcherServletIntegrationTests { private static Server jettyServer; @@ -66,7 +66,7 @@ public class MessageDispatcherServletIntegrationTest { ServletContextHandler jettyContext = new ServletContextHandler(); jettyContext.setContextPath("/"); - String resourceBase = new File(MessageDispatcherServletIntegrationTest.class.getResource("WEB-INF").toURI()) + String resourceBase = new File(MessageDispatcherServletIntegrationTests.class.getResource("WEB-INF").toURI()) .getParent(); jettyContext.setBaseResourceAsString(resourceBase); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTests.java index 96db8e73..046772a1 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/MessageDispatcherServletTests.java @@ -46,7 +46,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class MessageDispatcherServletTest { +public class MessageDispatcherServletTests { private ServletConfig config; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTests.java similarity index 99% rename from spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java rename to spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTests.java index 586b889d..9ce8285b 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHandlerAdapterTests.java @@ -41,7 +41,7 @@ import static org.easymock.EasyMock.isA; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class WebServiceMessageReceiverHandlerAdapterTest { +public class WebServiceMessageReceiverHandlerAdapterTests { private static final String REQUEST = """ + class="org.springframework.ws.server.endpoint.mapping.BridgedMethodRegistrationTests$B"/> diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml index 679fc4e3..c240f54a 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml +++ b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/cglib-proxy-registration.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd"> + class="org.springframework.ws.server.endpoint.mapping.CgLibProxyRegistrationTests$MyEndpoint"/> diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml index 8147da3e..856a1c01 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml +++ b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/jdk-proxy-registration.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/web-services http://www.springframework.org/schema/web-services/web-services-2.0.xsd"> + class="org.springframework.ws.server.endpoint.mapping.JdkProxyRegistrationTests$MyEndpointImpl"/> diff --git a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml index 1aa091d1..0b03e049 100644 --- a/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml +++ b/spring-ws-core/src/test/resources/org/springframework/ws/server/endpoint/mapping/payloadRootAnnotationMethodEndpointMapping.xml @@ -6,12 +6,12 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> + class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMappingTests$MyEndpoint"/> + class="org.springframework.ws.server.endpoint.mapping.PayloadRootAnnotationMethodEndpointMappingTests$OtherBean"/> diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTests.java index 45a754da..6730d1a6 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/SkipValidationWsSecurityInterceptorTests.java @@ -36,7 +36,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -public class SkipValidationWsSecurityInterceptorTest { +public class SkipValidationWsSecurityInterceptorTests { private MessageFactory messageFactory; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTests.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTests.java index 6c7f4d90..7342a571 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/callback/CallbackHandlerChainTests.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class CallbackHandlerChainTest { +public class CallbackHandlerChainTests { private CallbackHandler supported = callbacks -> { }; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTests.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTests.java index 46bba03e..b5cc20e5 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/KeyManagersFactoryBeanTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class KeyManagersFactoryBeanTest { +public class KeyManagersFactoryBeanTests { @Test public void defaults() throws Exception { diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTests.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTests.java index 6fb8e712..0ac909e3 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/support/TrustManagersFactoryBeanTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class TrustManagersFactoryBeanTest { +public class TrustManagersFactoryBeanTests { @Test public void defaults() throws Exception { 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/SaajWss4jInterceptorTests.java similarity index 90% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jInterceptorTests.java index dd868587..ab61a60b 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/SaajWss4jInterceptorTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jInterceptorTest extends Wss4jInterceptorTest { +public class SaajWss4jInterceptorTests extends Wss4jInterceptorTests { } diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTests.java new file mode 100644 index 00000000..e0adb7a6 --- /dev/null +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTests.java @@ -0,0 +1,21 @@ +/* + * Copyright 2005-2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.ws.soap.security.wss4j2; + +public class SaajWss4jMessageInterceptorEncryptionTests extends Wss4jMessageInterceptorEncryptionTests { + +} 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/SaajWss4jMessageInterceptorHeaderTests.java similarity index 87% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorHeaderTests.java index 2ae6775e..9af6b8e2 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/SaajWss4jMessageInterceptorHeaderTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorHeaderTest extends Wss4jMessageInterceptorHeaderTest { +public class SaajWss4jMessageInterceptorHeaderTests extends Wss4jMessageInterceptorHeaderTests { } 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/SaajWss4jMessageInterceptorSamlTests.java similarity index 87% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSamlTests.java index 1f597d12..8d777917 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/SaajWss4jMessageInterceptorSamlTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorSamlTest extends Wss4jMessageInterceptorSamlTest { +public class SaajWss4jMessageInterceptorSamlTests extends Wss4jMessageInterceptorSamlTests { } 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/SaajWss4jMessageInterceptorSignTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSignTests.java index ee49cd4f..bdcd1ccc 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/SaajWss4jMessageInterceptorSignTests.java @@ -39,7 +39,7 @@ import org.springframework.xml.transform.TransformerFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class SaajWss4jMessageInterceptorSignTest extends Wss4jMessageInterceptorSignTest { +public class SaajWss4jMessageInterceptorSignTests extends Wss4jMessageInterceptorSignTests { 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 deleted file mode 100644 index 2a21587b..00000000 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTest.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2005-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.ws.soap.security.wss4j2; - -public class SaajWss4jMessageInterceptorSoapActionTest extends Wss4jMessageInterceptorSoapActionTest { - -} diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTests.java new file mode 100644 index 00000000..999c29dc --- /dev/null +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSoapActionTests.java @@ -0,0 +1,21 @@ +/* + * Copyright 2005-2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.ws.soap.security.wss4j2; + +public class SaajWss4jMessageInterceptorSoapActionTests extends Wss4jMessageInterceptorSoapActionTests { + +} 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/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java index 90b4768e..ee65c205 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/SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java @@ -16,7 +16,7 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTest - extends Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest { +public class SaajWss4jMessageInterceptorSpringSecurityCallbackHandlerTests + extends Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests { } 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 deleted file mode 100644 index c9e469c6..00000000 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTest.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2005-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.ws.soap.security.wss4j2; - -public class SaajWss4jMessageInterceptorTimestampTest extends Wss4jMessageInterceptorTimestampTest { - -} 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/SaajWss4jMessageInterceptorTimestampTests.java similarity index 86% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorEncryptionTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorTimestampTests.java index d38acaea..8c468291 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/SaajWss4jMessageInterceptorTimestampTests.java @@ -16,6 +16,6 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorEncryptionTest extends Wss4jMessageInterceptorEncryptionTest { +public class SaajWss4jMessageInterceptorTimestampTests extends Wss4jMessageInterceptorTimestampTests { } 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/SaajWss4jMessageInterceptorUsernameTokenSignatureTests.java similarity index 91% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenSignatureTests.java index 35bc474a..d22b2f66 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/SaajWss4jMessageInterceptorUsernameTokenSignatureTests.java @@ -16,7 +16,7 @@ package org.springframework.ws.soap.security.wss4j2; -public class SaajWss4jMessageInterceptorUsernameTokenSignatureTest - extends Wss4jMessageInterceptorUsernameTokenSignatureTest { +public class SaajWss4jMessageInterceptorUsernameTokenSignatureTests + extends Wss4jMessageInterceptorUsernameTokenSignatureTests { } 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 deleted file mode 100644 index c6266508..00000000 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTest.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2005-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.ws.soap.security.wss4j2; - -public class SaajWss4jMessageInterceptorUsernameTokenTest extends Wss4jMessageInterceptorUsernameTokenTest { - -} diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTests.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTests.java new file mode 100644 index 00000000..42ee11d5 --- /dev/null +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorUsernameTokenTests.java @@ -0,0 +1,21 @@ +/* + * Copyright 2005-2025 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.ws.soap.security.wss4j2; + +public class SaajWss4jMessageInterceptorUsernameTokenTests extends Wss4jMessageInterceptorUsernameTokenTests { + +} 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/SaajWss4jMessageInterceptorX509Tests.java similarity index 88% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Test.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jMessageInterceptorX509Tests.java index 6d905df7..e822c485 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/SaajWss4jMessageInterceptorX509Tests.java @@ -19,6 +19,6 @@ package org.springframework.ws.soap.security.wss4j2; /** * @author tareq */ -public class SaajWss4jMessageInterceptorX509Test extends Wss4jMessageInterceptorX509Test { +public class SaajWss4jMessageInterceptorX509Tests extends Wss4jMessageInterceptorX509Tests { } 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/SaajWss4jSecurityInterceptorDefaultsTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/SaajWss4jSecurityInterceptorDefaultsTests.java index b448e2d6..e33fc0fe 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/SaajWss4jSecurityInterceptorDefaultsTests.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 Wss4jTest { +public class SaajWss4jSecurityInterceptorDefaultsTests extends Wss4jTests { private static final String PAYLOAD = "QQQ"; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTests.java index 426f03cd..d127c7f1 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jInterceptorTests.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 Wss4jInterceptorTest extends Wss4jTest { +public abstract class Wss4jInterceptorTests extends Wss4jTests { @Test public void testHandleRequest() throws Exception { diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTests.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTests.java index f970de49..bcb14d1f 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorEncryptionTests.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 Wss4jMessageInterceptorEncryptionTest extends Wss4jTest { +public abstract class Wss4jMessageInterceptorEncryptionTests extends Wss4jTests { protected Wss4jSecurityInterceptor interceptor; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTests.java index 1a717a9d..770b32c7 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorHeaderTests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.fail; * @author Tareq Abedrabbo * @author Greg Turnquist */ -public abstract class Wss4jMessageInterceptorHeaderTest extends Wss4jTest { +public abstract class Wss4jMessageInterceptorHeaderTests extends Wss4jTests { private Wss4jSecurityInterceptor interceptor; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTests.java index 40a47275..dadf8ae9 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSamlTests.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 Wss4jMessageInterceptorSamlTest extends Wss4jTest { +public abstract class Wss4jMessageInterceptorSamlTests extends Wss4jTests { protected Wss4jSecurityInterceptor interceptor; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTests.java index 1765d054..a7b27b00 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSignTests.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 Wss4jMessageInterceptorSignTest extends Wss4jTest { +public abstract class Wss4jMessageInterceptorSignTests extends Wss4jTests { protected Wss4jSecurityInterceptor interceptor; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTests.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTests.java index 227869a8..674ad656 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSoapActionTests.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 Wss4jMessageInterceptorSoapActionTest extends Wss4jTest { +public abstract class Wss4jMessageInterceptorSoapActionTests extends Wss4jTests { private static final String SOAP_ACTION = "\"http://test\""; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java similarity index 99% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests.java index b503b1f0..d9d48184 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests.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 Wss4jMessageInterceptorSpringSecurityCallbackHandlerTest extends Wss4jTest { +public abstract class Wss4jMessageInterceptorSpringSecurityCallbackHandlerTests extends Wss4jTests { private Properties users = new Properties(); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTests.java index dbb79871..b3e60657 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorTimestampTests.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 Wss4jMessageInterceptorTimestampTest extends Wss4jTest { +public abstract class Wss4jMessageInterceptorTimestampTests extends Wss4jTests { @Test public void testAddTimestamp() throws Exception { diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTests.java index 0f811cec..61174fac 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenSignatureTests.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 Wss4jMessageInterceptorUsernameTokenSignatureTest extends Wss4jTest { +public abstract class Wss4jMessageInterceptorUsernameTokenSignatureTests extends Wss4jTests { @Test public void testAddUsernameTokenSignature() throws Exception { diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTests.java index 607f5b72..13604ef7 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTests.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 Wss4jMessageInterceptorUsernameTokenTest extends Wss4jTest { +public abstract class Wss4jMessageInterceptorUsernameTokenTests extends Wss4jTests { private Properties users = new Properties(); diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Tests.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Tests.java index 25ac989b..9694bc36 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Test.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorX509Tests.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 Wss4jMessageInterceptorX509Test extends Wss4jTest { +public abstract class Wss4jMessageInterceptorX509Tests extends Wss4jTests { protected Wss4jSecurityInterceptor interceptor; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTests.java similarity index 99% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTests.java index 52a41acf..ffa7c747 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTests.java @@ -45,7 +45,7 @@ import org.springframework.xml.xpath.Jaxp13XPathTemplate; import static org.assertj.core.api.Assertions.assertThat; -public abstract class Wss4jTest { +public abstract class Wss4jTests { protected MessageFactory saajSoap11MessageFactory; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTests.java similarity index 97% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTests.java index 4a5233ba..c2a3f216 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandlerTests.java @@ -27,7 +27,7 @@ import org.springframework.ws.soap.security.support.KeyStoreFactoryBean; import static org.assertj.core.api.Assertions.assertThat; -public class KeyStoreCallbackHandlerTest { +public class KeyStoreCallbackHandlerTests { private KeyStoreCallbackHandler callbackHandler; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTests.java similarity index 99% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTests.java index 9227081a..9d299dc0 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/callback/SpringSecurityPasswordValidationCallbackHandlerTests.java @@ -43,7 +43,7 @@ import static org.easymock.EasyMock.verify; /** * @author tareq */ -public class SpringSecurityPasswordValidationCallbackHandlerTest { +public class SpringSecurityPasswordValidationCallbackHandlerTests { private SpringSecurityPasswordValidationCallbackHandler callbackHandler; diff --git a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTest.java b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTests.java similarity index 98% rename from spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTest.java rename to spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTests.java index a0c08d79..3d73c81c 100644 --- a/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTest.java +++ b/spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBeanTests.java @@ -26,7 +26,7 @@ import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; -public class CryptoFactoryBeanTest { +public class CryptoFactoryBeanTests { private CryptoFactoryBean factoryBean; diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTests.java similarity index 95% rename from spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java rename to spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTests.java index f11f7f89..8798e7e9 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/http/WebServiceHttpHandlerIntegrationTests.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("httpserver-applicationContext.xml") -public class WebServiceHttpHandlerIntegrationTest { +public class WebServiceHttpHandlerIntegrationTests { @Autowired private int port; @@ -62,7 +62,7 @@ public class WebServiceHttpHandlerIntegrationTest { public void testNoResponse() throws IOException { HttpPost httpRequest = new HttpPost(serviceUrl()); httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/NoResponse"); - Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class); + Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTests.class); httpRequest.setEntity(new InputStreamEntity(soapRequest.getInputStream(), ContentType.TEXT_XML)); execute(httpRequest, response -> { assertThat(response.getCode()).isEqualTo(HttpTransportConstants.STATUS_ACCEPTED); @@ -75,7 +75,7 @@ public class WebServiceHttpHandlerIntegrationTest { public void testResponse() throws IOException { HttpPost httpRequest = new HttpPost(serviceUrl()); httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/Response"); - Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class); + Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTests.class); httpRequest.setEntity(new InputStreamEntity(soapRequest.getInputStream(), ContentType.TEXT_XML)); execute(httpRequest, response -> { assertThat(response.getCode()).isEqualTo(HttpTransportConstants.STATUS_OK); @@ -88,7 +88,7 @@ public class WebServiceHttpHandlerIntegrationTest { public void testNoEndpoint() throws IOException { HttpPost httpRequest = new HttpPost(serviceUrl()); httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/NoEndpoint"); - Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class); + Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTests.class); httpRequest.setEntity(new InputStreamEntity(soapRequest.getInputStream(), ContentType.TEXT_XML)); execute(httpRequest, response -> { assertThat(response.getCode()).isEqualTo(HttpTransportConstants.STATUS_NOT_FOUND); @@ -101,7 +101,7 @@ public class WebServiceHttpHandlerIntegrationTest { public void testFault() throws IOException { HttpPost httpRequest = new HttpPost(serviceUrl()); httpRequest.addHeader(TransportConstants.HEADER_SOAP_ACTION, "http://springframework.org/spring-ws/Fault"); - Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTest.class); + Resource soapRequest = new ClassPathResource("soapRequest.xml", WebServiceHttpHandlerIntegrationTests.class); httpRequest.setEntity(new InputStreamEntity(soapRequest.getInputStream(), ContentType.TEXT_XML)); execute(httpRequest, response -> assertThat(response.getCode()) .isEqualTo(HttpTransportConstants.STATUS_INTERNAL_SERVER_ERROR)); diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTests.java similarity index 98% rename from spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java rename to spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTests.java index b86b415a..f01494d4 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTests.java @@ -30,7 +30,7 @@ import static org.xmlunit.assertj.XmlAssert.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("jms-applicationContext.xml") -public class JmsIntegrationTest { +public class JmsIntegrationTests { @Autowired private WebServiceTemplate webServiceTemplate; diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTests.java similarity index 99% rename from spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java rename to spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTests.java index 63832d92..ae434f42 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTests.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("jms-sender-applicationContext.xml") -public class JmsMessageSenderIntegrationTest { +public class JmsMessageSenderIntegrationTests { @Autowired private JmsMessageSender messageSender; diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTests.java similarity index 98% rename from spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java rename to spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTests.java index 608abadf..96b03010 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ExtendWith(SpringExtension.class) @ContextConfiguration("jms-receiver-applicationContext.xml") -public class WebServiceMessageListenerIntegrationTest { +public class WebServiceMessageListenerIntegrationTests { private static final String CONTENT = """ \ diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTests.java similarity index 99% rename from spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java rename to spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTests.java index c5bf231d..5d572238 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/support/JmsTransportUtilsTests.java @@ -26,7 +26,7 @@ import org.springframework.ws.transport.jms.JmsTransportConstants; import static org.assertj.core.api.Assertions.assertThat; -public class JmsTransportUtilsTest { +public class JmsTransportUtilsTests { @Test public void getDestinationName() throws Exception { diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTests.java similarity index 98% rename from spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java rename to spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTests.java index 5e79ba7f..edd14c6e 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailIntegrationTests.java @@ -30,7 +30,7 @@ import org.springframework.xml.transform.StringSource; import static org.assertj.core.api.Assertions.assertThat; @SpringJUnitConfig(locations = "mail-applicationContext.xml") -public class MailIntegrationTest { +public class MailIntegrationTests { @Autowired private GreenMailBean greenMailBean; diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTests.java similarity index 98% rename from spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java rename to spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTests.java index d8f4ffe7..049ecbfa 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/MailMessageSenderIntegrationTests.java @@ -38,7 +38,7 @@ import org.springframework.ws.transport.WebServiceConnection; import static org.assertj.core.api.Assertions.assertThat; -public class MailMessageSenderIntegrationTest { +public class MailMessageSenderIntegrationTests { private MailMessageSender messageSender; diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTests.java similarity index 98% rename from spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTest.java rename to spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTests.java index 017d8176..f618fecd 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/mail/support/MailTransportUtilsTests.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class MailTransportUtilsTest { +public class MailTransportUtilsTests { @Test public void testToPasswordProtectedString() { diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTests.java similarity index 96% rename from spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java rename to spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTests.java index 65b952c2..e98e9b5c 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/xmpp/support/XmppConnectionFactoryBeanTests.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException /** * @author Arjen Poutsma */ -public class XmppConnectionFactoryBeanTest { +public class XmppConnectionFactoryBeanTests { private XmppConnectionFactoryBean factoryBean; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTests.java similarity index 96% rename from spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTests.java index f4e33436..8b1d779a 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ErrorResponseCreatorTests.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class ErrorResponseCreatorTest { +public class ErrorResponseCreatorTests { @Test public void callback() throws IOException { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTests.java similarity index 96% rename from spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTests.java index 68dc8746..1fe74eb5 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCreatorTests.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIOException; -public class ExceptionResponseCreatorTest { +public class ExceptionResponseCreatorTests { @Test public void ioException() { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTests.java similarity index 97% rename from spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTests.java index 2c2e52cc..4b5cede7 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTests.java @@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.springframework.ws.test.client.ResponseCreators.withError; import static org.springframework.ws.test.client.ResponseCreators.withPayload; -public class MockSenderConnectionTest { +public class MockSenderConnectionTests { @Test public void error() throws IOException { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTests.java similarity index 97% rename from spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTests.java index 72167fd3..4445a0fe 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceMessageSenderTests.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class MockWebServiceMessageSenderTest { +public class MockWebServiceMessageSenderTests { private MockWebServiceMessageSender sender; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTests.java similarity index 99% rename from spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTests.java index 825e50bd..b5fee26e 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/MockWebServiceServerTests.java @@ -64,7 +64,7 @@ import static org.springframework.ws.test.client.ResponseCreators.withClientOrSe import static org.springframework.ws.test.client.ResponseCreators.withPayload; import static org.springframework.ws.test.client.ResponseCreators.withSoapEnvelope; -public class MockWebServiceServerTest { +public class MockWebServiceServerTests { private WebServiceTemplate template; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTests.java similarity index 99% rename from spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTests.java index 47d69e58..7fbe3d09 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/ResponseCreatorsTests.java @@ -41,7 +41,7 @@ import org.springframework.xml.transform.TransformerHelper; import static org.assertj.core.api.Assertions.assertThat; -public class ResponseCreatorsTest { +public class ResponseCreatorsTests { private final TransformerHelper transformerHelper = new TransformerHelper(); diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTests.java index 0f317eaf..87fbb286 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/UriMatcherTests.java @@ -27,7 +27,7 @@ import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; -public class UriMatcherTest { +public class UriMatcherTests { private static final URI GOOD_URI = URI.create("http://localhost"); diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTests.java similarity index 96% rename from spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTests.java index d4b9fc9d..f57d0fdf 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/WebServiceMessageMatcherAdapterTests.java @@ -31,7 +31,7 @@ import static org.easymock.EasyMock.verify; /** * @author Arjen Poutsma */ -public class WebServiceMessageMatcherAdapterTest { +public class WebServiceMessageMatcherAdapterTests { private WebServiceMessage message; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTests.java index b84221e9..38a99b71 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTests.java @@ -40,7 +40,7 @@ import static org.springframework.ws.test.client.ResponseCreators.withPayload; */ @ExtendWith(SpringExtension.class) @ContextConfiguration("integration-test.xml") -public class ClientIntegrationTest { +public class ClientIntegrationTests { @Autowired private CustomerClient client; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTests.java similarity index 97% rename from spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTests.java index 0313dc06..40c9c6c5 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/server/MockWebServiceClientTests.java @@ -24,7 +24,7 @@ import org.springframework.ws.soap.server.SoapMessageDispatcher; import static org.assertj.core.api.Assertions.assertThat; -public class MockWebServiceClientTest { +public class MockWebServiceClientTests { @Test public void createServerApplicationContext() { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTests.java similarity index 96% rename from spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTests.java index bbbb7b55..f0d3a4fb 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/server/WebServiceMessageMatcherAdapterTests.java @@ -31,7 +31,7 @@ import static org.easymock.EasyMock.verify; /** * @author Arjen Poutsma */ -public class WebServiceMessageMatcherAdapterTest { +public class WebServiceMessageMatcherAdapterTests { private WebServiceMessage message; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTests.java index cc085bd8..e8faf852 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTests.java @@ -37,7 +37,7 @@ import static org.springframework.ws.test.server.ResponseMatchers.payload; */ @ExtendWith(SpringExtension.class) @ContextConfiguration("integration-test.xml") -public class ServerIntegrationTest { +public class ServerIntegrationTests { @Autowired private ApplicationContext applicationContext; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTests.java index 5adce0e2..12a59e94 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/MockStrategiesHelperTests.java @@ -24,7 +24,7 @@ import org.springframework.context.support.StaticApplicationContext; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class MockStrategiesHelperTest { +public class MockStrategiesHelperTests { @Test public void none() { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTests.java index 7d8b0829..3376262f 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcherTests.java @@ -31,7 +31,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class PayloadDiffMatcherTest { +public class PayloadDiffMatcherTests { @Test public void match() { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTests.java similarity index 96% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTests.java index 5026ffea..c778e10b 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SchemaValidatingMatcherTests.java @@ -32,7 +32,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SchemaValidatingMatcherTest { +public class SchemaValidatingMatcherTests { private Resource schema; @@ -46,9 +46,9 @@ public class SchemaValidatingMatcherTest { public void setUp() { this.message = createMock(WebServiceMessage.class); - this.schema = new ClassPathResource("schemaValidatingMatcherTest.xsd", SchemaValidatingMatcherTest.class); - this.schema1 = new ClassPathResource("schemaValidatingMatcherTest-1.xsd", SchemaValidatingMatcherTest.class); - this.schema2 = new ClassPathResource("schemaValidatingMatcherTest-2.xsd", SchemaValidatingMatcherTest.class); + this.schema = new ClassPathResource("schemaValidatingMatcherTest.xsd", SchemaValidatingMatcherTests.class); + this.schema1 = new ClassPathResource("schemaValidatingMatcherTest-1.xsd", SchemaValidatingMatcherTests.class); + this.schema2 = new ClassPathResource("schemaValidatingMatcherTest-2.xsd", SchemaValidatingMatcherTests.class); } @Test diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTests.java index b75741d2..d728a2af 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcherTests.java @@ -32,7 +32,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; @Deprecated -public class SoapEnvelopeDiffMatcherTest { +public class SoapEnvelopeDiffMatcherTests { @Test public void match() throws Exception { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTests.java index 162065a0..95cb83c7 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/SoapHeaderMatcherTests.java @@ -30,7 +30,7 @@ import org.springframework.ws.soap.saaj.SaajSoapMessage; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.easymock.EasyMock.createMock; -public class SoapHeaderMatcherTest { +public class SoapHeaderMatcherTests { private SoapHeaderMatcher matcher; diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTests.java similarity index 99% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTests.java index a5bea887..e919d297 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/XPathExpectationsHelperTests.java @@ -32,7 +32,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class XPathExpectationsHelperTest { +public class XPathExpectationsHelperTests { @Test public void existsMatch() throws IOException, AssertionError { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java index 7c9ddc4d..2f4c36c0 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/PayloadDiffMatcherTests.java @@ -29,7 +29,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class PayloadDiffMatcherTest { +public class PayloadDiffMatcherTests { @Test public void match() { diff --git a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTest.java b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java similarity index 98% rename from spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTest.java rename to spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java index b4303b30..e16c387a 100644 --- a/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTest.java +++ b/spring-ws-test/src/test/java/org/springframework/ws/test/support/matcher/xmlunit2/SoapEnvelopeDiffMatcherTests.java @@ -34,7 +34,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class SoapEnvelopeDiffMatcherTest { +public class SoapEnvelopeDiffMatcherTests { @Test public void match() throws Exception { diff --git a/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java b/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTests.java similarity index 98% rename from spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java rename to spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTests.java index 5be63154..7f91cd0a 100644 --- a/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/dom/DomContentHandlerTests.java @@ -33,7 +33,7 @@ import org.springframework.xml.sax.SaxUtils; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class DomContentHandlerTest { +public class DomContentHandlerTests { private static final String XML_1 = "" + "" + "" diff --git a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTests.java similarity index 98% rename from spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java rename to spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTests.java index eabe3c4a..acac8c99 100644 --- a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameEditorTests.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class QNameEditorTest { +public class QNameEditorTests { private QNameEditor editor; diff --git a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTests.java similarity index 99% rename from spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java rename to spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTests.java index a73b7770..82c20ea9 100644 --- a/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/namespace/QNameUtilsTests.java @@ -28,7 +28,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.assertj.core.api.Assertions.assertThat; -public class QNameUtilsTest { +public class QNameUtilsTests { @Test public void testValidQNames() { diff --git a/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTests.java similarity index 99% rename from spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java rename to spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTests.java index f6dfbde2..97cd2f6f 100644 --- a/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTests.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -class SimpleNamespaceContextTest { +class SimpleNamespaceContextTests { private SimpleNamespaceContext context; diff --git a/spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTests.java similarity index 97% rename from spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java rename to spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTests.java index f4165391..04007dea 100644 --- a/spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/sax/SaxUtilsTests.java @@ -23,7 +23,7 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; -public class SaxUtilsTest { +public class SaxUtilsTests { @Test public void testGetSystemId() { diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTests.java similarity index 97% rename from spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java rename to spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTests.java index 176f8168..87525691 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/ResourceSourceTests.java @@ -26,7 +26,7 @@ import org.springframework.core.io.ClassPathResource; import static org.assertj.core.api.Assertions.assertThat; -public class ResourceSourceTest { +public class ResourceSourceTests { @Test public void testStringSource() throws Exception { diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTests.java similarity index 97% rename from spring-xml/src/test/java/org/springframework/xml/transform/StringResultTest.java rename to spring-xml/src/test/java/org/springframework/xml/transform/StringResultTests.java index 1245c05d..eae61afe 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/StringResultTests.java @@ -27,7 +27,7 @@ import org.springframework.xml.DocumentBuilderFactoryUtils; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class StringResultTest { +public class StringResultTests { @Test public void testStringResult() throws Exception { diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTests.java similarity index 97% rename from spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java rename to spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTests.java index 1fab7c2e..0891413e 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/StringSourceTests.java @@ -25,7 +25,7 @@ import org.w3c.dom.Element; import static org.assertj.core.api.Assertions.assertThat; -public class StringSourceTest { +public class StringSourceTests { @Test public void testStringSource() throws TransformerException { diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTests.java similarity index 97% rename from spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java rename to spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTests.java index eece1184..7f1dc023 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/TransformerHelperTests.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.xmlunit.assertj.XmlAssert.assertThat; -public class TransformerHelperTest { +public class TransformerHelperTests { private TransformerHelper helper; diff --git a/spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTests.java similarity index 99% rename from spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java rename to spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTests.java index 1a778f89..af3dbecb 100644 --- a/spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/transform/TraxUtilsTests.java @@ -64,7 +64,7 @@ import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -public class TraxUtilsTest { +public class TraxUtilsTests { @Test public void testGetDocument() throws Exception { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTests.java similarity index 91% rename from spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java rename to spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTests.java index 6d4e0b53..5e0d181f 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/AbstractValidatorFactoryTests.java @@ -38,7 +38,7 @@ import org.springframework.xml.transform.ResourceSource; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractValidatorFactoryTest { +public abstract class AbstractValidatorFactoryTests { private XmlValidator validator; @@ -50,10 +50,10 @@ public abstract class AbstractValidatorFactoryTest { public void setUp() throws Exception { Resource[] schemaResource = new Resource[] { - new ClassPathResource("schema.xsd", AbstractValidatorFactoryTest.class) }; + new ClassPathResource("schema.xsd", AbstractValidatorFactoryTests.class) }; this.validator = createValidator(schemaResource, XmlValidatorFactory.SCHEMA_W3C_XML); - this.validInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("validDocument.xml"); - this.invalidInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("invalidDocument.xml"); + this.validInputStream = AbstractValidatorFactoryTests.class.getResourceAsStream("validDocument.xml"); + this.invalidInputStream = AbstractValidatorFactoryTests.class.getResourceAsStream("invalidDocument.xml"); } @AfterEach @@ -77,7 +77,7 @@ public abstract class AbstractValidatorFactoryTest { public void testValidateTwice() throws Exception { this.validator.validate(new StreamSource(this.validInputStream)); - this.validInputStream = AbstractValidatorFactoryTest.class.getResourceAsStream("validDocument.xml"); + this.validInputStream = AbstractValidatorFactoryTests.class.getResourceAsStream("validDocument.xml"); this.validator.validate(new StreamSource(this.validInputStream)); } @@ -131,19 +131,19 @@ public abstract class AbstractValidatorFactoryTest { public void testMultipleSchemasValidMessage() throws Exception { Resource[] schemaResources = new Resource[] { - new ClassPathResource("multipleSchemas1.xsd", AbstractValidatorFactoryTest.class), - new ClassPathResource("multipleSchemas2.xsd", AbstractValidatorFactoryTest.class) }; + new ClassPathResource("multipleSchemas1.xsd", AbstractValidatorFactoryTests.class), + new ClassPathResource("multipleSchemas2.xsd", AbstractValidatorFactoryTests.class) }; this.validator = createValidator(schemaResources, XmlValidatorFactory.SCHEMA_W3C_XML); Source document = new ResourceSource( - new ClassPathResource("multipleSchemas1.xml", AbstractValidatorFactoryTest.class)); + new ClassPathResource("multipleSchemas1.xml", AbstractValidatorFactoryTests.class)); SAXParseException[] errors = this.validator.validate(document); assertThat(errors).isEmpty(); this.validator = createValidator(schemaResources, XmlValidatorFactory.SCHEMA_W3C_XML); document = new ResourceSource( - new ClassPathResource("multipleSchemas2.xml", AbstractValidatorFactoryTest.class)); + new ClassPathResource("multipleSchemas2.xml", AbstractValidatorFactoryTests.class)); errors = this.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/Jaxp13ValidatorFactoryTests.java similarity index 92% rename from spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java rename to spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTests.java index 60915aa8..dad266bb 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp13ValidatorFactoryTests.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.springframework.core.io.Resource; -public class Jaxp13ValidatorFactoryTest extends AbstractValidatorFactoryTest { +public class Jaxp13ValidatorFactoryTests extends AbstractValidatorFactoryTests { @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/Jaxp15ValidatorFactoryTests.java similarity index 92% rename from spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTest.java rename to spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTests.java index bcd91492..9ce94151 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/Jaxp15ValidatorFactoryTests.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.springframework.core.io.Resource; -public class Jaxp15ValidatorFactoryTest extends AbstractValidatorFactoryTest { +public class Jaxp15ValidatorFactoryTests extends AbstractValidatorFactoryTests { @Override protected XmlValidator createValidator(Resource[] schemaResources, String schemaLanguage) throws IOException { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTests.java similarity index 98% rename from spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java rename to spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTests.java index a61ba46f..145e93b6 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/SchemaLoaderUtilsTests.java @@ -27,7 +27,7 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class SchemaLoaderUtilsTest { +public class SchemaLoaderUtilsTests { @Test public void testLoadSchema() throws Exception { diff --git a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTests.java similarity index 96% rename from spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java rename to spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTests.java index ad8329e8..2d7f7a0e 100644 --- a/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/validation/XmlValidatorFactoryTests.java @@ -31,12 +31,12 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class XmlValidatorFactoryTest { +public class XmlValidatorFactoryTests { @Test public void testCreateValidator() throws Exception { - Resource resource = new ClassPathResource("schema.xsd", AbstractValidatorFactoryTest.class); + Resource resource = new ClassPathResource("schema.xsd", AbstractValidatorFactoryTests.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", AbstractValidatorFactoryTest.class), "bla")); + .createValidator(new ClassPathResource("schema.xsd", AbstractValidatorFactoryTests.class), "bla")); } private static final class NonExistentResource extends AbstractResource { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTests.java similarity index 99% rename from spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTests.java index dd2df903..5f408132 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathExpressionFactoryTests.java @@ -35,7 +35,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 AbstractXPathExpressionFactoryTest { +public abstract class AbstractXPathExpressionFactoryTests { private Document noNamespacesDocument; diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTests.java similarity index 91% rename from spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTests.java index a5e8f5fe..0d0d0534 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/AbstractXPathTemplateTests.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 AbstractXPathTemplateTest { +public abstract class AbstractXPathTemplateTests { XPathOperations template; @@ -59,9 +59,9 @@ public abstract class AbstractXPathTemplateTest { @BeforeEach public final void setUp() throws Exception { this.template = createTemplate(); - this.namespaces = new ResourceSource(new ClassPathResource("namespaces.xml", AbstractXPathTemplateTest.class)); + this.namespaces = new ResourceSource(new ClassPathResource("namespaces.xml", AbstractXPathTemplateTests.class)); this.nonamespaces = new ResourceSource( - new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTest.class)); + new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTests.class)); } protected abstract XPathOperations createTemplate() throws Exception; @@ -157,8 +157,8 @@ public abstract class AbstractXPathTemplateTest { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance(); documentBuilderFactory.setNamespaceAware(true); DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); - Document document = documentBuilder.parse( - SaxUtils.createInputSource(new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTest.class))); + Document document = documentBuilder.parse(SaxUtils + .createInputSource(new ClassPathResource("nonamespaces.xml", AbstractXPathTemplateTests.class))); String result = this.template.evaluateAsString("/root/child/text", new DOMSource(document)); @@ -168,7 +168,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateSAXSource() throws Exception { - InputStream in = AbstractXPathTemplateTest.class.getResourceAsStream("nonamespaces.xml"); + InputStream in = AbstractXPathTemplateTests.class.getResourceAsStream("nonamespaces.xml"); SAXSource source = new SAXSource(new InputSource(in)); String result = this.template.evaluateAsString("/root/child/text", source); @@ -178,7 +178,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateStaxSource() throws Exception { - InputStream in = AbstractXPathTemplateTest.class.getResourceAsStream("nonamespaces.xml"); + InputStream in = AbstractXPathTemplateTests.class.getResourceAsStream("nonamespaces.xml"); XMLStreamReader streamReader = XMLInputFactory.newFactory().createXMLStreamReader(in); StAXSource source = new StAXSource(streamReader); String result = this.template.evaluateAsString("/root/child/text", source); @@ -189,7 +189,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateStreamSourceInputStream() throws IOException, SAXException, ParserConfigurationException { - InputStream in = AbstractXPathTemplateTest.class.getResourceAsStream("nonamespaces.xml"); + InputStream in = AbstractXPathTemplateTests.class.getResourceAsStream("nonamespaces.xml"); StreamSource source = new StreamSource(in); String result = this.template.evaluateAsString("/root/child/text", source); @@ -199,7 +199,7 @@ public abstract class AbstractXPathTemplateTest { @Test public void testEvaluateStreamSourceSystemId() throws IOException, SAXException, ParserConfigurationException { - URL url = AbstractXPathTemplateTest.class.getResource("nonamespaces.xml"); + URL url = AbstractXPathTemplateTests.class.getResource("nonamespaces.xml"); String result = this.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/JaxenXPathExpressionFactoryTests.java similarity index 93% rename from spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTests.java index 66112aba..ce47977c 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathExpressionFactoryTests.java @@ -18,7 +18,7 @@ package org.springframework.xml.xpath; import java.util.Map; -public class JaxenXPathExpressionFactoryTest extends AbstractXPathExpressionFactoryTest { +public class JaxenXPathExpressionFactoryTests extends AbstractXPathExpressionFactoryTests { @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/JaxenXPathTemplateTests.java similarity index 93% rename from spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTests.java index f3bc384e..b3a0d33c 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/JaxenXPathTemplateTests.java @@ -19,7 +19,7 @@ package org.springframework.xml.xpath; import java.util.HashMap; import java.util.Map; -public class JaxenXPathTemplateTest extends AbstractXPathTemplateTest { +public class JaxenXPathTemplateTests extends AbstractXPathTemplateTests { @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/Jaxp13XPathExpressionFactoryTests.java similarity index 91% rename from spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTests.java index b19e42ab..bfd3ddd1 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactoryTests.java @@ -18,7 +18,7 @@ package org.springframework.xml.xpath; import java.util.Map; -public class Jaxp13XPathExpressionFactoryTest extends AbstractXPathExpressionFactoryTest { +public class Jaxp13XPathExpressionFactoryTests extends AbstractXPathExpressionFactoryTests { @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/Jaxp13XPathTemplateTests.java similarity index 93% rename from spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTests.java index f4e4c85d..e69785f5 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/Jaxp13XPathTemplateTests.java @@ -19,7 +19,7 @@ package org.springframework.xml.xpath; import java.util.HashMap; import java.util.Map; -public class Jaxp13XPathTemplateTest extends AbstractXPathTemplateTest { +public class Jaxp13XPathTemplateTests extends AbstractXPathTemplateTests { @Override protected XPathOperations createTemplate() { diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTests.java similarity index 96% rename from spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTests.java index f0a6e3e7..8c01d81b 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryBeanTests.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class XPathExpressionFactoryBeanTest { +public class XPathExpressionFactoryBeanTests { private XPathExpressionFactoryBean factoryBean; diff --git a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTests.java similarity index 96% rename from spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java rename to spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTests.java index 96b3e24e..2c8784b5 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xpath/XPathExpressionFactoryTests.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class XPathExpressionFactoryTest { +public class XPathExpressionFactoryTests { @Test public void testCreateXPathExpression() { diff --git a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTests.java similarity index 95% rename from spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java rename to spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTests.java index 9a48ab20..f1c87025 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/AbstractXsdSchemaTests.java @@ -36,7 +36,7 @@ import org.springframework.xml.validation.XmlValidator; import static org.assertj.core.api.Assertions.assertThat; -public abstract class AbstractXsdSchemaTest { +public abstract class AbstractXsdSchemaTests { private DocumentBuilder documentBuilder; @@ -55,12 +55,12 @@ public abstract class AbstractXsdSchemaTest { @Test public void testSingle() throws Exception { - Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); + Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTests.class); XsdSchema single = createSchema(resource); assertThat(single.getTargetNamespace()).isEqualTo("http://www.springframework.org/spring-ws/single/schema"); - resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); + resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTests.class); Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); this.transformer.transform(single.getSource(), domResult); @@ -72,12 +72,12 @@ public abstract class AbstractXsdSchemaTest { @Test public void testIncludes() throws Exception { - Resource resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTest.class); + Resource resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTests.class); XsdSchema including = createSchema(resource); assertThat(including.getTargetNamespace()).isEqualTo("http://www.springframework.org/spring-ws/include/schema"); - resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTest.class); + resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTests.class); Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); this.transformer.transform(including.getSource(), domResult); @@ -89,13 +89,13 @@ public abstract class AbstractXsdSchemaTest { @Test public void testImports() throws Exception { - Resource resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTest.class); + Resource resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTests.class); XsdSchema importing = createSchema(resource); assertThat(importing.getTargetNamespace()) .isEqualTo("http://www.springframework.org/spring-ws/importing/schema"); - resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTest.class); + resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTests.class); Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); this.transformer.transform(importing.getSource(), domResult); @@ -107,12 +107,12 @@ public abstract class AbstractXsdSchemaTest { @Test public void testXmlNamespace() throws Exception { - Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTest.class); + Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTests.class); XsdSchema importing = createSchema(resource); assertThat(importing.getTargetNamespace()).isEqualTo("http://www.springframework.org/spring-ws/xmlNamespace"); - resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTest.class); + resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTests.class); Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); this.transformer.transform(importing.getSource(), domResult); @@ -124,7 +124,7 @@ public abstract class AbstractXsdSchemaTest { @Test public void testCreateValidator() throws Exception { - Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); + Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTests.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/SimpleXsdSchemaTests.java similarity index 94% rename from spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java rename to spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTests.java index a102f79d..9ee2d318 100644 --- a/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTest.java +++ b/spring-xml/src/test/java/org/springframework/xml/xsd/SimpleXsdSchemaTests.java @@ -22,7 +22,7 @@ import org.springframework.core.io.Resource; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -public class SimpleXsdSchemaTest extends AbstractXsdSchemaTest { +public class SimpleXsdSchemaTests extends AbstractXsdSchemaTests { @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/CommonsXsdSchemaCollectionTests.java similarity index 95% rename from spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTest.java rename to spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaCollectionTests.java index e7141175..cbfa04ad 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/CommonsXsdSchemaCollectionTests.java @@ -33,13 +33,13 @@ 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.AbstractXsdSchemaTest; +import org.springframework.xml.xsd.AbstractXsdSchemaTests; import org.springframework.xml.xsd.XsdSchema; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -public class CommonsXsdSchemaCollectionTest { +public class CommonsXsdSchemaCollectionTests { private CommonsXsdSchemaCollection collection; @@ -61,7 +61,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testSingle() throws Exception { - Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTest.class); + Resource resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(resource); this.collection.afterPropertiesSet(); @@ -71,7 +71,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testInlineComplex() throws Exception { - Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTest.class); + Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(a); this.collection.setInline(true); this.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", AbstractXsdSchemaTest.class); + Resource abc = new ClassPathResource("ABC.xsd", AbstractXsdSchemaTests.class); Document expected = this.documentBuilder.parse(SaxUtils.createInputSource(abc)); DOMResult domResult = new DOMResult(); this.transformer.transform(schemas[0].getSource(), domResult); @@ -88,7 +88,7 @@ public class CommonsXsdSchemaCollectionTest { XmlAssert.assertThat(domResult.getNode()).and(expected).ignoreWhitespace().areIdentical(); assertThat(schemas[1].getTargetNamespace()).isEqualTo("urn:2"); - Resource cd = new ClassPathResource("CD.xsd", AbstractXsdSchemaTest.class); + Resource cd = new ClassPathResource("CD.xsd", AbstractXsdSchemaTests.class); expected = this.documentBuilder.parse(SaxUtils.createInputSource(cd)); domResult = new DOMResult(); this.transformer.transform(schemas[1].getSource(), domResult); @@ -99,7 +99,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testCircular() throws Exception { - Resource resource = new ClassPathResource("circular-1.xsd", AbstractXsdSchemaTest.class); + Resource resource = new ClassPathResource("circular-1.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(resource); this.collection.setInline(true); this.collection.afterPropertiesSet(); @@ -111,7 +111,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testXmlNamespace() throws Exception { - Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTest.class); + Resource resource = new ClassPathResource("xmlNamespace.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(resource); this.collection.setInline(true); this.collection.afterPropertiesSet(); @@ -123,7 +123,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testCreateValidator() throws Exception { - Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTest.class); + Resource a = new ClassPathResource("A.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(a); this.collection.setInline(true); this.collection.afterPropertiesSet(); @@ -136,7 +136,7 @@ public class CommonsXsdSchemaCollectionTest { @Test public void testInvalidSchema() { - Resource invalid = new ClassPathResource("invalid.xsd", AbstractXsdSchemaTest.class); + Resource invalid = new ClassPathResource("invalid.xsd", AbstractXsdSchemaTests.class); this.collection.setXsds(invalid); assertThatExceptionOfType(CommonsXsdSchemaException.class) 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/CommonsXsdSchemaTests.java similarity index 93% rename from spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTest.java rename to spring-xml/src/test/java/org/springframework/xml/xsd/commons/CommonsXsdSchemaTests.java index 213c5263..fd872297 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/CommonsXsdSchemaTests.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.AbstractXsdSchemaTest; +import org.springframework.xml.xsd.AbstractXsdSchemaTests; import org.springframework.xml.xsd.XsdSchema; import static org.assertj.core.api.Assertions.assertThat; -public class CommonsXsdSchemaTest extends AbstractXsdSchemaTest { +public class CommonsXsdSchemaTests extends AbstractXsdSchemaTests { @Override protected XsdSchema createSchema(Resource resource) throws Exception { @@ -46,7 +46,7 @@ public class CommonsXsdSchemaTest extends AbstractXsdSchemaTest { @Test public void testXmime() throws Exception { - Resource resource = new ClassPathResource("xmime.xsd", AbstractXsdSchemaTest.class); + Resource resource = new ClassPathResource("xmime.xsd", AbstractXsdSchemaTests.class); XsdSchema schema = createSchema(resource); String namespace = "urn:test"; diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 791600ae..7607d8f8 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -6,4 +6,5 @@ +