[camel] 19/27: [CAMEL-11807] Upgrade camel-tika to junit5

[gnodet]

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 669140d7057dd1383f9d28f004ca6264641d73f4
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 24 12:03:38 2020 +0200

    [CAMEL-11807] Upgrade camel-tika to junit5
---
 components/camel-tika/pom.xml                               |  6 +++---
 .../org/apache/camel/component/tika/TikaDetectTest.java     |  5 +++--
 .../java/org/apache/camel/component/tika/TikaParseTest.java | 13 +++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/components/camel-tika/pom.xml b/components/camel-tika/pom.xml
index 5820378..cc6aea7 100644
--- a/components/camel-tika/pom.xml
+++ b/components/camel-tika/pom.xml
@@ -55,7 +55,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>
@@ -64,8 +64,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
diff --git 
a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
 
b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
index 6295141..d01b6d6 100644
--- 
a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
+++ 
b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaDetectTest.java
@@ -23,9 +23,10 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Predicate;
 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.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.instanceOf;
 
diff --git 
a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
 
b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
index b2d73de..63739bc 100644
--- 
a/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
+++ 
b/components/camel-tika/src/test/java/org/apache/camel/component/tika/TikaParseTest.java
@@ -31,12 +31,17 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spi.Registry;
 import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.txt.UniversalEncodingDetector;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.*;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class TikaParseTest extends CamelTestSupport {