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 be6d4e84e5474208803112a51a0f4221a69932aa
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Jul 22 15:38:30 2020 +0200
[CAMEL-11807] Upgrade camel-velocity to junit5
---
components/camel-velocity/pom.xml | 6 +++---
.../component/velocity/VelocityBodyAsDomainObjectTest.java | 4 ++--
.../camel/component/velocity/VelocityConcurrentTest.java | 6 ++++--
.../camel/component/velocity/VelocityContentCacheTest.java | 8 ++++----
.../component/velocity/VelocityDynamicTemplateTest.java | 4 ++--
.../camel/component/velocity/VelocityLetterTest.java | 4 ++--
.../component/velocity/VelocityMethodInvokationTest.java | 6 ++++--
.../velocity/VelocityOverridesPropertiesTest.java | 6 ++++--
.../camel/component/velocity/VelocitySetHeaderTest.java | 4 ++--
.../velocity/VelocitySetTemplateViaHeaderTest.java | 4 ++--
.../velocity/VelocitySomeValuesNotInExchangeTest.java | 4 ++--
.../velocity/VelocitySupplementalContextTest.java | 4 ++--
.../component/velocity/VelocityTemplateInHeaderTest.java | 14 +++++++++-----
.../org/apache/camel/component/velocity/VelocityTest.java | 6 ++++--
.../component/velocity/VelocityValuesInPropertiesTest.java | 4 ++--
15 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/components/camel-velocity/pom.xml
b/components/camel-velocity/pom.xml
index a97f85b..5bbc582 100644
--- a/components/camel-velocity/pom.xml
+++ b/components/camel-velocity/pom.xml
@@ -47,7 +47,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -61,8 +61,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java
index 1d28334..57503c3 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityBodyAsDomainObjectTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.velocity;
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;
/**
* Unit test with the body as a Domain object.
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java
index 7abf3de..b3ce96c 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java
@@ -21,8 +21,10 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
-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.apache.camel.test.junit5.TestSupport.body;
public class VelocityConcurrentTest extends CamelTestSupport {
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
index 926232e..3bbc35c 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityContentCacheTest.java
@@ -25,9 +25,9 @@ import javax.management.ObjectName;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-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;
/**
* Unit test the cache when reloading .vm files in the classpath
@@ -35,7 +35,7 @@ import org.junit.Test;
public class VelocityContentCacheTest extends CamelTestSupport {
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java
index afd3b95..529a09f 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityDynamicTemplateTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Message;
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;
public class VelocityDynamicTemplateTest extends CamelTestSupport {
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java
index 12792e7..13c486e 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityLetterTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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;
/**
* Unit test for wiki documentation
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java
index e79d3f2..3a9da13 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityMethodInvokationTest.java
@@ -19,9 +19,11 @@ package org.apache.camel.component.velocity;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.velocity.tools.generic.EscapeTool;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class VelocityMethodInvokationTest extends CamelTestSupport {
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java
index 48938d6..9c29b77 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityOverridesPropertiesTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.velocity;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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;
public class VelocityOverridesPropertiesTest extends CamelTestSupport {
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java
index 24ccfd3..58bce5a 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetHeaderTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
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.ClassPathXmlApplicationContext;
public class VelocitySetHeaderTest extends CamelSpringTestSupport {
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java
index 1873d76..b6285e4 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySetTemplateViaHeaderTest.java
@@ -20,8 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
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;
public class VelocitySetTemplateViaHeaderTest extends CamelTestSupport {
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java
index 8db3252..6adace3 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySomeValuesNotInExchangeTest.java
@@ -21,8 +21,8 @@ import java.util.Map;
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;
/**
* Unit test with some variables missing.
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java
index cd774a8..0289f0a 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocitySupplementalContextTest.java
@@ -24,8 +24,8 @@ 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;
public class VelocitySupplementalContextTest extends CamelTestSupport {
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java
index 5486cbc..692b13f 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTemplateInHeaderTest.java
@@ -24,8 +24,12 @@ import org.apache.camel.InvalidPayloadException;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-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.apache.camel.test.junit5.TestSupport.assertMessageBodyEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class VelocityTemplateInHeaderTest extends CamelTestSupport {
@@ -57,10 +61,10 @@ public class VelocityTemplateInHeaderTest extends
CamelTestSupport {
in.setHeader(headerName, headerValue);
}
});
- assertOutMessageBodyEquals(response, expectedBody);
+ assertMessageBodyEquals(response, expectedBody);
Object template =
response.getMessage().getHeader(VelocityConstants.VELOCITY_TEMPLATE);
- assertNull("Template header should have been removed", template);
+ assertNull(template, "Template header should have been removed");
Set<Entry<String, Object>> entrySet =
response.getMessage().getHeaders().entrySet();
boolean keyFound = false;
@@ -69,7 +73,7 @@ public class VelocityTemplateInHeaderTest extends
CamelTestSupport {
keyFound = true;
}
}
- assertTrue("Header should been found", keyFound);
+ assertTrue(keyFound, "Header should been found");
}
@Override
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java
index 4145f12..57627f4 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityTest.java
@@ -22,9 +22,11 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.velocity.VelocityContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class VelocityTest extends CamelTestSupport {
diff --git
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java
index 755bb0c..9d31d9a 100644
---
a/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java
+++
b/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityValuesInPropertiesTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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;
public class VelocityValuesInPropertiesTest extends CamelTestSupport {
