This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dce306ffd53f85012bb641594cfad598529c1720
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Thu Aug 4 13:50:34 2022 +0200
(chores) camel-kafka: let junit manage the service lifecycle in health tests
---
.../health/KafkaConsumerBadPortHealthCheckIT.java | 13 ++++---------
.../KafkaConsumerBadPortSupervisingHealthCheckIT.java | 13 ++++---------
.../health/KafkaConsumerUnresolvableHealthCheckIT.java | 3 ++-
3 files changed, 10 insertions(+), 19 deletions(-)
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerBadPortHealthCheckIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerBadPortHealthCheckIT.java
index ca0e6ffe46c..db8ae66848f 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerBadPortHealthCheckIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerBadPortHealthCheckIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kafka.integration;
+package org.apache.camel.component.kafka.integration.health;
import java.util.Collection;
import java.util.Collections;
@@ -28,6 +28,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.KafkaComponent;
import org.apache.camel.component.kafka.MockConsumerInterceptor;
+import
org.apache.camel.component.kafka.integration.BaseEmbeddedKafkaTestSupport;
import org.apache.camel.component.kafka.serde.DefaultKafkaHeaderDeserializer;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.health.HealthCheck;
@@ -40,7 +41,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.header.internals.RecordHeader;
-import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
@@ -50,6 +50,7 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,6 +61,7 @@ import static
org.testcontainers.shaded.org.awaitility.Awaitility.await;
public class KafkaConsumerBadPortHealthCheckIT extends CamelTestSupport {
public static final String TOPIC = "test-health";
+ @RegisterExtension
public static KafkaService service = KafkaServiceFactory.createService();
protected static AdminClient kafkaAdminClient;
@@ -88,18 +90,11 @@ public class KafkaConsumerBadPortHealthCheckIT extends
CamelTestSupport {
@BeforeAll
public static void beforeClass() {
- service.initialize();
-
LOG.info("### Embedded Kafka cluster broker list: {}",
service.getBootstrapServers());
System.setProperty("bootstrapServers", service.getBootstrapServers());
System.setProperty("brokers", service.getBootstrapServers());
}
- @AfterAll
- public static void afterClass() {
- service.shutdown();
- }
-
@BeforeEach
public void setKafkaAdminClient() {
if (kafkaAdminClient == null) {
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerBadPortSupervisingHealthCheckIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerBadPortSupervisingHealthCheckIT.java
index 40c7b37afd5..c4e246851ae 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerBadPortSupervisingHealthCheckIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerBadPortSupervisingHealthCheckIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kafka.integration;
+package org.apache.camel.component.kafka.integration.health;
import java.util.Collection;
import java.util.Collections;
@@ -28,6 +28,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.KafkaComponent;
import org.apache.camel.component.kafka.MockConsumerInterceptor;
+import
org.apache.camel.component.kafka.integration.BaseEmbeddedKafkaTestSupport;
import org.apache.camel.component.kafka.serde.DefaultKafkaHeaderDeserializer;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.health.HealthCheck;
@@ -42,7 +43,6 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.header.internals.RecordHeader;
-import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
@@ -52,6 +52,7 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,6 +63,7 @@ import static
org.testcontainers.shaded.org.awaitility.Awaitility.await;
public class KafkaConsumerBadPortSupervisingHealthCheckIT extends
CamelTestSupport {
public static final String TOPIC = "test-health";
+ @RegisterExtension
public static KafkaService service = KafkaServiceFactory.createService();
protected static AdminClient kafkaAdminClient;
@@ -90,18 +92,11 @@ public class KafkaConsumerBadPortSupervisingHealthCheckIT
extends CamelTestSuppo
@BeforeAll
public static void beforeClass() {
- service.initialize();
-
LOG.info("### Embedded Kafka cluster broker list: {}",
service.getBootstrapServers());
System.setProperty("bootstrapServers", service.getBootstrapServers());
System.setProperty("brokers", service.getBootstrapServers());
}
- @AfterAll
- public static void afterClass() {
- service.shutdown();
- }
-
@BeforeEach
public void setKafkaAdminClient() {
if (kafkaAdminClient == null) {
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerUnresolvableHealthCheckIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerUnresolvableHealthCheckIT.java
index 1eea3220c46..cd1c94ea43e 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerUnresolvableHealthCheckIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/health/KafkaConsumerUnresolvableHealthCheckIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kafka.integration;
+package org.apache.camel.component.kafka.integration.health;
import java.util.Collection;
import java.util.Collections;
@@ -28,6 +28,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.KafkaComponent;
import org.apache.camel.component.kafka.MockConsumerInterceptor;
+import
org.apache.camel.component.kafka.integration.BaseEmbeddedKafkaTestSupport;
import org.apache.camel.component.kafka.serde.DefaultKafkaHeaderDeserializer;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.health.HealthCheck;
