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 2c98074880a795ccb43881d45b7fc48cb02fcf5d Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 13:32:02 2020 +0200 [CAMEL-11807] Upgrade camel-fastjson to junit5 --- components/camel-fastjson/pom.xml | 6 +++--- .../apache/camel/component/fastjson/FastjsonJsonDataFormatTest.java | 6 ++++-- .../org/apache/camel/component/fastjson/FastjsonMarshalTest.java | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/components/camel-fastjson/pom.xml b/components/camel-fastjson/pom.xml index 749e7a3..1419827 100644 --- a/components/camel-fastjson/pom.xml +++ b/components/camel-fastjson/pom.xml @@ -48,7 +48,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -57,8 +57,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-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonJsonDataFormatTest.java b/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonJsonDataFormatTest.java index 872c497..0c606c3 100644 --- a/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonJsonDataFormatTest.java +++ b/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonJsonDataFormatTest.java @@ -20,7 +20,9 @@ import java.util.Map; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.dataformat.JsonLibrary; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class FastjsonJsonDataFormatTest extends FastjsonMarshalTest { @@ -29,7 +31,7 @@ public class FastjsonJsonDataFormatTest extends FastjsonMarshalTest { Map<?, ?> unmarshalled = template.requestBody("direct:json", "{\"pointsOfSale\":{\"pointOfSale\":{\"prodcut\":\"newpad\"}}}", Map.class); Map<?, ?> map1 = (Map<?, ?>) unmarshalled.get("pointsOfSale"); Map<?, ?> map2 = (Map<?, ?>) map1.get("pointOfSale"); - assertEquals("Don't get the right value", "newpad", map2.get("prodcut")); + assertEquals("newpad", map2.get("prodcut"), "Don't get the right value"); } @Override diff --git a/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonMarshalTest.java b/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonMarshalTest.java index c87a4b9..2895aa4 100644 --- a/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonMarshalTest.java +++ b/components/camel-fastjson/src/test/java/org/apache/camel/component/fastjson/FastjsonMarshalTest.java @@ -21,8 +21,10 @@ 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; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class FastjsonMarshalTest extends CamelTestSupport {
