You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/04/26 12:11:11 UTC
[camel] branch main updated: (chores) camel-kafka: only run certain Kafka 3 tests when using a Kafka 3 container
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
The following commit(s) were added to refs/heads/main by this push:
new fb3f8a2d8cc (chores) camel-kafka: only run certain Kafka 3 tests when using a Kafka 3 container
fb3f8a2d8cc is described below
commit fb3f8a2d8ccaab8a5c2234319e7ee2a7635abe27
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 26 12:10:41 2023 +0200
(chores) camel-kafka: only run certain Kafka 3 tests when using a Kafka 3 container
---
.../camel/component/kafka/integration/KafkaConsumerAuthIT.java | 10 ++++++++++
.../kafka/integration/KafkaConsumerAuthInvalidIT.java | 10 ++++++++++
.../integration/KafkaConsumerAuthInvalidWithReconnectIT.java | 10 ++++++++++
.../infra/kafka/services/ContainerLocalAuthKafkaService.java | 4 +---
4 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthIT.java
index 0f92073ffa5..2f7be92de1a 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthIT.java
@@ -45,6 +45,8 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,6 +56,14 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+/**
+ * A KafkaContainer that supports JAAS+SASL based authentication
+ */
+@EnabledIfSystemProperties({
+ @EnabledIfSystemProperty(named = "kafka.instance.type", matches = "local-kafka3-container",
+ disabledReason = "Requires Kafka 3.x"),
+ @EnabledIfSystemProperty(named = "kafka.instance.type", matches = "kafka", disabledReason = "Requires Kafka 3.x")
+})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class KafkaConsumerAuthIT {
public static final String TOPIC = "test-auth-full";
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
index 6a2011994d5..7190d925b1f 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
@@ -47,6 +47,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,6 +56,14 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.fail;
+/**
+ * A KafkaContainer that supports JAAS+SASL based authentication
+ */
+@EnabledIfSystemProperties({
+ @EnabledIfSystemProperty(named = "kafka.instance.type", matches = "local-kafka3-container",
+ disabledReason = "Requires Kafka 3.x"),
+ @EnabledIfSystemProperty(named = "kafka.instance.type", matches = "kafka", disabledReason = "Requires Kafka 3.x")
+})
@DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Github CI")
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class KafkaConsumerAuthInvalidIT {
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
index 4bfd5c05e4d..41911b4eaa3 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
@@ -41,6 +41,8 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,6 +50,14 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.fail;
+/**
+ * A KafkaContainer that supports JAAS+SASL based authentication
+ */
+@EnabledIfSystemProperties({
+ @EnabledIfSystemProperty(named = "kafka.instance.type", matches = "local-kafka3-container",
+ disabledReason = "Requires Kafka 3.x"),
+ @EnabledIfSystemProperty(named = "kafka.instance.type", matches = "kafka", disabledReason = "Requires Kafka 3.x")
+})
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class KafkaConsumerAuthInvalidWithReconnectIT {
public static final String TOPIC = "test-auth-invalid-with-reconnect";
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
index 28d0e62cb9b..3eac691e46e 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalAuthKafkaService.java
@@ -25,9 +25,7 @@ import org.testcontainers.containers.KafkaContainer;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
-/**
- * A KafkaContainer that supports JAAS+SASL based authentication
- */
+
public class ContainerLocalAuthKafkaService implements KafkaService, ContainerService<KafkaContainer> {
private static final Logger LOG = LoggerFactory.getLogger(ContainerLocalAuthKafkaService.class);
private final KafkaContainer kafka;