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 2022/08/04 11:48:01 UTC
[camel] branch main updated (7b1d907f892 -> 7b6319ae749)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 7b1d907f892 camel-yaml-dsl - Add routeTemplate/route-template as node names for route templates so its similar to the other DSLs.
new b131fb5d054 (chores) camel-kafka: ensure tests run a little bit faster
new c55e4e01f28 (chores) camel-kafka: fix invalid test annotation
new 7b6319ae749 CAMEL-18347: fix Kafka services in test infra not being singleton
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../KafkaConsumerAsyncManualCommitIT.java | 2 +-
.../KafkaConsumerBadPortHealthCheckIT.java | 2 +-
...fkaConsumerBadPortSupervisingHealthCheckIT.java | 2 +-
.../kafka/integration/KafkaConsumerFullIT.java | 2 +-
.../integration/KafkaConsumerHealthCheckIT.java | 2 +-
.../integration/KafkaConsumerIdempotentIT.java | 2 +-
...kaConsumerIdempotentWithCustomSerializerIT.java | 2 +-
.../KafkaConsumerIdempotentWithProcessorIT.java | 2 +-
.../integration/KafkaConsumerTopicIsPatternIT.java | 2 +-
.../KafkaConsumerUnresolvableHealthCheckIT.java | 2 +-
.../commit/KafkaConsumerNoopCommitIT.java | 8 ++---
.../commit/KafkaConsumerSyncCommitIT.java | 2 +-
.../KafkaPausableConsumerCircuitBreakerIT.java | 2 +-
.../integration/pause/KafkaPausableConsumerIT.java | 2 +-
.../infra/kafka/services/KafkaServiceFactory.java | 34 +++++++++++++++-------
.../test/infra/kafka/services/StrimziService.java | 8 +++--
16 files changed, 46 insertions(+), 30 deletions(-)
[camel] 01/03: (chores) camel-kafka: ensure tests run a little bit faster
Posted by or...@apache.org.
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 b131fb5d054516931a8f1e86e21bb6f3dbeee847
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Aug 4 09:12:38 2022 +0200
(chores) camel-kafka: ensure tests run a little bit faster
This ensures that the polls happen multiple times within the test execution window and also that the session timeout does not exceed it.
---
.../component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java | 2 +-
.../kafka/integration/KafkaConsumerBadPortHealthCheckIT.java | 2 +-
.../integration/KafkaConsumerBadPortSupervisingHealthCheckIT.java | 2 +-
.../apache/camel/component/kafka/integration/KafkaConsumerFullIT.java | 2 +-
.../camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java | 2 +-
.../camel/component/kafka/integration/KafkaConsumerIdempotentIT.java | 2 +-
.../integration/KafkaConsumerIdempotentWithCustomSerializerIT.java | 2 +-
.../kafka/integration/KafkaConsumerIdempotentWithProcessorIT.java | 2 +-
.../component/kafka/integration/KafkaConsumerTopicIsPatternIT.java | 2 +-
.../kafka/integration/KafkaConsumerUnresolvableHealthCheckIT.java | 2 +-
.../component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java | 4 ++--
.../component/kafka/integration/commit/KafkaConsumerSyncCommitIT.java | 2 +-
.../integration/pause/KafkaPausableConsumerCircuitBreakerIT.java | 2 +-
.../component/kafka/integration/pause/KafkaPausableConsumerIT.java | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
index 7167273ad66..6b94fb6454a 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
@@ -55,7 +55,7 @@ public class KafkaConsumerAsyncManualCommitIT extends BaseEmbeddedKafkaTestSuppo
private static final Logger LOG = LoggerFactory.getLogger(KafkaConsumerAsyncManualCommitIT.class);
@EndpointInject("kafka:" + TOPIC
- + "?groupId=KafkaConsumerAsyncManualCommitIT&sessionTimeoutMs=30000&autoCommitEnable=false"
+ + "?groupId=KafkaConsumerAsyncManualCommitIT&pollTimeoutMs=1000&autoCommitEnable=false"
+ "&allowManualCommit=true&autoOffsetReset=earliest&kafkaManualCommitFactory=#testFactory")
private Endpoint from;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBadPortHealthCheckIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBadPortHealthCheckIT.java
index ccd43c965a4..ca0e6ffe46c 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBadPortHealthCheckIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBadPortHealthCheckIT.java
@@ -72,7 +72,7 @@ public class KafkaConsumerBadPortHealthCheckIT extends CamelTestSupport {
@EndpointInject("kafka:" + TOPIC
+ "?groupId=KafkaConsumerBadPortHealthCheckIT&autoOffsetReset=earliest&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer&"
+ "valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
@EndpointInject("mock:result")
private MockEndpoint to;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBadPortSupervisingHealthCheckIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBadPortSupervisingHealthCheckIT.java
index e1754999802..40c7b37afd5 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBadPortSupervisingHealthCheckIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerBadPortSupervisingHealthCheckIT.java
@@ -74,7 +74,7 @@ public class KafkaConsumerBadPortSupervisingHealthCheckIT extends CamelTestSuppo
@EndpointInject("kafka:" + TOPIC
+ "?groupId=KafkaConsumerBadPortSupervisingHealthCheckIT&autoOffsetReset=earliest&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer&"
+ "valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
+ + "&autoCommitIntervalMs=1000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
@EndpointInject("mock:result")
private MockEndpoint to;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
index 47fb9a17d77..14a194416d3 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
@@ -59,7 +59,7 @@ public class KafkaConsumerFullIT extends BaseEmbeddedKafkaTestSupport {
@EndpointInject("kafka:" + TOPIC
+ "?groupId=KafkaConsumerFullIT&autoOffsetReset=earliest&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer&"
+ "valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
@EndpointInject("mock:result")
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
index a3c061571ec..81fd4f9d759 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerHealthCheckIT.java
@@ -79,7 +79,7 @@ public class KafkaConsumerHealthCheckIT extends CamelTestSupport {
@EndpointInject("kafka:" + TOPIC
+ "?groupId=KafkaConsumerHealthCheckIT&autoOffsetReset=earliest&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer&"
+ "valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
@EndpointInject("mock:result")
private MockEndpoint to;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentIT.java
index b18448c5be8..b27194a1511 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentIT.java
@@ -45,7 +45,7 @@ public class KafkaConsumerIdempotentIT extends KafkaConsumerIdempotentTestSuppor
+ "?groupId=KafkaConsumerIdempotentIT&autoOffsetReset=earliest"
+ "&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
+ "&valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true"
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true"
+ "&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentWithCustomSerializerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentWithCustomSerializerIT.java
index 0f0faca268a..a1c864f7daa 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentWithCustomSerializerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentWithCustomSerializerIT.java
@@ -41,7 +41,7 @@ public class KafkaConsumerIdempotentWithCustomSerializerIT extends KafkaConsumer
+ "&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
+ "&valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
+ "&headerDeserializer=#class:org.apache.camel.component.kafka.integration.CustomHeaderDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true"
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true"
+ "&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentWithProcessorIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentWithProcessorIT.java
index 28764701875..55f0859fae5 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentWithProcessorIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerIdempotentWithProcessorIT.java
@@ -40,7 +40,7 @@ public class KafkaConsumerIdempotentWithProcessorIT extends KafkaConsumerIdempot
+ "?groupId=KafkaConsumerIdempotentWithProcessorIT&autoOffsetReset=earliest"
+ "&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
+ "&valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true"
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true"
+ "&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java
index c48c58e341b..bbae0f74910 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerTopicIsPatternIT.java
@@ -40,7 +40,7 @@ public class KafkaConsumerTopicIsPatternIT extends BaseEmbeddedKafkaTestSupport
@EndpointInject("kafka:" + TOPIC_PATTERN
+ "?topicIsPattern=true&groupId=KafkaConsumerTopicIsPatternIT&autoOffsetReset=earliest"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor&metadataMaxAgeMs=1000")
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor&metadataMaxAgeMs=1000")
private Endpoint from;
@EndpointInject("mock:result")
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerUnresolvableHealthCheckIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerUnresolvableHealthCheckIT.java
index e4fb1893133..1eea3220c46 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerUnresolvableHealthCheckIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerUnresolvableHealthCheckIT.java
@@ -72,7 +72,7 @@ public class KafkaConsumerUnresolvableHealthCheckIT extends CamelTestSupport {
@EndpointInject("kafka:" + TOPIC
+ "?groupId=KafkaConsumerUnresolvableHealthCheckIT&autoOffsetReset=earliest&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer&"
+ "valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
@EndpointInject("mock:result")
private MockEndpoint to;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java
index 199ff0fc88e..032214963a3 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java
@@ -24,7 +24,7 @@ import org.apache.camel.component.kafka.consumer.KafkaManualCommit;
import org.apache.camel.component.kafka.integration.BaseManualCommitTestSupport;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -35,7 +35,7 @@ public class KafkaConsumerNoopCommitIT extends BaseManualCommitTestSupport {
public static final String TOPIC = "testManualNoopCommitTest";
@EndpointInject("kafka:" + TOPIC
- + "?groupId=KafkaConsumerNoopCommitIT&sessionTimeoutMs=30000&autoCommitEnable=false"
+ + "?groupId=KafkaConsumerNoopCommitIT&pollTimeoutMs=1000&autoCommitEnable=false"
+ "&allowManualCommit=true&autoOffsetReset=earliest&metadataMaxAgeMs=1000")
private Endpoint from;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerSyncCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerSyncCommitIT.java
index 3032bf6ea5e..e9967641009 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerSyncCommitIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerSyncCommitIT.java
@@ -34,7 +34,7 @@ public class KafkaConsumerSyncCommitIT extends BaseManualCommitTestSupport {
public static final String TOPIC = "testManualCommitSyncTest";
@EndpointInject("kafka:" + TOPIC
- + "?groupId=KafkaConsumerSyncCommitIT&sessionTimeoutMs=30000&autoCommitEnable=false"
+ + "?groupId=KafkaConsumerSyncCommitIT&pollTimeoutMs=1000&autoCommitEnable=false"
+ "&allowManualCommit=true&autoOffsetReset=earliest&kafkaManualCommitFactory=#class:org.apache.camel.component.kafka.consumer.DefaultKafkaManualCommitFactory")
private Endpoint from;
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerCircuitBreakerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerCircuitBreakerIT.java
index 7fd3ab4817c..b0b4b51ddd6 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerCircuitBreakerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerCircuitBreakerIT.java
@@ -63,7 +63,7 @@ public class KafkaPausableConsumerCircuitBreakerIT extends BaseEmbeddedKafkaTest
@EndpointInject("kafka:" + SOURCE_TOPIC
+ "?groupId=KafkaPausableConsumerCircuitBreakerIT&autoOffsetReset=earliest&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
+ "&valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
@EndpointInject("direct:intermediate")
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerIT.java
index 24b0005c248..3932798b83d 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/pause/KafkaPausableConsumerIT.java
@@ -81,7 +81,7 @@ public class KafkaPausableConsumerIT extends BaseEmbeddedKafkaTestSupport {
@EndpointInject("kafka:" + SOURCE_TOPIC
+ "?groupId=KafkaPausableConsumerIT&autoOffsetReset=earliest&keyDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
+ "&valueDeserializer=org.apache.kafka.common.serialization.StringDeserializer"
- + "&autoCommitIntervalMs=1000&sessionTimeoutMs=30000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
+ + "&autoCommitIntervalMs=1000&pollTimeoutMs=1000&autoCommitEnable=true&interceptorClasses=org.apache.camel.component.kafka.MockConsumerInterceptor")
private Endpoint from;
@EndpointInject("direct:intermediate")
[camel] 02/03: (chores) camel-kafka: fix invalid test annotation
Posted by or...@apache.org.
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 c55e4e01f28669cb28cbb2027157cb3672771823
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Aug 4 09:13:02 2022 +0200
(chores) camel-kafka: fix invalid test annotation
---
.../component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java
index 032214963a3..fa5de350ff0 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerNoopCommitIT.java
@@ -60,7 +60,7 @@ public class KafkaConsumerNoopCommitIT extends BaseManualCommitTestSupport {
};
}
- @RepeatedTest(1)
+ @Test
public void kafkaAutoCommitDisabledDuringRebalance() throws Exception {
to.expectedMessageCount(1);
String firstMessage = "message-0";
@@ -100,7 +100,7 @@ public class KafkaConsumerNoopCommitIT extends BaseManualCommitTestSupport {
to.assertIsSatisfied(3000);
}
- @RepeatedTest(1)
+ @Test
public void kafkaManualCommit() throws Exception {
kafkaManualCommitTest(TOPIC);
}
[camel] 03/03: CAMEL-18347: fix Kafka services in test infra not being singleton
Posted by or...@apache.org.
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 7b6319ae749f0a3c2f5e38c358e2c9a3c11acfc3
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Aug 4 11:22:56 2022 +0200
CAMEL-18347: fix Kafka services in test infra not being singleton
---
.../infra/kafka/services/KafkaServiceFactory.java | 34 +++++++++++++++-------
.../test/infra/kafka/services/StrimziService.java | 8 +++--
2 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
index ae150286a39..ceb5c6d42f9 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
@@ -43,6 +43,9 @@ public final class KafkaServiceFactory {
}
}
+ private static SimpleTestServiceBuilder<KafkaService> instance;
+ private static KafkaService kafkaService;
+
private KafkaServiceFactory() {
}
@@ -52,22 +55,33 @@ public final class KafkaServiceFactory {
}
public static KafkaService createService() {
- return builder()
- .addLocalMapping(ContainerLocalKafkaService::new)
+ SimpleTestServiceBuilder<KafkaService> builder = new SimpleTestServiceBuilder<>("kafka");
+
+ return builder.addLocalMapping(ContainerLocalKafkaService::new)
.addMapping("local-strimzi-container", StrimziService::new)
.addRemoteMapping(RemoteKafkaService::new)
.addMapping("local-kafka3-container", ContainerLocalKafkaService::kafka3Container)
.build();
}
- public static KafkaService createSingletonService() {
- return builder()
- .addLocalMapping(() -> new SingletonKafkaService(new ContainerLocalKafkaService(), "kafka"))
- .addRemoteMapping(RemoteKafkaService::new)
- .addMapping("local-kafka3-container",
- () -> new SingletonKafkaService(ContainerLocalKafkaService.kafka3Container(), "kafka3"))
- .addMapping("local-strimzi-container", () -> new SingletonKafkaService(new StrimziService(), "strimzi"))
- .build();
+ public static synchronized KafkaService createSingletonService() {
+ if (kafkaService == null) {
+ if (instance == null) {
+ instance = builder();
+
+ instance.addLocalMapping(() -> new SingletonKafkaService(new ContainerLocalKafkaService(), "kafka"))
+ .addRemoteMapping(RemoteKafkaService::new)
+ .addMapping("local-kafka3-container",
+ () -> new SingletonKafkaService(ContainerLocalKafkaService.kafka3Container(), "kafka3"))
+ .addMapping("local-strimzi-container",
+ () -> new SingletonKafkaService(new StrimziService(), "strimzi"));
+
+ }
+
+ kafkaService = instance.build();
+ }
+
+ return kafkaService;
}
}
diff --git a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziService.java b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziService.java
index 2ce288e01a1..dae2076e82d 100644
--- a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziService.java
+++ b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/StrimziService.java
@@ -31,12 +31,14 @@ public class StrimziService implements KafkaService, ContainerService<StrimziCon
private final StrimziContainer strimziContainer;
public StrimziService() {
+ this("zookeeper-" + TestUtils.randomWithRange(1, 100),
+ "strimzi-" + TestUtils.randomWithRange(1, 100));
+ }
+
+ public StrimziService(String zookeeperInstanceName, String strimziInstanceName) {
Network network = Network.newNetwork();
- String zookeeperInstanceName = "zookeeper-" + TestUtils.randomWithRange(1, 100);
zookeeperContainer = initZookeeperContainer(network, zookeeperInstanceName);
-
- String strimziInstanceName = "strimzi-" + TestUtils.randomWithRange(1, 100);
strimziContainer = initStrimziContainer(network, strimziInstanceName, zookeeperInstanceName);
}