[camel-quarkus] 03/03: Re-enable Kafka ssl sasl tests (#3252)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8d343bd4e2155e90a903cd940a597dee412b9cda
Author: Amos Feng
AuthorDate: Tue Nov 2 17:30:33 2021 +0800
Re-enable Kafka ssl sasl tests (#3252)
* Revert "Temporarily disable kafka-sasl & kafka-ssl tests due to #3239"
This reverts commit 25a3d41b578c610224a0126f52e2176fd05fdf53.
* Fix #3239 to override KAFKA_ADVERTISED_LISTENERS env
* sync avro.version
---
.../org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 2 --
.../camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java| 9 +
.../apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java | 2 --
.../java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java | 2 --
.../camel/quarkus/kafka/sasl/KafkaSaslTestResource.java | 11 ++-
.../java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java | 2 --
.../apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java | 9 +
pom.xml | 2 +-
8 files changed, 29 insertions(+), 10 deletions(-)
diff --git
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
index 71d482b..947a7ee 100644
---
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
+++
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
@@ -22,12 +22,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239";)
@QuarkusTest
@QuarkusTestResource(KafkaSaslSslTestResource.class)
public class KafkaSaslSslTest {
diff --git
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
index a6f55b9..ac807d3 100644
---
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
+++
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
@@ -129,6 +129,15 @@ public class KafkaSaslSslTestResource extends
KafkaTestResource {
}
@Override
+protected void configure() {
+super.configure();
+
+String host = getNetwork() != null ? getNetworkAliases().get(0) :
"localhost";
+withEnv("KAFKA_ADVERTISED_LISTENERS",
+String.format("SASL_SSL://%s:9093,BROKER://%s:9092", host,
host));
+}
+
+@Override
protected void containerIsStarting(InspectContainerResponse
containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
copyFileToContainer(
diff --git
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
index 968749a..c4a246b 100644
---
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
+++
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
@@ -22,12 +22,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239";)
@QuarkusTest
@QuarkusTestResource(KafkaSaslTestResource.class)
public class KafkaSaslBindingTest {
diff --git
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
index 297a3f4..6b25cb4 100644
---
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
+++
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
@@ -16,10 +16,8 @@
*/
package org.apache.camel.quarkus.kafka.sasl;
-import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.NativeImageTest;
[camel-quarkus] 03/03: Re-enable Kafka ssl sasl tests (#3252)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-2.5.0.CR1
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 386f21163a8cd55f73cf6194db55465c2f734846
Author: Amos Feng
AuthorDate: Tue Nov 2 17:30:33 2021 +0800
Re-enable Kafka ssl sasl tests (#3252)
* Revert "Temporarily disable kafka-sasl & kafka-ssl tests due to #3239"
This reverts commit 25a3d41b578c610224a0126f52e2176fd05fdf53.
* Fix #3239 to override KAFKA_ADVERTISED_LISTENERS env
* sync avro.version
---
.../org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 2 --
.../camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java| 9 +
.../apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java | 2 --
.../java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java | 2 --
.../camel/quarkus/kafka/sasl/KafkaSaslTestResource.java | 11 ++-
.../java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java | 2 --
.../apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java | 9 +
pom.xml | 2 +-
8 files changed, 29 insertions(+), 10 deletions(-)
diff --git
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
index 71d482b..947a7ee 100644
---
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
+++
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java
@@ -22,12 +22,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239";)
@QuarkusTest
@QuarkusTestResource(KafkaSaslSslTestResource.class)
public class KafkaSaslSslTest {
diff --git
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
index a6f55b9..ac807d3 100644
---
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
+++
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
@@ -129,6 +129,15 @@ public class KafkaSaslSslTestResource extends
KafkaTestResource {
}
@Override
+protected void configure() {
+super.configure();
+
+String host = getNetwork() != null ? getNetworkAliases().get(0) :
"localhost";
+withEnv("KAFKA_ADVERTISED_LISTENERS",
+String.format("SASL_SSL://%s:9093,BROKER://%s:9092", host,
host));
+}
+
+@Override
protected void containerIsStarting(InspectContainerResponse
containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
copyFileToContainer(
diff --git
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
index 968749a..c4a246b 100644
---
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
+++
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslBindingTest.java
@@ -22,12 +22,10 @@ import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-@Disabled("https://github.com/apache/camel-quarkus/issues/3239";)
@QuarkusTest
@QuarkusTestResource(KafkaSaslTestResource.class)
public class KafkaSaslBindingTest {
diff --git
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
index 297a3f4..6b25cb4 100644
---
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
+++
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslIT.java
@@ -16,10 +16,8 @@
*/
package org.apache.camel.quarkus.kafka.sasl;
-import io.quarkus.test.junit.DisabledOnNativeImage;
import io.quarkus.test.junit.Nativ
