[camel] 06/27: [CAMEL-11807] Upgrade camel-splunk-hec to junit5

[gn...@apache.org]

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 0132b28a071598ac1aed9824d3a8e3d6e95a40df
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jul 24 10:30:43 2020 +0200

    [CAMEL-11807] Upgrade camel-splunk-hec to junit5
---
 components/camel-splunk-hec/pom.xml                            |  4 ++--
 .../camel/component/splunkhec/SplunkHECConfigurationTest.java  |  6 +++---
 .../camel/component/splunkhec/SplunkHECEndpointTest.java       |  6 +++---
 .../splunkhec/integration/SplunkHECIntegrationTest.java        | 10 ++++++----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/components/camel-splunk-hec/pom.xml b/components/camel-splunk-hec/pom.xml
index bc97bcb..a07f71f 100644
--- a/components/camel-splunk-hec/pom.xml
+++ b/components/camel-splunk-hec/pom.xml
@@ -55,7 +55,7 @@
         <!-- testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</artifactId>
+            <artifactId>camel-test-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -65,7 +65,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECConfigurationTest.java b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECConfigurationTest.java
index 8a9bf74..de877d7 100644
--- a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECConfigurationTest.java
+++ b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECConfigurationTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.component.splunkhec;
 
-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.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class SplunkHECConfigurationTest {
 
diff --git a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECEndpointTest.java b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECEndpointTest.java
index ef535df..975b0f4 100644
--- a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECEndpointTest.java
+++ b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/SplunkHECEndpointTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.component.splunkhec;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class SplunkHECEndpointTest {
     @Test
diff --git a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECIntegrationTest.java b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECIntegrationTest.java
index cc6642e..3feb430 100644
--- a/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECIntegrationTest.java
+++ b/components/camel-splunk-hec/src/test/java/org/apache/camel/component/splunkhec/integration/SplunkHECIntegrationTest.java
@@ -30,11 +30,13 @@ import org.apache.camel.component.splunkhec.SplunkHECProducer;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.support.DefaultMessage;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-@Ignore("run manually since it requires a running local splunk server")
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Disabled("run manually since it requires a running local splunk server")
 public class SplunkHECIntegrationTest extends CamelTestSupport {
 
     @Test