Skip to content

Commit 1c5543a

Browse files
snicollsnicoll
committed
Merge branch '4.0.x'
Closes gh-1529
2 parents 3784ca5 + 7725490 commit 1c5543a

File tree

277 files changed

+599
-598
lines changed

Some content is hidden

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

277 files changed

+599
-598
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

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTest.java‎ renamed to ‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap11WebServiceTemplateIntegrationTests.java‎

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) {

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTest.java‎ renamed to ‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AbstractSoap12WebServiceTemplateIntegrationTests.java‎

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) {

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomNonStreamingSoap11WebServiceTemplateIntegrationTest.java‎ renamed to ‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomNonStreamingSoap11WebServiceTemplateIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
/**
2323
* @author Arjen Poutsma
2424
*/
25-
public class AxiomNonStreamingSoap11WebServiceTemplateIntegrationTest
26-
extends AbstractSoap11WebServiceTemplateIntegrationTest {
25+
public class AxiomNonStreamingSoap11WebServiceTemplateIntegrationTests
26+
extends AbstractSoap11WebServiceTemplateIntegrationTests {
2727

2828
@Override
2929
public SoapMessageFactory createMessageFactory() throws Exception {

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomNonStreamingSoap12WebServiceTemplateIntegrationTest.java‎ renamed to ‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomNonStreamingSoap12WebServiceTemplateIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
/**
2424
* @author Arjen Poutsma
2525
*/
26-
public class AxiomNonStreamingSoap12WebServiceTemplateIntegrationTest
27-
extends AbstractSoap12WebServiceTemplateIntegrationTest {
26+
public class AxiomNonStreamingSoap12WebServiceTemplateIntegrationTests
27+
extends AbstractSoap12WebServiceTemplateIntegrationTests {
2828

2929
@Override
3030
public SoapMessageFactory createMessageFactory() {

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomStreamingSoap11WebServiceTemplateIntegrationTest.java‎ renamed to ‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomStreamingSoap11WebServiceTemplateIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
/**
2323
* @author Arjen Poutsma
2424
*/
25-
public class AxiomStreamingSoap11WebServiceTemplateIntegrationTest
26-
extends AbstractSoap11WebServiceTemplateIntegrationTest {
25+
public class AxiomStreamingSoap11WebServiceTemplateIntegrationTests
26+
extends AbstractSoap11WebServiceTemplateIntegrationTests {
2727

2828
@Override
2929
public SoapMessageFactory createMessageFactory() throws Exception {

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomStreamingSoap12WebServiceTemplateIntegrationTest.java‎ renamed to ‎spring-ws-core/src/test/java/org/springframework/ws/client/core/AxiomStreamingSoap12WebServiceTemplateIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
/**
2424
* @author Arjen Poutsma
2525
*/
26-
public class AxiomStreamingSoap12WebServiceTemplateIntegrationTest
27-
extends AbstractSoap12WebServiceTemplateIntegrationTest {
26+
public class AxiomStreamingSoap12WebServiceTemplateIntegrationTests
27+
extends AbstractSoap12WebServiceTemplateIntegrationTests {
2828

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

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTest.java‎ renamed to ‎spring-ws-core/src/test/java/org/springframework/ws/client/core/DomPoxWebServiceTemplateIntegrationTests.java‎

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

‎spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTest.java‎ renamed to ‎spring-ws-core/src/test/java/org/springframework/ws/client/core/SaajSoap11WebServiceTemplateIntegrationTests.java‎

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 {

0 commit comments

Comments
 (0)