Skip to content

Commit 7725490

Browse files
committed
Harmonize suffix of test classes
Closes gh-1528
1 parent 62f1685 commit 7725490

File tree

253 files changed

+441
-440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+441
-440
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import static org.assertj.core.api.Assertions.assertThat;
2323

24-
public abstract class AbstractWebServiceMessageFactoryTest {
24+
public abstract class AbstractWebServiceMessageFactoryTests {
2525

2626
protected WebServiceMessageFactory messageFactory;
2727

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
import static org.xmlunit.assertj.XmlAssert.assertThat;
6363

64-
public abstract class AbstractWebServiceMessageTest {
64+
public abstract class AbstractWebServiceMessageTests {
6565

6666
protected Transformer transformer;
6767

@@ -83,7 +83,7 @@ public final void setUp() throws Exception {
8383
TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance();
8484
this.transformer = transformerFactory.newTransformer();
8585
this.webServiceMessage = createWebServiceMessage();
86-
this.payload = new ClassPathResource("payload.xml", AbstractWebServiceMessageTest.class);
86+
this.payload = new ClassPathResource("payload.xml", AbstractWebServiceMessageTests.class);
8787
}
8888

8989
@Test
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
import static org.assertj.core.api.Assertions.assertThat;
7272
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
7373

74-
public abstract class AbstractSoap11WebServiceTemplateIntegrationTest {
74+
public abstract class AbstractSoap11WebServiceTemplateIntegrationTests {
7575

7676
private static Server jettyServer;
7777

@@ -168,7 +168,7 @@ public void marshal(Object graph, Result result) throws XmlMappingException {
168168
assertThat(requestObject).isEqualTo(graph);
169169
try {
170170
transformer.transform(
171-
new StringSource(AbstractSoap11WebServiceTemplateIntegrationTest.this.messagePayload),
171+
new StringSource(AbstractSoap11WebServiceTemplateIntegrationTests.this.messagePayload),
172172
result);
173173
}
174174
catch (TransformerException e) {
@@ -222,7 +222,7 @@ public void marshal(Object graph, Result result) throws XmlMappingException {
222222
assertThat(requestObject).isEqualTo(graph);
223223
try {
224224
transformer.transform(
225-
new StringSource(AbstractSoap11WebServiceTemplateIntegrationTest.this.messagePayload),
225+
new StringSource(AbstractSoap11WebServiceTemplateIntegrationTests.this.messagePayload),
226226
result);
227227
}
228228
catch (TransformerException e) {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
import static org.assertj.core.api.Assertions.assertThat;
7171
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
7272

73-
public abstract class AbstractSoap12WebServiceTemplateIntegrationTest {
73+
public abstract class AbstractSoap12WebServiceTemplateIntegrationTests {
7474

7575
private static Server jettyServer;
7676

@@ -173,7 +173,7 @@ public void marshal(Object graph, Result result) throws XmlMappingException {
173173
assertThat(requestObject).isEqualTo(graph);
174174
try {
175175
transformer.transform(
176-
new StringSource(AbstractSoap12WebServiceTemplateIntegrationTest.this.messagePayload),
176+
new StringSource(AbstractSoap12WebServiceTemplateIntegrationTests.this.messagePayload),
177177
result);
178178
}
179179
catch (TransformerException e) {
@@ -227,7 +227,7 @@ public void marshal(Object graph, Result result) throws XmlMappingException {
227227

228228
try {
229229
transformer.transform(
230-
new StringSource(AbstractSoap12WebServiceTemplateIntegrationTest.this.messagePayload),
230+
new StringSource(AbstractSoap12WebServiceTemplateIntegrationTests.this.messagePayload),
231231
result);
232232
}
233233
catch (TransformerException e) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
5454

55-
public class DomPoxWebServiceTemplateIntegrationTest {
55+
public class DomPoxWebServiceTemplateIntegrationTests {
5656

5757
private static Server jettyServer;
5858

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* @author Arjen Poutsma
2727
*/
28-
public class SaajSoap11WebServiceTemplateIntegrationTest extends AbstractSoap11WebServiceTemplateIntegrationTest {
28+
public class SaajSoap11WebServiceTemplateIntegrationTests extends AbstractSoap11WebServiceTemplateIntegrationTests {
2929

3030
@Override
3131
public SoapMessageFactory createMessageFactory() throws Exception {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/**
2626
* @author Arjen Poutsma
2727
*/
28-
public class SaajSoap12WebServiceTemplateIntegrationTest extends AbstractSoap12WebServiceTemplateIntegrationTest {
28+
public class SaajSoap12WebServiceTemplateIntegrationTests extends AbstractSoap12WebServiceTemplateIntegrationTests {
2929

3030
@Override
3131
public SoapMessageFactory createMessageFactory() throws Exception {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import static org.easymock.EasyMock.replay;
2929
import static org.easymock.EasyMock.verify;
3030

31-
public class SimpleFaultMessageResolverTest {
31+
public class SimpleFaultMessageResolverTests {
3232

3333
private SimpleFaultMessageResolver resolver;
3434

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import static org.mockito.Mockito.when;
5151

5252
@SuppressWarnings("unchecked")
53-
public class WebServiceTemplateTest {
53+
public class WebServiceTemplateTests {
5454

5555
private WebServiceTemplate template;
5656

@@ -70,7 +70,7 @@ public void setUp() throws Exception {
7070

7171
@Override
7272
public WebServiceConnection createConnection(URI uri) {
73-
return WebServiceTemplateTest.this.connectionMock;
73+
return WebServiceTemplateTests.this.connectionMock;
7474
}
7575

7676
@Override
@@ -308,7 +308,7 @@ public void testSendAndReceiveCustomUri() throws Exception {
308308

309309
@Override
310310
public WebServiceConnection createConnection(URI uri) {
311-
return WebServiceTemplateTest.this.connectionMock;
311+
return WebServiceTemplateTests.this.connectionMock;
312312
}
313313

314314
@Override
@@ -430,7 +430,7 @@ public void testDestinationResolver() throws Exception {
430430

431431
@Override
432432
public WebServiceConnection createConnection(URI uri) {
433-
return WebServiceTemplateTest.this.connectionMock;
433+
return WebServiceTemplateTests.this.connectionMock;
434434
}
435435

436436
@Override
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
2929

30-
public class Wsdl11DestinationProviderTest {
30+
public class Wsdl11DestinationProviderTests {
3131

3232
private Wsdl11DestinationProvider provider;
3333

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
/**
3030
* @author Greg Turnquist
3131
*/
32-
public class ClientInterceptorAdapterTest {
32+
public class ClientInterceptorAdapterTests {
3333

3434
@Test
3535
public void handleEmptyInterceptor() {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
4646
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
4747

48-
public class PayloadValidatingInterceptorTest {
48+
public class PayloadValidatingInterceptorTests {
4949

5050
private PayloadValidatingInterceptor interceptor;
5151

@@ -158,7 +158,7 @@ public void testNamespacesInType() throws Exception {
158158

159159
try {
160160
PayloadValidatingInterceptor interceptor = new PayloadValidatingInterceptor();
161-
interceptor.setSchema(new ClassPathResource(SCHEMA2, PayloadValidatingInterceptorTest.class));
161+
interceptor.setSchema(new ClassPathResource(SCHEMA2, PayloadValidatingInterceptorTests.class));
162162
interceptor.afterPropertiesSet();
163163
MessageFactory messageFactory = MessageFactory.newInstance();
164164
SOAPMessage saajMessage = SaajUtils.loadMessage(new ClassPathResource(VALID_SOAP_MESSAGE, getClass()),
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
/**
5454
* @author Arjen Poutsma
5555
*/
56-
public class AnnotationDrivenBeanDefinitionParserTest {
56+
public class AnnotationDrivenBeanDefinitionParserTests {
5757

5858
private ApplicationContext applicationContext;
5959

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import static org.assertj.core.api.Assertions.assertThat;
3232

33-
public class InterceptorsBeanDefinitionParserTest {
33+
public class InterceptorsBeanDefinitionParserTests {
3434

3535
@Test
3636
public void namespace() {

spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTest.java renamed to spring-ws-core/src/test/java/org/springframework/ws/config/WebServiceNamespaceHandlerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import static org.assertj.core.api.Assertions.assertThat;
2929

3030
@Deprecated
31-
public class WebServiceNamespaceHandlerTest {
31+
public class WebServiceNamespaceHandlerTests {
3232

3333
private ApplicationContext applicationContext;
3434

spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTest.java renamed to spring-ws-core/src/test/java/org/springframework/ws/config/WebServicesNamespaceHandlerTigerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import static org.assertj.core.api.Assertions.assertThat;
3030

3131
@Deprecated
32-
public class WebServicesNamespaceHandlerTigerTest {
32+
public class WebServicesNamespaceHandlerTigerTests {
3333

3434
private ApplicationContext applicationContext;
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/**
3333
* @author Arjen Poutsma
3434
*/
35-
public class WsdlBeanDefinitionParserTest {
35+
public class WsdlBeanDefinitionParserTests {
3636

3737
private ApplicationContext applicationContext;
3838

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/**
3636
* @author Arjen Poutsma
3737
*/
38-
public class DefaultWsConfigurationTest {
38+
public class DefaultWsConfigurationTests {
3939

4040
private ApplicationContext applicationContext;
4141

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/**
3636
* @author Arjen Poutsma
3737
*/
38-
public class WsConfigurationSupportTest {
38+
public class WsConfigurationSupportTests {
3939

4040
private ApplicationContext applicationContext;
4141

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/**
3939
* @author Arjen Poutsma
4040
*/
41-
public class WsConfigurerAdapterTest {
41+
public class WsConfigurerAdapterTests {
4242

4343
private ApplicationContext applicationContext;
4444

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import static org.easymock.EasyMock.replay;
3030
import static org.easymock.EasyMock.verify;
3131

32-
public class DefaultMessageContextTest {
32+
public class DefaultMessageContextTests {
3333

3434
private DefaultMessageContext context;
3535

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import org.springframework.core.io.ClassPathResource;
2525
import org.springframework.core.io.Resource;
2626
import org.springframework.util.FileCopyUtils;
27-
import org.springframework.ws.AbstractWebServiceMessageTest;
27+
import org.springframework.ws.AbstractWebServiceMessageTests;
2828
import org.springframework.ws.WebServiceMessage;
2929

3030
import static org.assertj.core.api.Assertions.assertThat;
3131

32-
public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageTest {
32+
public abstract class AbstractMimeMessageTests extends AbstractWebServiceMessageTests {
3333

3434
protected MimeMessage mimeMessage;
3535

@@ -43,7 +43,7 @@ public abstract class AbstractMimeMessageTest extends AbstractWebServiceMessageT
4343
protected final WebServiceMessage createWebServiceMessage() throws Exception {
4444

4545
this.mimeMessage = createMimeMessage();
46-
this.picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTest.class);
46+
this.picture = new ClassPathResource("spring-ws.png", AbstractMimeMessageTests.class);
4747
this.contentId = "spring-ws";
4848
this.contentType = "image/png";
4949
return this.mimeMessage;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package org.springframework.ws.pox.dom;
1818

19-
import org.springframework.ws.AbstractWebServiceMessageFactoryTest;
19+
import org.springframework.ws.AbstractWebServiceMessageFactoryTests;
2020
import org.springframework.ws.WebServiceMessageFactory;
2121

22-
public class DomPoxMessageFactoryTest extends AbstractWebServiceMessageFactoryTest {
22+
public class DomPoxMessageFactoryTests extends AbstractWebServiceMessageFactoryTests {
2323

2424
@Override
2525
protected WebServiceMessageFactory createMessageFactory() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
import static org.xmlunit.assertj.XmlAssert.assertThat;
3737

38-
public class DomPoxMessageTest {
38+
public class DomPoxMessageTests {
3939

4040
private DomPoxMessage message;
4141

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import static org.easymock.EasyMock.replay;
4242
import static org.easymock.EasyMock.verify;
4343

44-
public class MessageDispatcherTest {
44+
public class MessageDispatcherTests {
4545

4646
private MessageDispatcher dispatcher;
4747

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.springframework.xml.sax.SaxUtils;
4444

4545
@SuppressWarnings("Since15")
46-
public abstract class AbstractEndpointTest {
46+
public abstract class AbstractEndpointTests {
4747

4848
protected static final String NAMESPACE_URI = "http://springframework.org/ws";
4949

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import static org.assertj.core.api.Assertions.assertThat;
3232

33-
public abstract class AbstractMessageEndpointTest extends AbstractEndpointTest {
33+
public abstract class AbstractMessageEndpointTests extends AbstractEndpointTests {
3434

3535
private MessageEndpoint endpoint;
3636

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import static org.assertj.core.api.Assertions.assertThat;
3131

32-
public abstract class AbstractPayloadEndpointTest extends AbstractEndpointTest {
32+
public abstract class AbstractPayloadEndpointTests extends AbstractEndpointTests {
3333

3434
private PayloadEndpoint endpoint;
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static org.assertj.core.api.Assertions.assertThat;
2323

2424
@Deprecated
25-
public class Dom4jPayloadEndpointTest extends AbstractPayloadEndpointTest {
25+
public class Dom4jPayloadEndpointTests extends AbstractPayloadEndpointTests {
2626

2727
@Override
2828
protected PayloadEndpoint createResponseEndpoint() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static org.assertj.core.api.Assertions.assertThat;
2323

2424
@Deprecated
25-
public class DomPayloadEndpointTest extends AbstractPayloadEndpointTest {
25+
public class DomPayloadEndpointTests extends AbstractPayloadEndpointTests {
2626

2727
@Override
2828
protected PayloadEndpoint createNoResponseEndpoint() throws Exception {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @author Tareq Abed Rabbo
3232
* @author Arjen Poutsma
3333
*/
34-
public class EndpointExceptionResolverTest {
34+
public class EndpointExceptionResolverTests {
3535

3636
private MethodEndpoint methodEndpoint;
3737

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static org.assertj.core.api.Assertions.assertThat;
2323

2424
@Deprecated
25-
public class JDomPayloadEndpointTest extends AbstractPayloadEndpointTest {
25+
public class JDomPayloadEndpointTests extends AbstractPayloadEndpointTests {
2626

2727
@Override
2828
protected PayloadEndpoint createNoResponseEndpoint() throws Exception {

0 commit comments

Comments
 (0)