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 e2d6c51 CAMEL-11807: Migrated camel-jsonpath tests to JUnit 5
e2d6c51 is described below
commit e2d6c518df53fa0d06a7d308acff377993e80278
Author: aldettinger <aldettin...@gmail.com>
AuthorDate: Tue Nov 26 15:00:57 2019 +0100
CAMEL-11807: Migrated camel-jsonpath tests to JUnit 5
---
components/camel-jsonpath/pom.xml | 2 +-
.../jsonpath/JsonPathBeanStreamCachingTest.java | 4 ++--
.../JsonPathBeanSuppressExceptionsTest.java | 4 ++--
.../apache/camel/jsonpath/JsonPathBeanTest.java | 4 ++--
.../org/apache/camel/jsonpath/JsonPathCBRTest.java | 4 ++--
.../apache/camel/jsonpath/JsonPathCharsetTest.java | 15 +++++++++------
.../camel/jsonpath/JsonPathHeaderNameTest.java | 4 ++--
.../camel/jsonpath/JsonPathLanguageTest.java | 22 ++++++++++++++++------
.../camel/jsonpath/JsonPathMapTransformTest.java | 7 +++++--
.../camel/jsonpath/JsonPathMockMatchesTest.java | 4 ++--
.../camel/jsonpath/JsonPathPojoTransformTest.java | 4 ++--
.../apache/camel/jsonpath/JsonPathSourceTest.java | 8 ++++----
.../apache/camel/jsonpath/JsonPathSplitTest.java | 8 ++++++--
.../JsonPathSplitWriteAsStringMapTest.java | 6 ++++--
.../jsonpath/JsonPathSplitWriteAsStringTest.java | 4 ++--
.../camel/jsonpath/JsonPathSuppressTest.java | 4 ++--
.../jsonpath/JsonPathTransformHeaderNameTest.java | 6 ++++--
.../jsonpath/JsonPathTransformResultTypeTest.java | 4 ++--
.../camel/jsonpath/JsonPathTransformTest.java | 6 ++++--
.../camel/jsonpath/JsonPathWithSimpleCBRTest.java | 4 ++--
.../org/apache/camel/jsonpath/JsonStreamTest.java | 14 +++++++-------
.../camel/jsonpath/SpringJsonPathCBRTest.java | 4 ++--
.../SpringJsonPathSplitWriteAsStringTest.java | 4 ++--
.../camel/jsonpath/SpringJsonPathSuppressTest.java | 4 ++--
.../SpringJsonPathTransformHeaderNameTest.java | 6 ++++--
.../SpringJsonPathTransformResultTypeTest.java | 4 ++--
.../jsonpath/SpringJsonPathTransformTest.java | 6 ++++--
.../EasyJsonPathWithRootSimpleCBRTest.java | 4 ++--
.../EasyJsonPathWithSimpleCBRTest.java | 4 ++--
29 files changed, 102 insertions(+), 72 deletions(-)
diff --git a/components/camel-jsonpath/pom.xml
b/components/camel-jsonpath/pom.xml
index a572708..a56dc973 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -76,7 +76,7 @@
<!-- testing -->
<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-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanStreamCachingTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanStreamCachingTest.java
index d416170..4553dc0 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanStreamCachingTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanStreamCachingTest.java
@@ -20,8 +20,8 @@ import java.io.ByteArrayInputStream;
import com.jayway.jsonpath.Option;
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;
public class JsonPathBeanStreamCachingTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanSuppressExceptionsTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanSuppressExceptionsTest.java
index c824a54..18d5a15 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanSuppressExceptionsTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanSuppressExceptionsTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.jsonpath;
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;
public class JsonPathBeanSuppressExceptionsTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanTest.java
index 6c5a4e6..dea088e 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathBeanTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.jsonpath;
import com.jayway.jsonpath.Option;
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;
public class JsonPathBeanTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
index b4d3d30..9a889a3 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCBRTest.java
@@ -21,8 +21,8 @@ import java.io.File;
import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.builder.PredicateBuilder;
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;
public class JsonPathCBRTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java
index 40c0240..27cde61 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathCharsetTest.java
@@ -23,9 +23,12 @@ import java.util.Collections;
import java.util.List;
import org.apache.camel.builder.RouteBuilder;
-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.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JsonPathCharsetTest extends CamelTestSupport {
@@ -66,7 +69,7 @@ public class JsonPathCharsetTest extends CamelTestSupport {
getMockEndpoint("mock:authors").expectedMessageCount(1);
InputStream input =
JsonPathCharsetTest.class.getClassLoader().getResourceAsStream("booksUTF16BE.json");
- Assert.assertNotNull(input);
+ assertNotNull(input);
sendBody("direct:start", input);
assertMockEndpointsSatisfied();
@@ -79,7 +82,7 @@ public class JsonPathCharsetTest extends CamelTestSupport {
getMockEndpoint("mock:authors").expectedMessageCount(1);
URL url = new URL("file:src/test/resources/booksUTF16BE.json");
- Assert.assertNotNull(url);
+ assertNotNull(url);
sendBody("direct:start", url);
check();
@@ -90,7 +93,7 @@ public class JsonPathCharsetTest extends CamelTestSupport {
getMockEndpoint("mock:authors").expectedMessageCount(1);
URL url = new
URL("file:src/test/resources/germanbooks-iso-8859-1.json");
- Assert.assertNotNull(url);
+ assertNotNull(url);
sendBody("direct:start", url, Collections.<String, Object>
singletonMap(JsonPathConstants.HEADER_JSON_ENCODING, "ISO-8859-1"));
check("Joseph und seine Brüder", "Götzendämmerung");
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathHeaderNameTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathHeaderNameTest.java
index 1f56fee..e838767 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathHeaderNameTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathHeaderNameTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.jsonpath;
import java.io.File;
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;
public class JsonPathHeaderNameTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
index 78a492f..7f9769f 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathLanguageTest.java
@@ -27,11 +27,21 @@ import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.spi.Language;
import org.apache.camel.support.DefaultExchange;
-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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JsonPathLanguageTest extends CamelTestSupport {
+ private static final Logger LOG =
LoggerFactory.getLogger(JsonPathLanguageTest.class);
+
@Override
public boolean isUseRouteBuilder() {
return false;
@@ -45,7 +55,7 @@ public class JsonPathLanguageTest extends CamelTestSupport {
Language lan = context.resolveLanguage("jsonpath");
Expression exp = lan.createExpression("$.store.book[*].author");
List<?> authors = exp.evaluate(exchange, List.class);
- log.debug("Authors {}", authors);
+ LOG.debug("Authors {}", authors);
assertNotNull(authors);
assertEquals(2, authors.size());
@@ -54,7 +64,7 @@ public class JsonPathLanguageTest extends CamelTestSupport {
exp = lan.createExpression("$.store.bicycle.price");
String price = exp.evaluate(exchange, String.class);
- assertEquals("Got a wrong result", "19.95", price);
+ assertEquals("19.95", price, "Got a wrong result");
}
@Test
@@ -105,11 +115,11 @@ public class JsonPathLanguageTest extends
CamelTestSupport {
Language lan = context.resolveLanguage("jsonpath");
Predicate pre = lan.createPredicate("$.store.book[?(@.price < 10)]");
boolean cheap = pre.matches(exchange);
- assertTrue("Should have cheap books", cheap);
+ assertTrue(cheap, "Should have cheap books");
pre = lan.createPredicate("$.store.book[?(@.price > 30)]");
boolean expensive = pre.matches(exchange);
- assertFalse("Should not have expensive books", expensive);
+ assertFalse(expensive, "Should not have expensive books");
}
@Test
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java
index aefd932..eddeafb 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMapTransformTest.java
@@ -22,8 +22,11 @@ import java.util.Map;
import com.jayway.jsonpath.Configuration;
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.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class JsonPathMapTransformTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMockMatchesTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMockMatchesTest.java
index 4e9f8b0..15899fa 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMockMatchesTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathMockMatchesTest.java
@@ -20,8 +20,8 @@ import java.io.File;
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 JsonPathMockMatchesTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPojoTransformTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPojoTransformTest.java
index b704aa0..d88031c 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPojoTransformTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathPojoTransformTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.jsonpath;
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;
public class JsonPathPojoTransformTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
index b2b3876..4008f87 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
@@ -22,16 +22,16 @@ import java.nio.charset.Charset;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.FileConsumer;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
public class JsonPathSourceTest extends CamelTestSupport {
private static final String MESSAGE1 = "Joseph und seine Br\u00fcder";
private static final String MESSAGE2 = "G\u00f6tzend\u00e4mmerung";
private static final Charset DEFAULT_CHARSET = Charset.defaultCharset();
- @AfterClass
+ @AfterAll
public static void setDefaultCharsetBack() {
switchToDefaultCharset(DEFAULT_CHARSET.displayName());
}
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitTest.java
index 8f3faf1..c129e3a 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitTest.java
@@ -20,8 +20,12 @@ import java.io.File;
import java.util.Map;
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;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JsonPathSplitTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringMapTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringMapTest.java
index 9432f08..5b567ac 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringMapTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringMapTest.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 JsonPathSplitWriteAsStringMapTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringTest.java
index e96e351..54656b0 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitWriteAsStringTest.java
@@ -20,8 +20,8 @@ import java.io.File;
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 JsonPathSplitWriteAsStringTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSuppressTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSuppressTest.java
index c4547c8..d032a60 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSuppressTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSuppressTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.jsonpath;
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;
public class JsonPathSuppressTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformHeaderNameTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformHeaderNameTest.java
index c77782e..6f1c8f6 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformHeaderNameTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformHeaderNameTest.java
@@ -20,8 +20,10 @@ import java.io.File;
import java.util.List;
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 JsonPathTransformHeaderNameTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformResultTypeTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformResultTypeTest.java
index 46cbe62..03a928a 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformResultTypeTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformResultTypeTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.jsonpath;
import java.io.File;
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;
public class JsonPathTransformResultTypeTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
index 02b84af..b9fe580 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathTransformTest.java
@@ -20,8 +20,10 @@ import java.io.File;
import java.util.List;
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 JsonPathTransformTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathWithSimpleCBRTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathWithSimpleCBRTest.java
index b7e502e..3ea8e62 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathWithSimpleCBRTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathWithSimpleCBRTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.jsonpath;
import java.io.File;
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;
public class JsonPathWithSimpleCBRTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonStreamTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonStreamTest.java
index 70c3f93..5f3dc27 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonStreamTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonStreamTest.java
@@ -21,11 +21,11 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.Arrays;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class JsonStreamTest {
@@ -38,9 +38,9 @@ public class JsonStreamTest {
public void iSO88591() throws Exception {
try {
test("json_stream/jsonISO8859-1.txt", "ISO-8859-1");
- fail("Error exepcted");
+ fail("Error expected");
} catch (AssertionError e) {
- assertEquals("expected:<ISO-8859-1> but was:<UTF-8>",
e.getMessage());
+ assertEquals("expected: <ISO-8859-1> but was: <UTF-8>",
e.getMessage());
}
}
@@ -107,7 +107,7 @@ public class JsonStreamTest {
private void test(String file, String encoding, String expectedString)
throws Exception {
InputStream is =
JsonStreamTest.class.getClassLoader().getResourceAsStream(file);
- assertNotNull("File " + file + " not found", is);
+ assertNotNull(is, "File " + file + " not found");
JsonStream js = new JsonStream(is);
Charset actual = js.getEncoding();
Charset expected = Charset.forName(encoding);
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java
index 779043f..d3cfbf7 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathCBRTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.jsonpath;
import java.io.File;
-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.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSplitWriteAsStringTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSplitWriteAsStringTest.java
index f04fb27..535706d 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSplitWriteAsStringTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSplitWriteAsStringTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.jsonpath;
import java.io.File;
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.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSuppressTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSuppressTest.java
index cad2866..f5aa6e7 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSuppressTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathSuppressTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.jsonpath;
-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.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformHeaderNameTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformHeaderNameTest.java
index 5d51c5d..5f7430a 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformHeaderNameTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformHeaderNameTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.jsonpath;
import java.io.File;
import java.util.List;
-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.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class SpringJsonPathTransformHeaderNameTest extends
CamelSpringTestSupport {
@Override
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformResultTypeTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformResultTypeTest.java
index 6b66a99..0018609 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformResultTypeTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformResultTypeTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.jsonpath;
import java.io.File;
-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.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java
index b892a61..8dedf74 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/SpringJsonPathTransformTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.jsonpath;
import java.io.File;
import java.util.List;
-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.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class SpringJsonPathTransformTest extends CamelSpringTestSupport {
@Override
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithRootSimpleCBRTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithRootSimpleCBRTest.java
index a7b248a..b368a33 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithRootSimpleCBRTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithRootSimpleCBRTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.jsonpath.easypredicate;
import java.io.File;
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;
public class EasyJsonPathWithRootSimpleCBRTest extends CamelTestSupport {
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithSimpleCBRTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithSimpleCBRTest.java
index 7411f74..402053a 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithSimpleCBRTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/easypredicate/EasyJsonPathWithSimpleCBRTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.jsonpath.easypredicate;
import java.io.File;
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;
public class EasyJsonPathWithSimpleCBRTest extends CamelTestSupport {
