Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix flaky kafka selective xml test #1239

Merged
merged 1 commit into from
Oct 21, 2024
Merged

fix flaky kafka selective xml test #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions ...citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointJavaIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package org.citrusframework.kafka.integration;

import java.time.Duration;

import org.assertj.core.api.ThrowableAssert;
import org.citrusframework.annotations.CitrusTest;
import org.citrusframework.exceptions.CitrusRuntimeException;
Expand All @@ -29,6 +27,8 @@
import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
import org.testng.annotations.Test;

import java.time.Duration;

import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;
import static org.citrusframework.actions.SendMessageAction.Builder.send;
Expand All @@ -39,7 +39,7 @@
import static org.citrusframework.kafka.endpoint.selector.KafkaMessageByHeaderSelector.kafkaHeaderContains;
import static org.citrusframework.kafka.endpoint.selector.KafkaMessageByHeaderSelector.kafkaHeaderEquals;

@Test
@Test(singleThreaded = true)
public class KafkaEndpointJavaIT extends TestNGCitrusSpringSupport {

@BindToRegistry
Expand All @@ -48,7 +48,6 @@ public class KafkaEndpointJavaIT extends TestNGCitrusSpringSupport {
.topic("hello")
.build();

@Test
@CitrusTest
public void findKafkaEvent_headerEquals_citrus_DSL() {
var body = "findKafkaEvent_headerEquals_citrus_DSL";
Expand All @@ -74,7 +73,6 @@ public void findKafkaEvent_headerEquals_citrus_DSL() {
);
}

@Test
@CitrusTest
public void findKafkaEvent_headerContains_citrus_DSL() {
var body = "findKafkaEvent_headerContains_citrus_DSL";
Expand All @@ -100,7 +98,6 @@ public void findKafkaEvent_headerContains_citrus_DSL() {
);
}

@Test
@CitrusTest
public void findKafkaEvent_headerStartsWith_citrus_DSL() {
var body = "findKafkaEvent_headerStartsWith_citrus_DSL";
Expand Down Expand Up @@ -132,7 +129,6 @@ public void findKafkaEvent_headerStartsWith_citrus_DSL() {
);
}

@Test
@CitrusTest
public void findKafkaEvent_headerEndsWith_citrus_DSL() {
var body = "findKafkaEvent_headerEndsWith_citrus_DSL";
Expand Down Expand Up @@ -164,7 +160,6 @@ public void findKafkaEvent_headerEndsWith_citrus_DSL() {
);
}

@Test
@CitrusTest
public void findKafkaEvent_nothingFound_noMatch_citrus_DSL() {
var body = "findKafkaEvent_nothingFound_noMatch_citrus_DSL";
Expand Down Expand Up @@ -195,7 +190,6 @@ public void findKafkaEvent_nothingFound_noMatch_citrus_DSL() {
.hasMessageContaining("Failed to resolve Kafka message using selector");
}

@Test
@CitrusTest
public void findKafkaEvent_nothingFound_outsideLookbackWindow_citrus_DSL() {
var body = "findKafkaEvent_nothingFound_outsideLookbackWindow_citrus_DSL";
Expand Down Expand Up @@ -228,7 +222,6 @@ public void findKafkaEvent_nothingFound_outsideLookbackWindow_citrus_DSL() {
.hasMessageContaining("Failed to resolve Kafka message using selector");
}

@Test
@CitrusTest
public void findKafkaEvent_duplicateEntriesFound_citrus_DSL() {
var body = "findKafkaEvent_duplicateEntriesFound_citrus_DSL";
Expand Down Expand Up @@ -263,7 +256,6 @@ public void findKafkaEvent_duplicateEntriesFound_citrus_DSL() {
.hasMessageContaining("More than one matching record found in topic");
}

@Test
@CitrusTest
public void findKafkaEvent_headerEquals_java_DSL() {
var body = "findKafkaEvent_headerEquals_java_DSL";
Expand Down
2 changes: 1 addition & 1 deletion .../citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointXmlIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
import org.testng.annotations.Test;

@Test
@Test(singleThreaded = true)
public class KafkaEndpointXmlIT extends TestNGCitrusSpringSupport {

@CitrusTestSource(type = TestLoader.SPRING, name = "KafkaEndpointIT_singleMessage")
Expand Down
63 changes: 36 additions & 27 deletions ...test/resources/org/citrusframework/kafka/integration/KafkaEndpointIT_selectiveMessage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,33 +55,42 @@
</header>
</send>

<receive endpoint="helloKafkaEndpoint">
<description>Receive Kafka request: Kafka broker -> Citrus</description>
<selector>
<element name="header-filter-key" value="traceparent"/>
<element name="header-filter-value" value="${traceId}"/>
<element name="header-filter-comparator" value="CONTAINS"/>
<element name="event-lookback-window" value="PT1S"/>
</selector>
<message>
<data>
<![CDATA[
<HelloRequest xmlns="http://citrusframework.org/schemas/samples/HelloService.xsd">
<MessageId>${messageId}</MessageId>
<CorrelationId>${correlationId}</CorrelationId>
<User>${user}</User>
<Text>Hello Citrus</Text>
</HelloRequest>
]]>
</data>
</message>
<header>
<element name="Operation" value="sayHello"/>
<element name="citrus_kafka_topic" value="hello"/>
<element name="citrus_kafka_partition" value="0"/>
<element name="citrus_kafka_offset" value="@assertThat(greaterThanOrEqualTo(0))@"/>
</header>
</receive>
<create-variables>
<variable name="extractedTraceparent"></variable>
</create-variables>

<repeat-onerror-until-true condition="@assertThat('${extractedTraceparent}', 'equalTo(01-${traceId}-${spanId}-00)')@">
<receive endpoint="helloKafkaEndpoint">
<description>Receive Kafka request: Kafka broker -> Citrus</description>
<selector>
<element name="header-filter-key" value="traceparent"/>
<element name="header-filter-value" value="${traceId}"/>
<element name="header-filter-comparator" value="CONTAINS"/>
<element name="event-lookback-window" value="PT1S"/>
</selector>
<message>
<data>
<![CDATA[
<HelloRequest xmlns="http://citrusframework.org/schemas/samples/HelloService.xsd">
<MessageId>${messageId}</MessageId>
<CorrelationId>${correlationId}</CorrelationId>
<User>${user}</User>
<Text>Hello Citrus</Text>
</HelloRequest>
]]>
</data>
</message>
<header>
<element name="Operation" value="sayHello"/>
<element name="citrus_kafka_topic" value="hello"/>
<element name="citrus_kafka_partition" value="0"/>
<element name="citrus_kafka_offset" value="@assertThat(greaterThanOrEqualTo(0))@"/>
</header>
<extract>
<header name="traceparent" variable="${extractedTraceparent}"/>
</extract>
</receive>
</repeat-onerror-until-true>
</actions>
</testcase>
</spring:beans>
Loading