Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix race in TCP async gateway test

Browse Source
This commit is contained in:
Gary Russell
2020-04-25 13:20:57 -04:00
parent 6b57e16440
commit e9a0149030
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java
View File

@@ -981,12 +981,27 @@ public class TcpOutboundGatewayTests {
gateway.afterPropertiesSet();
gateway.handleMessage(MessageBuilder.withPayload("Test1").build());
gateway.handleMessage(MessageBuilder.withPayload("Test2").build());
Message<?> reply = replyChannel.receive(10000);
assertThat(reply).isNotNull();
assertThat(reply.getPayload()).isEqualTo("reply1".getBytes());
reply = replyChannel.receive(10000);
assertThat(reply).isNotNull();
assertThat(reply.getPayload()).isEqualTo("reply2".getBytes());
Message<?> reply1 = replyChannel.receive(10000);
assertThat(reply1).isNotNull();
if (singleUse) {
assertThat(reply1.getPayload()).satisfiesAnyOf(
payload -> assertThat(payload).isEqualTo("reply1".getBytes()),
payload -> assertThat(payload).isEqualTo("reply2".getBytes()));
}
else {
assertThat(reply1.getPayload()).isEqualTo("reply1".getBytes());
}
Message<?> reply2 = replyChannel.receive(10000);
assertThat(reply2).isNotNull();
if (singleUse) {
assertThat(reply1.getPayload()).satisfiesAnyOf(
payload -> assertThat(payload).isEqualTo("reply1".getBytes()),
payload -> assertThat(payload).isEqualTo("reply2".getBytes()));
assertThat(reply1.getPayload()).isNotEqualTo(reply2.getPayload());
}
else {
assertThat(reply2.getPayload()).isEqualTo("reply2".getBytes());
}
assertThat(thread.get()).isNotSameAs(Thread.currentThread());
}
finally {