commit aefaf14c187512c6f93b0cb72d1ba05198288127
author Tom Cunningham <tcunning@redhat.com> Wed Aug 31 00:29:28 2022 -0400
committer GitHub <noreply@github.com> Wed Aug 31 06:29:28 2022 +0200
tree 0d19e0eb5efa512de1ab05f527896d53216c777d
parent 05bbb13c0689513933cd8bdc40e60556d2613519

Adjust test lifecycle to recent refactoring in camel-test-infra-activemq (#618)

components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoComponentTest.java

diff --git a/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoComponentTest.java b/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoComponentTest.java
index 86131bc..a22a739 100644
--- a/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoComponentTest.java
+++ b/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoComponentTest.java
@@ -33,6 +33,7 @@
 import org.apache.camel.component.paho.PahoPersistence;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -65,7 +66,7 @@
     static int mqttPort = AvailablePortFinder.getNextAvailable();
 
     @RegisterExtension
-    public static ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
+    public ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
             .bare()
             .withPersistent(false)
             .withMqttTransport(mqttPort)
@@ -193,6 +194,12 @@
         mock.assertIsSatisfied();
     }
 
+
+    @AfterAll
+    public void cleanUp() {
+        service.shutdown();
+    }
+
     
     // *************************************
     // Config

components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoOverrideTopicTest.java

diff --git a/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoOverrideTopicTest.java b/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoOverrideTopicTest.java
index 319f82d..187d438 100644
--- a/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoOverrideTopicTest.java
+++ b/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoOverrideTopicTest.java
@@ -27,6 +27,7 @@
 import org.apache.camel.component.paho.PahoConstants;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -55,7 +56,7 @@
     static int mqttPort = AvailablePortFinder.getNextAvailable();
 
     @RegisterExtension
-    public static ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
+    public ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
             .bare()
             .withPersistent(false)
             .withMqttTransport(mqttPort)
@@ -83,6 +84,11 @@
         // Then
         mock.assertIsSatisfied();
     }
+
+    @AfterAll
+    public void cleanUp() {
+        service.shutdown();
+    }
     
     // *************************************
     // Config

components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDSendDynamicTest.java

diff --git a/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDSendDynamicTest.java b/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDSendDynamicTest.java
index d7f20db..2c262cd 100644
--- a/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDSendDynamicTest.java
+++ b/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDSendDynamicTest.java
@@ -27,6 +27,7 @@
 import org.apache.camel.component.paho.PahoComponent;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -57,7 +58,7 @@
     static int mqttPort = AvailablePortFinder.getNextAvailable();
 
     @RegisterExtension
-    public static ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
+    public ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
             .bare()
             .withPersistent(false)
             .withMqttTransport(mqttPort)
@@ -93,6 +94,11 @@
         assertEquals("Hello beer", out);
     }
     
+    @AfterAll
+    public void cleanUp() {
+        service.shutdown();
+    }
+
     // *************************************
     // Config
     // *************************************

components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDTest.java

diff --git a/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDTest.java b/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDTest.java
index 38cb5c5..9cb39bd 100644
--- a/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDTest.java
+++ b/components-starter/camel-paho-starter/src/test/java/org/apache/camel/component/paho/springboot/PahoToDTest.java
@@ -26,6 +26,7 @@
 import org.apache.camel.component.paho.PahoComponent;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -54,7 +55,7 @@
     static int mqttPort = AvailablePortFinder.getNextAvailable();
 
     @RegisterExtension
-    public static ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
+    public ActiveMQEmbeddedService service = ActiveMQEmbeddedServiceBuilder
             .bare()
             .withPersistent(false)
             .withMqttTransport(mqttPort)
@@ -85,6 +86,11 @@
         mockBar.assertIsSatisfied();
         mockBeer.assertIsSatisfied();
     }
+
+    @AfterAll
+    public void cleanUp() {
+        service.shutdown();
+    }
     
     // *************************************
     // Config