This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 430c8f2 CAMEL-11807: Migrated camel-dozer tests to JUnit 5
430c8f2 is described below
commit 430c8f2946b887d9c5693e73b411c4e1502776ec
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Fri May 29 18:53:15 2020 +0200
CAMEL-11807: Migrated camel-dozer tests to JUnit 5
---
components/camel-dozer/pom.xml | 7 +---
.../dozer/CustomMapperParametersTest.java | 17 ++++-----
.../camel/component/dozer/CustomMapperTest.java | 42 +++++++++++-----------
.../camel/component/dozer/CustomMappingTest.java | 25 ++++++-------
.../camel/component/dozer/DozerComponentTest.java | 28 ++++++++-------
.../dozer/ExpressionMappingClasspathTest.java | 25 ++++++-------
.../component/dozer/ExpressionMappingFileTest.java | 25 ++++++-------
.../component/dozer/ExpressionMappingTest.java | 25 ++++++-------
.../camel/component/dozer/VariableMappingTest.java | 27 ++++++--------
.../camel/component/dozer/XmlToJsonTest.java | 24 ++++++-------
.../camel/converter/dozer/CustomerProcessor.java | 2 +-
.../converter/dozer/DozerBeanMappingTest.java | 42 ++++++++++++----------
.../converter/dozer/DozerTypeConverterDTOTest.java | 17 ++++-----
.../converter/dozer/DozerTypeConverterTest.java | 20 ++++++-----
.../SpringDozerTypeConverterConfigurationTest.java | 6 ++--
.../dozer/SpringDozerTypeConverterTest.java | 6 ++--
.../SpringDozerTypeConverterWithMapIdTest.java | 6 ++--
17 files changed, 163 insertions(+), 181 deletions(-)
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index c89172d..0a26b1d 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -60,18 +60,13 @@
<!-- Testing -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMapperParametersTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMapperParametersTest.java
index d8977de..b93ae6b 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMapperParametersTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMapperParametersTest.java
@@ -17,31 +17,32 @@
package org.apache.camel.component.dozer;
import org.apache.camel.impl.engine.DefaultClassResolver;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class CustomMapperParametersTest {
private CustomMapper customMapper;
- @Before
+ @BeforeEach
public void setup() {
customMapper = new CustomMapper(new DefaultClassResolver());
}
@Test
- public void shouldExecuteCustomFunctionWithArguments() throws Exception {
+ void shouldExecuteCustomFunctionWithArguments() {
customMapper.setParameter(MapperWithMultiParmMethod.class.getName() +
",test,java.lang.Integer=12,java.lang.Integer=20");
Object result = customMapper.mapCustom("JeremiahWasABullfrog",
String.class);
- Assert.assertEquals("Bullfrog", result);
+ assertEquals("Bullfrog", result);
}
@Test
- public void shouldExecuteCustomFunctionWithVariableArguments() throws
Exception {
+ void shouldExecuteCustomFunctionWithVariableArguments() {
customMapper.setParameter(MapperWithMultiParmMethod.class.getName() +
",add,java.lang.Integer=12,java.lang.Integer=20");
Object result = customMapper.mapCustom("JeremiahWasABullfrog",
String.class);
- Assert.assertEquals(32L, result);
+ assertEquals(32L, result);
}
}
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMapperTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMapperTest.java
index f518a53..042c765 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMapperTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMapperTest.java
@@ -19,61 +19,63 @@ package org.apache.camel.component.dozer;
import java.lang.reflect.Method;
import org.apache.camel.impl.engine.DefaultClassResolver;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class CustomMapperTest {
private CustomMapper customMapper;
- @Before
+ @BeforeEach
public void setup() {
customMapper = new CustomMapper(new DefaultClassResolver());
}
@Test
- public void selectMapperOneMethod() {
+ void selectMapperOneMethod() {
customMapper.setParameter(MapperWithOneMethod.class.getName());
-
Assert.assertNotNull(customMapper.selectMethod(MapperWithOneMethod.class,
String.class));
+ assertNotNull(customMapper.selectMethod(MapperWithOneMethod.class,
String.class));
}
@Test
- public void selectMapperMultipleMethods() throws Exception {
+ void selectMapperMultipleMethods() throws Exception {
Method selectedMethod =
customMapper.selectMethod(MapperWithTwoMethods.class, B.class);
- Assert.assertNotNull(selectedMethod);
- Assert.assertEquals(
- MapperWithTwoMethods.class.getMethod("convertToA", B.class),
- selectedMethod);
+ assertNotNull(selectedMethod);
+ assertEquals(MapperWithTwoMethods.class.getMethod("convertToA",
B.class), selectedMethod);
}
@Test
- public void mapCustomFindOperation() throws Exception {
+ void mapCustomFindOperation() {
customMapper.setParameter(MapperWithTwoMethods.class.getName());
- Assert.assertNotNull(customMapper.mapCustom(new B(), B.class));
+ assertNotNull(customMapper.mapCustom(new B(), B.class));
}
@Test
- public void mapCustomDeclaredOperation() throws Exception {
+ void mapCustomDeclaredOperation() {
customMapper.setParameter(MapperWithTwoMethods.class.getName() +
",convertToA");
- Assert.assertNotNull(customMapper.mapCustom(new B(), B.class));
+ assertNotNull(customMapper.mapCustom(new B(), B.class));
}
@Test
- public void mapCustomInvalidOperation() {
+ void mapCustomInvalidOperation() {
customMapper.setParameter(MapperWithTwoMethods.class.getName() +
",convertToB");
try {
customMapper.mapCustom(new B(), B.class);
- Assert.fail("Invalid operation should result in exception");
+ fail("Invalid operation should result in exception");
} catch (RuntimeException ex) {
- Assert.assertTrue(ex.getCause() instanceof NoSuchMethodException);
+ assertTrue(ex.getCause() instanceof NoSuchMethodException);
}
}
@Test
- public void mapCustomNullField() throws Exception {
+ void mapCustomNullField() {
customMapper.setParameter(MapperWithTwoMethods.class.getName());
- Assert.assertNotNull(customMapper.mapCustom(null, B.class));
+ assertNotNull(customMapper.mapCustom(null, B.class));
}
}
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMappingTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMappingTest.java
index 379d28f..2b199fb 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMappingTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/CustomMappingTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.dozer;
-import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
@@ -24,15 +23,14 @@ import
org.apache.camel.component.dozer.example.abc.ABCOrder;
import org.apache.camel.component.dozer.example.abc.ABCOrder.Header;
import org.apache.camel.component.dozer.example.xyz.XYZOrder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@CamelSpringTest
@ContextConfiguration
public class CustomMappingTest {
@@ -42,16 +40,13 @@ public class CustomMappingTest {
@Produce("direct:start")
private ProducerTemplate startEndpoint;
- @Autowired
- private CamelContext camelContext;
-
- @After
+ @AfterEach
public void tearDown() {
resultEndpoint.reset();
}
@Test
- public void testCustomMapping() throws Exception {
+ void testCustomMapping() throws Exception {
resultEndpoint.expectedMessageCount(1);
ABCOrder abcOrder = new ABCOrder();
abcOrder.setHeader(new Header());
@@ -61,7 +56,7 @@ public class CustomMappingTest {
// check results
resultEndpoint.assertIsSatisfied();
XYZOrder result =
resultEndpoint.getExchanges().get(0).getIn().getBody(XYZOrder.class);
- Assert.assertEquals(result.getPriority(), "custom2:GOLD");
- Assert.assertEquals(result.getCustId(), "mapCustomer:ACME");
+ assertEquals(result.getPriority(), "custom2:GOLD");
+ assertEquals(result.getCustId(), "mapCustomer:ACME");
}
}
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/DozerComponentTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/DozerComponentTest.java
index 1740c07..0c980fe 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/DozerComponentTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/DozerComponentTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.camel.component.dozer;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Assert;
-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;
public class DozerComponentTest extends CamelTestSupport {
@@ -37,22 +39,22 @@ public class DozerComponentTest extends CamelTestSupport {
+ "&mappingFile=" + DOZER_CONFIG_PATH;
@Test
- public void testCreateEndpoint() throws Exception {
+ void testCreateEndpoint() {
DozerEndpoint ep = context.getEndpoint(TRANSFORM_EP_1,
DozerEndpoint.class);
DozerConfiguration config = ep.getConfiguration();
- Assert.assertEquals(NAME, config.getName());
- Assert.assertEquals(MARSHAL_ID, config.getMarshalId());
- Assert.assertEquals(UNMARSHAL_ID, config.getUnmarshalId());
- Assert.assertEquals(SOURCE_MODEL, config.getSourceModel());
- Assert.assertEquals(TARGET_MODEL, config.getTargetModel());
- Assert.assertEquals(DOZER_CONFIG_PATH, config.getMappingFile());
+ assertEquals(NAME, config.getName());
+ assertEquals(MARSHAL_ID, config.getMarshalId());
+ assertEquals(UNMARSHAL_ID, config.getUnmarshalId());
+ assertEquals(SOURCE_MODEL, config.getSourceModel());
+ assertEquals(TARGET_MODEL, config.getTargetModel());
+ assertEquals(DOZER_CONFIG_PATH, config.getMappingFile());
}
@Test
- public void requiredTargetModelMissing() throws Exception {
+ void requiredTargetModelMissing() {
try {
- DozerEndpoint ep =
context.getEndpoint("dozer:noTargetModel?mappingFile=mapping.xml",
DozerEndpoint.class);
- Assert.fail("targetModel is a required parameter");
+ context.getEndpoint("dozer:noTargetModel?mappingFile=mapping.xml",
DozerEndpoint.class);
+ fail("targetModel is a required parameter");
} catch (Exception ex) {
// expected
}
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingClasspathTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingClasspathTest.java
index 2ded5a5..5d5d681 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingClasspathTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingClasspathTest.java
@@ -19,22 +19,20 @@ package org.apache.camel.component.dozer;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.dozer.example.abc.ABCOrder;
import org.apache.camel.component.dozer.example.xyz.XYZOrder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@CamelSpringTest
@ContextConfiguration
public class ExpressionMappingClasspathTest {
@@ -44,16 +42,13 @@ public class ExpressionMappingClasspathTest {
@Produce("direct:start")
private ProducerTemplate startEndpoint;
- @Autowired
- private CamelContext camelContext;
-
- @After
+ @AfterEach
public void tearDown() {
resultEndpoint.reset();
}
@Test
- public void testExpressionMappingScript() throws Exception {
+ void testExpressionMappingScript() throws Exception {
resultEndpoint.expectedMessageCount(1);
Map<String, Object> headers = new HashMap<>();
final String customerNumber = "CAFE-345";
@@ -66,7 +61,7 @@ public class ExpressionMappingClasspathTest {
// check results
resultEndpoint.assertIsSatisfied();
XYZOrder result =
resultEndpoint.getExchanges().get(0).getIn().getBody(XYZOrder.class);
- Assert.assertEquals(customerNumber, result.getCustId());
- Assert.assertEquals(orderNumber, result.getOrderId());
+ assertEquals(customerNumber, result.getCustId());
+ assertEquals(orderNumber, result.getOrderId());
}
}
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingFileTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingFileTest.java
index 569e8b0..cfcc694 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingFileTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingFileTest.java
@@ -19,22 +19,20 @@ package org.apache.camel.component.dozer;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.dozer.example.abc.ABCOrder;
import org.apache.camel.component.dozer.example.xyz.XYZOrder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@CamelSpringTest
@ContextConfiguration
public class ExpressionMappingFileTest {
@@ -44,16 +42,13 @@ public class ExpressionMappingFileTest {
@Produce("direct:start")
private ProducerTemplate startEndpoint;
- @Autowired
- private CamelContext camelContext;
-
- @After
+ @AfterEach
public void tearDown() {
resultEndpoint.reset();
}
@Test
- public void testExpressionMappingScriptFile() throws Exception {
+ void testExpressionMappingScriptFile() throws Exception {
resultEndpoint.expectedMessageCount(1);
Map<String, Object> headers = new HashMap<>();
final String customerNumber = "CAFE-678";
@@ -66,7 +61,7 @@ public class ExpressionMappingFileTest {
// check results
resultEndpoint.assertIsSatisfied();
XYZOrder result =
resultEndpoint.getExchanges().get(0).getIn().getBody(XYZOrder.class);
- Assert.assertEquals(customerNumber, result.getCustId());
- Assert.assertEquals(orderNumber, result.getOrderId());
+ assertEquals(customerNumber, result.getCustId());
+ assertEquals(orderNumber, result.getOrderId());
}
}
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingTest.java
index 0fd82ab..e0cf1d7 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/ExpressionMappingTest.java
@@ -19,22 +19,20 @@ package org.apache.camel.component.dozer;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.dozer.example.abc.ABCOrder;
import org.apache.camel.component.dozer.example.xyz.XYZOrder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@CamelSpringTest
@ContextConfiguration
public class ExpressionMappingTest {
@@ -44,16 +42,13 @@ public class ExpressionMappingTest {
@Produce("direct:start")
private ProducerTemplate startEndpoint;
- @Autowired
- private CamelContext camelContext;
-
- @After
+ @AfterEach
public void tearDown() {
resultEndpoint.reset();
}
@Test
- public void testExpressionMapping() throws Exception {
+ void testExpressionMapping() throws Exception {
resultEndpoint.expectedMessageCount(1);
Map<String, Object> headers = new HashMap<>();
final String customerNumber = "CAFE-123";
@@ -66,8 +61,8 @@ public class ExpressionMappingTest {
// check results
resultEndpoint.assertIsSatisfied();
XYZOrder result =
resultEndpoint.getExchanges().get(0).getIn().getBody(XYZOrder.class);
- Assert.assertEquals(customerNumber, result.getCustId());
- Assert.assertEquals(orderNumber, result.getOrderId());
+ assertEquals(customerNumber, result.getCustId());
+ assertEquals(orderNumber, result.getOrderId());
}
}
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/VariableMappingTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/VariableMappingTest.java
index 458e3c3..5843bbe 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/VariableMappingTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/VariableMappingTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.dozer;
-import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
@@ -24,15 +23,14 @@ import
org.apache.camel.component.dozer.example.abc.ABCOrder;
import org.apache.camel.component.dozer.example.abc.ABCOrder.Header;
import org.apache.camel.component.dozer.example.xyz.XYZOrder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.camel.test.spring.junit5.CamelSpringTest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@CamelSpringTest
@ContextConfiguration
public class VariableMappingTest {
@@ -42,16 +40,13 @@ public class VariableMappingTest {
@Produce("direct:start")
private ProducerTemplate startEndpoint;
- @Autowired
- private CamelContext camelContext;
-
- @After
+ @AfterEach
public void tearDown() {
resultEndpoint.reset();
}
@Test
- public void testLiteralMapping() throws Exception {
+ void testLiteralMapping() throws Exception {
resultEndpoint.expectedMessageCount(1);
ABCOrder abcOrder = new ABCOrder();
abcOrder.setHeader(new Header());
@@ -60,8 +55,8 @@ public class VariableMappingTest {
// check results
resultEndpoint.assertIsSatisfied();
XYZOrder result =
resultEndpoint.getExchanges().get(0).getIn().getBody(XYZOrder.class);
- Assert.assertEquals(result.getPriority(), "GOLD");
- Assert.assertEquals("ACME-SALES", result.getCustId());
- Assert.assertEquals("W123-EG", result.getOrderId());
+ assertEquals(result.getPriority(), "GOLD");
+ assertEquals("ACME-SALES", result.getCustId());
+ assertEquals("W123-EG", result.getOrderId());
}
}
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/XmlToJsonTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/XmlToJsonTest.java
index 0337c89..6f796ce 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/XmlToJsonTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/XmlToJsonTest.java
@@ -23,15 +23,15 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.After;
-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.AfterEach;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-@RunWith(SpringJUnit4ClassRunner.class)
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@CamelSpringTest
@ContextConfiguration
public class XmlToJsonTest {
@@ -47,23 +47,23 @@ public class XmlToJsonTest {
@Autowired
private CamelContext camelContext;
- @After
+ @AfterEach
public void tearDown() {
resultEndpoint.reset();
}
@Test
- public void testXmlToJson() throws Exception {
+ void testXmlToJson() throws Exception {
resultEndpoint.expectedMessageCount(1);
startEndpoint.sendBody(getResourceAsString(ABC_ORDER_PATH));
// check results
resultEndpoint.assertIsSatisfied();
String result =
resultEndpoint.getExchanges().get(0).getIn().getBody(String.class);
- Assert.assertEquals(getResourceAsString(XYZ_ORDER_PATH), result);
+ assertEquals(getResourceAsString(XYZ_ORDER_PATH), result);
}
@Test
- public void testMultipleSends() throws Exception {
+ void testMultipleSends() throws Exception {
resultEndpoint.expectedMessageCount(2);
startEndpoint.sendBody(getResourceAsString(ABC_ORDER_PATH));
startEndpoint.sendBody(getResourceAsString(ABC_ORDER_PATH));
@@ -71,8 +71,8 @@ public class XmlToJsonTest {
resultEndpoint.assertIsSatisfied();
String result1 =
resultEndpoint.getExchanges().get(0).getIn().getBody(String.class);
String result2 =
resultEndpoint.getExchanges().get(1).getIn().getBody(String.class);
- Assert.assertEquals(getResourceAsString(XYZ_ORDER_PATH), result1);
- Assert.assertEquals(getResourceAsString(XYZ_ORDER_PATH), result2);
+ assertEquals(getResourceAsString(XYZ_ORDER_PATH), result1);
+ assertEquals(getResourceAsString(XYZ_ORDER_PATH), result2);
}
private String getResourceAsString(String resourcePath) {
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/CustomerProcessor.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/CustomerProcessor.java
index 0253310..e487426 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/CustomerProcessor.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/CustomerProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.converter.dozer;
import org.apache.camel.converter.dozer.model.Customer;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class CustomerProcessor {
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerBeanMappingTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerBeanMappingTest.java
index 29d09b9..30eee55 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerBeanMappingTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerBeanMappingTest.java
@@ -27,77 +27,81 @@ import org.apache.camel.converter.dozer.model.Customer;
import org.apache.camel.converter.dozer.model.CustomerA;
import org.apache.camel.converter.dozer.model.CustomerB;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DozerBeanMappingTest {
@Test
- public void testMarshalViaDozer() throws Exception {
+ void testMarshalViaDozer() throws Exception {
CamelContext context = new DefaultCamelContext();
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").convertBodyTo(HashMap.class);
}
});
DozerBeanMapperConfiguration mconfig = new
DozerBeanMapperConfiguration();
mconfig.setMappingFiles(Arrays.asList("bean-to-map-dozer-mappings.xml"));
- new DozerTypeConverterLoader(context, mconfig);
+ try (DozerTypeConverterLoader dtcl = new
DozerTypeConverterLoader(context, mconfig)) {
+ }
context.start();
try {
ProducerTemplate producer = context.createProducerTemplate();
Map<?, ?> result = producer.requestBody("direct:start", new
Customer("John", "Doe", null), Map.class);
- Assert.assertEquals("John", result.get("firstName"));
- Assert.assertEquals("Doe", result.get("lastName"));
+ assertEquals("John", result.get("firstName"));
+ assertEquals("Doe", result.get("lastName"));
} finally {
context.stop();
}
}
@Test
- public void testMarshalToInterfaceViaDozer() throws Exception {
+ void testMarshalToInterfaceViaDozer() throws Exception {
CamelContext context = new DefaultCamelContext();
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").convertBodyTo(Map.class);
}
});
DozerBeanMapperConfiguration mconfig = new
DozerBeanMapperConfiguration();
mconfig.setMappingFiles(Arrays.asList("bean-to-map-dozer-mappings.xml"));
- new DozerTypeConverterLoader(context, mconfig);
+ try (DozerTypeConverterLoader dtcl = new
DozerTypeConverterLoader(context, mconfig)) {
+ }
context.start();
try {
ProducerTemplate producer = context.createProducerTemplate();
Map<?, ?> result = producer.requestBody("direct:start", new
Customer("John", "Doe", null), Map.class);
- Assert.assertEquals("John", result.get("firstName"));
- Assert.assertEquals("Doe", result.get("lastName"));
+ assertEquals("John", result.get("firstName"));
+ assertEquals("Doe", result.get("lastName"));
} finally {
context.stop();
}
}
@Test
- public void testBeanMapping() throws Exception {
+ void testBeanMapping() throws Exception {
CamelContext context = new DefaultCamelContext();
context.addRoutes(new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:start").convertBodyTo(CustomerB.class);
}
});
DozerBeanMapperConfiguration mconfig = new
DozerBeanMapperConfiguration();
mconfig.setMappingFiles(Arrays.asList("bean-to-bean-dozer-mappings.xml"));
- new DozerTypeConverterLoader(context, mconfig);
+ try (DozerTypeConverterLoader dtcl = new
DozerTypeConverterLoader(context, mconfig)) {
+ }
CustomerA customerA = new CustomerA("Peter", "Post", "SomeStreet",
"12345");
@@ -105,10 +109,10 @@ public class DozerBeanMappingTest {
try {
ProducerTemplate producer = context.createProducerTemplate();
CustomerB result = producer.requestBody("direct:start", customerA,
CustomerB.class);
- Assert.assertEquals(customerA.getFirstName(),
result.getFirstName());
- Assert.assertEquals(customerA.getLastName(), result.getLastName());
- Assert.assertEquals(customerA.getStreet(),
result.getAddress().getStreet());
- Assert.assertEquals(customerA.getZip(),
result.getAddress().getZip());
+ assertEquals(customerA.getFirstName(), result.getFirstName());
+ assertEquals(customerA.getLastName(), result.getLastName());
+ assertEquals(customerA.getStreet(),
result.getAddress().getStreet());
+ assertEquals(customerA.getZip(), result.getAddress().getZip());
} finally {
context.stop();
}
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
index c44b137..018dd79 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterDTOTest.java
@@ -23,16 +23,16 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.dozer.dto.CustomerDTO;
import org.apache.camel.converter.dozer.model.Customer;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.converter.dozer.DozerTestArtifactsFactory.createDtoCustomer;
public class DozerTypeConverterDTOTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -46,21 +46,22 @@ public class DozerTypeConverterDTOTest extends
CamelTestSupport {
DozerBeanMapperConfiguration config = new
DozerBeanMapperConfiguration();
config.setBeanMappingBuilders(Arrays.asList(beanMappingBuilder));
- new DozerTypeConverterLoader(context, config);
+ try (DozerTypeConverterLoader dtcl = new
DozerTypeConverterLoader(context, config)) {
+ }
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:service-in").bean(new
CustomerProcessor()).to("mock:verify-model");
}
};
}
@Test
- public void verifyCamelConversionViaDozer() throws Exception {
+ void verifyCamelConversionViaDozer() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:verify-model");
mock.expectedMessageCount(1);
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
index baf1077..53c1e09 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/DozerTypeConverterTest.java
@@ -22,37 +22,39 @@ import com.github.dozermapper.core.Mapper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.dozer.service.Customer;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static
org.apache.camel.converter.dozer.DozerTestArtifactsFactory.createServiceCustomer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class DozerTypeConverterTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
DozerBeanMapperConfiguration config = new
DozerBeanMapperConfiguration();
config.setMappingFiles(Arrays.asList("mapping.xml"));
- new DozerTypeConverterLoader(context, config);
+ try (DozerTypeConverterLoader dtcl = new
DozerTypeConverterLoader(context, config)) {
+ }
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
+ protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() {
from("direct:service-in").bean(new
CustomerProcessor()).to("mock:verify-model");
}
};
}
@Test
- public void verifyCamelConversionViaDozer() throws Exception {
+ void verifyCamelConversionViaDozer() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:verify-model");
mock.expectedMessageCount(1);
@@ -62,7 +64,7 @@ public class DozerTypeConverterTest extends CamelTestSupport {
}
@Test
- public void verifyCustomerMapping() throws Exception {
+ void verifyCustomerMapping() {
Mapper mapper = DozerTestArtifactsFactory.createMapper(context);
Customer service = createServiceCustomer();
org.apache.camel.converter.dozer.model.Customer model =
mapper.map(service, org.apache.camel.converter.dozer.model.Customer.class);
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterConfigurationTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterConfigurationTest.java
index 18b7c0c..3be72ff 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterConfigurationTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterConfigurationTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.converter.dozer;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,7 +32,7 @@ public class SpringDozerTypeConverterConfigurationTest
extends CamelSpringTestSu
}
@Test
- public void verifyCamelConversionViaDozer() throws Exception {
+ void verifyCamelConversionViaDozer() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:verify-model");
mock.expectedMessageCount(1);
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterTest.java
index b2f5649..b85818f 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.converter.dozer;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,7 +32,7 @@ public class SpringDozerTypeConverterTest extends
CamelSpringTestSupport {
}
@Test
- public void verifyCamelConversionViaDozer() throws Exception {
+ void verifyCamelConversionViaDozer() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:verify-model");
mock.expectedMessageCount(1);
diff --git
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterWithMapIdTest.java
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterWithMapIdTest.java
index e5841c5..1d75d9e 100644
---
a/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterWithMapIdTest.java
+++
b/components/camel-dozer/src/test/java/org/apache/camel/converter/dozer/SpringDozerTypeConverterWithMapIdTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.converter.dozer;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,7 +32,7 @@ public class SpringDozerTypeConverterWithMapIdTest extends
CamelSpringTestSuppor
}
@Test
- public void verifyCamelConversionViaDozer() throws Exception {
+ void verifyCamelConversionViaDozer() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:verify-model");
mock.expectedMessageCount(1);
