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 77f6b83f61d3251cb1475752e5c1b93dca8d6532 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Thu Jun 11 05:35:52 2020 +0200 [CAMEL-11807] Upgrade camel-util-json to junit5 --- tooling/camel-util-json/pom.xml | 6 +++--- .../org/apache/camel/util/json/JsonSimpleOrderedTest.java | 14 +++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tooling/camel-util-json/pom.xml b/tooling/camel-util-json/pom.xml index 896854f..9615b49 100644 --- a/tooling/camel-util-json/pom.xml +++ b/tooling/camel-util-json/pom.xml @@ -41,10 +41,10 @@ </properties> <dependencies> - + <!-- testing --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/tooling/camel-util-json/src/test/java/org/apache/camel/util/json/JsonSimpleOrderedTest.java b/tooling/camel-util-json/src/test/java/org/apache/camel/util/json/JsonSimpleOrderedTest.java index b950c2f..c22eca9 100644 --- a/tooling/camel-util-json/src/test/java/org/apache/camel/util/json/JsonSimpleOrderedTest.java +++ b/tooling/camel-util-json/src/test/java/org/apache/camel/util/json/JsonSimpleOrderedTest.java @@ -25,10 +25,14 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class JsonSimpleOrderedTest extends Assert { +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class JsonSimpleOrderedTest { @Test public void testOrdered() throws Exception { @@ -39,9 +43,9 @@ public class JsonSimpleOrderedTest extends Assert { assertNotNull(output); // should preserve order - Map map = output.getMap("component"); + Map<?, ?> map = output.getMap("component"); assertTrue(map instanceof LinkedHashMap); - Iterator it = map.keySet().iterator(); + Iterator<?> it = map.keySet().iterator(); assertEquals("kind", it.next()); assertEquals("scheme", it.next()); assertEquals("syntax", it.next());