This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 20123fbaeb55aebd3467b902282db2aefb51ceea
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Jul 22 22:26:59 2020 +0200
[CAMEL-11807] Upgrade camel-soap to junit5
---
components/camel-soap/pom.xml | 11 ++++++--
.../converter/soap/name/QNameStrategyTest.java | 7 +++--
.../soap/name/ServiceInterfaceStrategyTest.java | 9 ++++--
.../converter/soap/name/TypeNameStrategyTest.java | 20 ++++++++------
...otElementPreferringElementNameStrategyTest.java | 22 ++++++++-------
.../camel/dataformat/soap/SoapClientTest.java | 6 ++--
.../camel/dataformat/soap/SoapCxfClientTest.java | 32 ++++++++++++----------
.../camel/dataformat/soap/SoapCxfServerTest.java | 22 ++++++++-------
.../camel/dataformat/soap/SoapMarshalTest.java | 4 +--
.../camel/dataformat/soap/SoapRoundtripTest.java | 7 +++--
.../camel/dataformat/soap/SoapServerTest.java | 6 ++--
.../dataformat/soap/SoapSpringRoundtripTest.java | 15 +++++-----
.../dataformat/soap/SoapToSoapDontIgnoreTest.java | 19 +++++++------
.../dataformat/soap/SoapToSoapIgnoreTest.java | 19 +++++++------
.../soap/SoapToSoapSingleDataFormatterTest.java | 19 +++++++------
.../camel/dataformat/soap/SoapUnMarshalTest.java | 7 +++--
.../camel/dataformat/soap12/Soap12MarshalTest.java | 4 +--
.../soap12/Soap12SpringRoundtripTest.java | 15 +++++-----
.../dataformat/soap12/Soap12UnMarshalTest.java | 7 +++--
19 files changed, 146 insertions(+), 105 deletions(-)
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index d5278ca..effd09b 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -58,13 +58,18 @@
<!-- test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java
b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java
index 56cf1c9..6de6c70 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/QNameStrategyTest.java
@@ -20,8 +20,9 @@ import javax.xml.namespace.QName;
import com.example.customerservice.GetCustomersByName;
import org.apache.camel.dataformat.soap.name.QNameStrategy;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class QNameStrategyTest {
@@ -35,6 +36,6 @@ public class QNameStrategyTest {
QNameStrategy strategy = new QNameStrategy(elementName);
QName actualElementName = strategy.findQNameForSoapActionOrType(null,
GetCustomersByName.class);
- Assert.assertEquals(elementName, actualElementName);
+ assertEquals(elementName, actualElementName);
}
}
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
index 6ebafa6..1c3305a 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
@@ -24,12 +24,15 @@ import
com.example.customerservice.GetCustomersByNameResponse;
import com.example.customerservice.multipart.MultiPartCustomerService;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ServiceInterfaceStrategyTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class ServiceInterfaceStrategyTest {
private static final Logger LOG =
LoggerFactory.getLogger(ServiceInterfaceStrategyTest.class);
@Test
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java
b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java
index 8bd3e95..1b321d2 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/TypeNameStrategyTest.java
@@ -20,8 +20,10 @@ import javax.xml.namespace.QName;
import com.example.customerservice.GetCustomersByName;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
public class TypeNameStrategyTest {
@@ -29,8 +31,8 @@ public class TypeNameStrategyTest {
public void testTypeNameStrategy() {
TypeNameStrategy strategy = new TypeNameStrategy();
QName name = strategy.findQNameForSoapActionOrType("",
GetCustomersByName.class);
- Assert.assertEquals("http://customerservice.example.com/";,
name.getNamespaceURI());
- Assert.assertEquals("getCustomersByName", name.getLocalPart());
+ assertEquals("http://customerservice.example.com/";,
name.getNamespaceURI());
+ assertEquals("getCustomersByName", name.getLocalPart());
}
@Test
@@ -38,7 +40,7 @@ public class TypeNameStrategyTest {
TypeNameStrategy strategy = new TypeNameStrategy();
try {
strategy.findQNameForSoapActionOrType("", String.class);
- Assert.fail();
+ fail();
} catch (RuntimeException e) {
// Expected here
}
@@ -48,11 +50,11 @@ public class TypeNameStrategyTest {
public void testNoPackageInfo() {
TypeNameStrategy strategy = new TypeNameStrategy();
QName name = strategy.findQNameForSoapActionOrType("",
AnnotatedClassWithoutNamespace.class);
- Assert.assertEquals("test", name.getLocalPart());
- Assert.assertEquals("##default", name.getNamespaceURI());
+ assertEquals("test", name.getLocalPart());
+ assertEquals("##default", name.getNamespaceURI());
QName name2 = strategy.findQNameForSoapActionOrType("",
AnnotatedClassWithNamespace.class);
- Assert.assertEquals("test", name2.getLocalPart());
- Assert.assertEquals("http://mynamespace";, name2.getNamespaceURI());
+ assertEquals("test", name2.getLocalPart());
+ assertEquals("http://mynamespace";, name2.getNamespaceURI());
}
}
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
index 1417a55..87f95e2 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java
@@ -24,9 +24,10 @@ import javax.xml.namespace.QName;
import org.apache.camel.converter.soap.name.testpackage.RequestWithDefaultNs;
import
org.apache.camel.dataformat.soap.name.XmlRootElementPreferringElementNameStrategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class XmlRootElementPreferringElementNameStrategyTest {
@@ -38,24 +39,25 @@ public class
XmlRootElementPreferringElementNameStrategyTest {
@Test
public void testFindQNameForSoapActionOrTypeWithXmlSchemaPresent() throws
Exception {
QName qname = ens.findQNameForSoapActionOrType("abc",
RequestWithDefaultNs.class);
- assertEquals("local names must match", "foo", qname.getLocalPart());
- assertEquals("namespace must match", "baz", qname.getNamespaceURI());
+ assertEquals("foo", qname.getLocalPart(), "local names must match");
+ assertEquals("baz", qname.getNamespaceURI(), "namespace must match");
}
@Test
public void testFindQNameForSoapActionOrType() throws Exception {
QName qname = ens.findQNameForSoapActionOrType(DEFAULT_NS,
Request.class);
- assertEquals("local names must match", LOCAL_NAME,
qname.getLocalPart());
- assertEquals("namespace must match", CUSTOM_NS,
qname.getNamespaceURI());
+ assertEquals(LOCAL_NAME, qname.getLocalPart(), "local names must
match");
+ assertEquals(CUSTOM_NS, qname.getNamespaceURI(), "namespace must
match");
qname = ens.findQNameForSoapActionOrType(CUSTOM_NS, Request.class);
- assertEquals("local names must match", LOCAL_NAME,
qname.getLocalPart());
- assertEquals("namespace must match", CUSTOM_NS,
qname.getNamespaceURI());
+ assertEquals(LOCAL_NAME, qname.getLocalPart(), "local names must
match");
+ assertEquals(CUSTOM_NS, qname.getNamespaceURI(), "namespace must
match");
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testFindExceptionForFaultName() throws Exception {
- ens.findExceptionForFaultName(new QName(LOCAL_NAME, CUSTOM_NS));
+ assertThrows(UnsupportedOperationException.class,
+ () -> ens.findExceptionForFaultName(new QName(LOCAL_NAME,
CUSTOM_NS)));
}
@XmlType(name = "", propOrder = {LOCAL_NAME})
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
index 4bcd237..7c54f5a 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapClientTest.java
@@ -26,8 +26,10 @@ import org.apache.camel.Produce;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test that uses a dynamic proxy for CustomerService to send a request as SOAP
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java
index e0615c3..171e1cb 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfClientTest.java
@@ -31,18 +31,20 @@ import com.example.customerservice.SaveCustomer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Checks for interoperability between a CXF client that is attached using the
* Camel transport for CXF and the SOAP data format
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class SoapCxfClientTest extends RouteBuilder {
private static CustomerServiceImpl serverBean;
@@ -51,7 +53,7 @@ public class SoapCxfClientTest extends RouteBuilder {
protected CustomerService customerService;
- @BeforeClass
+ @BeforeAll
public static void initServerBean() {
serverBean = new CustomerServiceImpl();
}
@@ -61,18 +63,18 @@ public class SoapCxfClientTest extends RouteBuilder {
GetCustomersByName request = new GetCustomersByName();
request.setName("test");
GetCustomersByNameResponse response =
customerService.getCustomersByName(request);
- Assert.assertNotNull(response);
+ assertNotNull(response);
List<Customer> customers = response.getReturn();
- Assert.assertEquals(1, customers.size());
- Assert.assertEquals("test", customers.get(0).getName());
+ assertEquals(1, customers.size());
+ assertEquals("test", customers.get(0).getName());
}
@Test
public void testRoundTripGetAllCustomers() throws Exception {
GetAllCustomersResponse response = customerService.getAllCustomers();
- Assert.assertEquals(1, response.getReturn().size());
+ assertEquals(1, response.getReturn().size());
Customer firstCustomer = response.getReturn().get(0);
- Assert.assertEquals(100000.0, firstCustomer.getRevenue(), 0.00001);
+ assertEquals(100000.0, firstCustomer.getRevenue(), 0.00001);
}
@Test
@@ -83,7 +85,7 @@ public class SoapCxfClientTest extends RouteBuilder {
request.setCustomer(testCustomer);
customerService.saveCustomer(request);
Customer customer2 = serverBean.getLastSavedCustomer();
- Assert.assertEquals("testName", customer2.getName());
+ assertEquals("testName", customer2.getName());
}
@Test
@@ -92,10 +94,10 @@ public class SoapCxfClientTest extends RouteBuilder {
request.setName("none");
try {
customerService.getCustomersByName(request);
- Assert.fail("NoSuchCustomerException expected");
+ fail("NoSuchCustomerException expected");
} catch (NoSuchCustomerException e) {
NoSuchCustomer info = e.getFaultInfo();
- Assert.assertEquals("none", info.getCustomerId());
+ assertEquals("none", info.getCustomerId());
}
}
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
index 1e1adea..4bca9a2 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapCxfServerTest.java
@@ -28,17 +28,19 @@ import org.apache.camel.Produce;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.ServiceInterfaceStrategy;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Checks for interoperability between a CXF server that is attached using
* the Camel transport for CXF and a dynamic proxy using the SOAP data format
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class SoapCxfServerTest extends RouteBuilder {
@Produce("direct:camelClient")
@@ -49,10 +51,10 @@ public class SoapCxfServerTest extends RouteBuilder {
GetCustomersByName request = new GetCustomersByName();
request.setName("test");
GetCustomersByNameResponse response =
customerServiceProxy.getCustomersByName(request);
- Assert.assertNotNull(response);
+ assertNotNull(response);
List<Customer> customers = response.getReturn();
- Assert.assertEquals(1, customers.size());
- Assert.assertEquals("test", customers.get(0).getName());
+ assertEquals(1, customers.size());
+ assertEquals("test", customers.get(0).getName());
}
@Test
@@ -61,10 +63,10 @@ public class SoapCxfServerTest extends RouteBuilder {
request.setName("none");
try {
customerServiceProxy.getCustomersByName(request);
- Assert.fail("NoSuchCustomerException expected");
+ fail("NoSuchCustomerException expected");
} catch (NoSuchCustomerException e) {
NoSuchCustomer info = e.getFaultInfo();
- Assert.assertEquals("none", info.getCustomerId());
+ assertEquals("none", info.getCustomerId());
}
}
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
index 83c50ee..23d401b 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapMarshalTest.java
@@ -30,8 +30,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class SoapMarshalTest extends CamelTestSupport {
@EndpointInject("mock:result")
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
index 0b6c869..3095cdc 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapRoundtripTest.java
@@ -27,8 +27,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class SoapRoundtripTest extends CamelTestSupport {
@EndpointInject("mock:result")
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
index 5a41d72..8f90ead 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapServerTest.java
@@ -25,8 +25,10 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
/*
* Checks the soap data format by using fixed request and expected response
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
index 1a3d957..21b1693 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapSpringRoundtripTest.java
@@ -24,16 +24,17 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Works like SoapRoundTripTest but uses a spring configuration instead of the
java dsl
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class SoapSpringRoundtripTest {
@@ -53,7 +54,7 @@ public class SoapSpringRoundtripTest {
Exchange exchange = resultEndpoint.getExchanges().get(0);
GetCustomersByName received = exchange.getIn().getBody(
GetCustomersByName.class);
- Assert.assertNotNull(received);
- Assert.assertEquals("Mueller", received.getName());
+ assertNotNull(received);
+ assertEquals("Mueller", received.getName());
}
}
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
index 6c7062a..eda9fd0 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
@@ -28,17 +28,19 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SoapToSoapDontIgnoreTest extends CamelTestSupport {
private static SoapJaxbDataFormat soapjaxbModel;
private static SoapJaxbDataFormat soapjaxbModelDontIgnoreUnmarshalled;
private static Map<String, String> namespacePrefixMap;
- @BeforeClass
+ @BeforeAll
public static void setup() {
namespacePrefixMap = new HashMap<>();
namespacePrefixMap.put("http://schemas.xmlsoap.org/soap/envelope/";,
"soap");
@@ -60,7 +62,7 @@ public class SoapToSoapDontIgnoreTest extends
CamelTestSupport {
soapjaxbModelDontIgnoreUnmarshalled.setElementNameStrategy(new
TypeNameStrategy());
}
- @AfterClass
+ @AfterAll
public static void teardown() {
soapjaxbModel = null;
namespacePrefixMap = null;
@@ -79,8 +81,9 @@ public class SoapToSoapDontIgnoreTest extends
CamelTestSupport {
byte[] body = (byte[])result.getIn().getBody();
InputStream stream = new ByteArrayInputStream(body);
SOAPMessage request = MessageFactory.newInstance().createMessage(null,
stream);
- assertTrue("Expected headers", null != request.getSOAPHeader()
- &&
request.getSOAPHeader().extractAllHeaderElements().hasNext());
+ assertTrue(null != request.getSOAPHeader()
+ &&
request.getSOAPHeader().extractAllHeaderElements().hasNext(),
+ "Expected headers");
}
private InputStream createRequest() throws Exception {
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
index 1dfb55a..51554b7 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
@@ -28,17 +28,19 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SoapToSoapIgnoreTest extends CamelTestSupport {
private static SoapJaxbDataFormat soapjaxbModel;
private static SoapJaxbDataFormat soapjaxbModelIgnoreUnmarshalled;
private static Map<String, String> namespacePrefixMap;
- @BeforeClass
+ @BeforeAll
public static void setup() {
namespacePrefixMap = new HashMap<>();
namespacePrefixMap.put("http://schemas.xmlsoap.org/soap/envelope/";,
"soap");
@@ -60,7 +62,7 @@ public class SoapToSoapIgnoreTest extends CamelTestSupport {
soapjaxbModelIgnoreUnmarshalled.setElementNameStrategy(new
TypeNameStrategy());
}
- @AfterClass
+ @AfterAll
public static void teardown() {
soapjaxbModel = null;
namespacePrefixMap = null;
@@ -79,8 +81,9 @@ public class SoapToSoapIgnoreTest extends CamelTestSupport {
byte[] body = (byte[])result.getIn().getBody();
InputStream stream = new ByteArrayInputStream(body);
SOAPMessage request = MessageFactory.newInstance().createMessage(null,
stream);
- assertTrue("Expected no headers", null == request.getSOAPHeader()
- ||
!request.getSOAPHeader().extractAllHeaderElements().hasNext());
+ assertTrue(null == request.getSOAPHeader()
+ ||
!request.getSOAPHeader().extractAllHeaderElements().hasNext(),
+ "Expected no headers");
}
private InputStream createRequest() throws Exception {
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
index 402bc24..b1d9eb3 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
@@ -28,16 +28,18 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SoapToSoapSingleDataFormatterTest extends CamelTestSupport {
private static SoapJaxbDataFormat soapjaxbModel;
private static Map<String, String> namespacePrefixMap;
- @BeforeClass
+ @BeforeAll
public static void setup() {
namespacePrefixMap = new HashMap<>();
namespacePrefixMap.put("http://schemas.xmlsoap.org/soap/envelope/";,
"soap");
@@ -53,7 +55,7 @@ public class SoapToSoapSingleDataFormatterTest extends
CamelTestSupport {
soapjaxbModel.setElementNameStrategy(new TypeNameStrategy());
}
- @AfterClass
+ @AfterAll
public static void teardown() {
soapjaxbModel = null;
namespacePrefixMap = null;
@@ -72,8 +74,9 @@ public class SoapToSoapSingleDataFormatterTest extends
CamelTestSupport {
byte[] body = (byte[])result.getIn().getBody();
InputStream stream = new ByteArrayInputStream(body);
SOAPMessage request = MessageFactory.newInstance().createMessage(null,
stream);
- assertTrue("Expected headers", null != request.getSOAPHeader()
- &&
request.getSOAPHeader().extractAllHeaderElements().hasNext());
+ assertTrue(null != request.getSOAPHeader()
+ &&
request.getSOAPHeader().extractAllHeaderElements().hasNext(),
+ "Expected headers");
}
private InputStream createRequest() throws Exception {
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
index 70cf788..0b1cba9 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
@@ -28,8 +28,11 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Checks that a static soap request is unmarshalled to the correct java
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java
index 0891e27..835b97b 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12MarshalTest.java
@@ -32,8 +32,8 @@ import org.apache.camel.dataformat.soap.SoapJaxbDataFormat;
import org.apache.camel.dataformat.soap.TestUtil;
import org.apache.camel.dataformat.soap.name.ElementNameStrategy;
import org.apache.camel.dataformat.soap.name.TypeNameStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class Soap12MarshalTest extends CamelTestSupport {
@EndpointInject("mock:result")
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java
index cd51a92..33daa04 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12SpringRoundtripTest.java
@@ -24,16 +24,17 @@ import org.apache.camel.Exchange;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Works like SoapRoundTripTest but uses a spring configuration instead of the
java dsl
*/
-@RunWith(SpringJUnit4ClassRunner.class)
+@CamelSpringTest
@ContextConfiguration
public class Soap12SpringRoundtripTest {
@@ -53,7 +54,7 @@ public class Soap12SpringRoundtripTest {
Exchange exchange = resultEndpoint.getExchanges().get(0);
GetCustomersByName received = exchange.getIn().getBody(
GetCustomersByName.class);
- Assert.assertNotNull(received);
- Assert.assertEquals("Mueller", received.getName());
+ assertNotNull(received);
+ assertEquals("Mueller", received.getName());
}
}
diff --git
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
index dfe7eec..8d61449 100644
---
a/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
+++
b/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap12/Soap12UnMarshalTest.java
@@ -28,8 +28,11 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Checks that a static soap request is unmarshalled to the correct java
