[camel] 16/19: [CAMEL-11807] Upgrade camel-nagios 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 cac44321d48e732e4cdf494b8e22066847139a6e
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Jul 9 15:18:35 2020 +0200

    [CAMEL-11807] Upgrade camel-nagios to junit5
---
 components/camel-nagios/pom.xml                             |  8 ++++----
 .../camel/component/nagios/NagiosEventNotifierTest.java     | 13 ++++++++-----
 .../java/org/apache/camel/component/nagios/NagiosTest.java  | 12 ++++++------
 .../camel/component/nagios/NagiosXorEncryptionTest.java     |  8 ++++----
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/components/camel-nagios/pom.xml b/components/camel-nagios/pom.xml
index 4fc103b8..8a58155 100644
--- a/components/camel-nagios/pom.xml
+++ b/components/camel-nagios/pom.xml
@@ -50,18 +50,18 @@
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</artifactId>
+            <artifactId>camel-test-junit5</artifactId>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <artifactId>mockito-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
index 15c0745..26de92e 100644
--- 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
+++ 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
@@ -21,13 +21,16 @@ import com.googlecode.jsendnsca.NagiosPassiveCheckSender;
 import com.googlecode.jsendnsca.PassiveCheckSender;
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
 
 public class NagiosEventNotifierTest extends CamelTestSupport {
     protected boolean canRun;
@@ -41,7 +44,7 @@ public class NagiosEventNotifierTest extends CamelTestSupport 
{
         return true;
     }
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() throws Exception {
         canRun = true;
diff --git 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
index c7302bd..a357a95 100644
--- 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
+++ 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosTest.java
@@ -26,10 +26,10 @@ import com.googlecode.jsendnsca.PassiveCheckSender;
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
@@ -42,12 +42,12 @@ public class NagiosTest extends CamelTestSupport {
 
     protected boolean canRun;
 
-    @BeforeClass
+    @BeforeAll
     public static void setSender() {
         nagiosPassiveCheckSender =  
Mockito.mock(NagiosPassiveCheckSender.class);
     }
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() throws Exception {
         canRun = true;
diff --git 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
index 114549d..cdd151c 100644
--- 
a/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
+++ 
b/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosXorEncryptionTest.java
@@ -23,9 +23,9 @@ import com.googlecode.jsendnsca.PassiveCheckSender;
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Before;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
@@ -38,7 +38,7 @@ public class NagiosXorEncryptionTest extends CamelTestSupport 
{
     @Mock @BindToRegistry("mySender")
     private PassiveCheckSender nagiosPassiveCheckSender = 
Mockito.mock(NagiosPassiveCheckSender.class);
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() throws Exception {
         canRun = true;