[camel] 05/11: [CAMEL-11807] Upgrade camel-paho 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 fd88a83f8ffbc05a8835dd11defe4f0bdfee962a
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jul 17 15:46:08 2020 +0200

    [CAMEL-11807] Upgrade camel-paho to junit5
---
 components/camel-paho/pom.xml                                 |  2 +-
 .../org/apache/camel/component/paho/PahoComponentTest.java    | 11 +++++++----
 .../component/paho/PahoComponentVerifierExtensionTest.java    | 11 ++++++-----
 .../apache/camel/component/paho/PahoOverrideTopicTest.java    |  8 ++++----
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/components/camel-paho/pom.xml b/components/camel-paho/pom.xml
index 9066e9e..b3af5f6 100644
--- a/components/camel-paho/pom.xml
+++ b/components/camel-paho/pom.xml
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test</artifactId>
+            <artifactId>camel-test-junit5</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git 
a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
 
b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
index 9a48988..f6e0790 100644
--- 
a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
+++ 
b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
@@ -24,10 +24,13 @@ import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class PahoComponentTest extends CamelTestSupport {
 
@@ -56,7 +59,7 @@ public class PahoComponentTest extends CamelTestSupport {
     }
 
     @Override
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         super.tearDown();
         broker.stop();
diff --git 
a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java
 
b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java
index 41e265e..2eeaf29 100644
--- 
a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java
+++ 
b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java
@@ -21,9 +21,10 @@ import java.util.Map;
 
 import org.apache.camel.Component;
 import org.apache.camel.component.extension.ComponentVerifierExtension;
-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.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class PahoComponentVerifierExtensionTest extends CamelTestSupport {
 
@@ -46,7 +47,7 @@ public class PahoComponentVerifierExtensionTest extends 
CamelTestSupport {
 
         ComponentVerifierExtension.Result result = 
verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
 
-        Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, 
result.getStatus());
+        assertEquals(ComponentVerifierExtension.Result.Status.OK, 
result.getStatus());
     }
 
     @Test
@@ -59,7 +60,7 @@ public class PahoComponentVerifierExtensionTest extends 
CamelTestSupport {
 
         ComponentVerifierExtension.Result result = 
verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
 
-        Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, 
result.getStatus());
+        assertEquals(ComponentVerifierExtension.Result.Status.ERROR, 
result.getStatus());
     }
 
 }
diff --git 
a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoOverrideTopicTest.java
 
b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoOverrideTopicTest.java
index 609a566..2a26aad 100644
--- 
a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoOverrideTopicTest.java
+++ 
b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoOverrideTopicTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.paho;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.After;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class PahoOverrideTopicTest extends CamelTestSupport {
 
@@ -44,7 +44,7 @@ public class PahoOverrideTopicTest extends CamelTestSupport {
     }
 
     @Override
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         super.tearDown();
         broker.stop();