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 15059c413f64fbb978eb7d2782b90eea33cc8c39 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Thu Jul 9 14:05:35 2020 +0200 [CAMEL-11807] Upgrade camel-mvel to junit5 --- components/camel-mvel/pom.xml | 6 +++--- .../java/org/apache/camel/language/mvel/MvelComponentTest.java | 6 ++++-- .../test/java/org/apache/camel/language/mvel/MvelResourceTest.java | 4 ++-- .../src/test/java/org/apache/camel/language/mvel/MvelTest.java | 7 +++++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml index 49141a9..e40dc7d 100644 --- a/components/camel-mvel/pom.xml +++ b/components/camel-mvel/pom.xml @@ -50,7 +50,7 @@ <!-- test dependency --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -59,8 +59,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> </dependencies> diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java index 05c693b..d1ae3a5 100644 --- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java +++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java @@ -19,8 +19,10 @@ package org.apache.camel.language.mvel; 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; /** * diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelResourceTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelResourceTest.java index 0d30683..fafee80 100644 --- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelResourceTest.java +++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelResourceTest.java @@ -17,8 +17,8 @@ package org.apache.camel.language.mvel; 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; /** * diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java index 297fb70..6b9ce91 100644 --- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java +++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java @@ -16,8 +16,11 @@ */ package org.apache.camel.language.mvel; -import org.apache.camel.test.junit4.LanguageTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.LanguageTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MvelTest extends LanguageTestSupport {