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

TCP: Fix race in test

Browse Source 
- since the deserializer is no longer volatile, we can't change it in the test
- move the "old behavior" test for the raw deserializer to a new test
This commit is contained in:
Gary Russell
2019-10-18 09:00:51 -04:00
parent c420c414d3
commit 612ae341ae
1 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java
View File

@@ -418,21 +418,59 @@ public class DeserializationTests {
assertThat(new String((byte[]) message.getPayload())).isEqualTo("Test");
String shortReply = reply.substring(0, reply.length() - 1);
((MessageChannel) message.getHeaders().getReplyChannel()).send(new GenericMessage<String>(shortReply));
message = outputChannel.receive(6000);
message = outputChannel.receive(1000);
assertThat(message).isNull();
}
@Test
public void testTimeoutWithRawDeserializerEofIsTerminator() throws Exception {
ByteArrayRawSerializer serializer = new ByteArrayRawSerializer();
TcpNioServerConnectionFactory serverNio = new TcpNioServerConnectionFactory(0);
ByteArrayLengthHeaderSerializer lengthHeaderSerializer = new ByteArrayLengthHeaderSerializer(1);
serverNio.setDeserializer(lengthHeaderSerializer);
serverNio.setSerializer(serializer);
serverNio.afterPropertiesSet();
TcpInboundGateway in = new TcpInboundGateway();
in.setConnectionFactory(serverNio);
QueueChannel serverSideChannel = new QueueChannel();
in.setRequestChannel(serverSideChannel);
in.setBeanFactory(mock(BeanFactory.class));
in.afterPropertiesSet();
in.start();
TestingUtilities.waitListening(serverNio, null);
TcpNioClientConnectionFactory clientNio = new TcpNioClientConnectionFactory("localhost", serverNio.getPort());
clientNio.setSerializer(serializer);
clientNio.setDeserializer(new ByteArrayRawSerializer(true));
clientNio.setSoTimeout(1000);
clientNio.afterPropertiesSet();
final TcpOutboundGateway out = new TcpOutboundGateway();
out.setConnectionFactory(clientNio);
QueueChannel outputChannel = new QueueChannel();
out.setOutputChannel(outputChannel);
out.setRemoteTimeout(60000);
out.setBeanFactory(mock(BeanFactory.class));
out.afterPropertiesSet();
out.start();
Runnable command = () -> {
try {
out.handleMessage(MessageBuilder.withPayload("\u0004Test").build());
}
catch (Exception e) {
// eat SocketTimeoutException. Doesn't matter for this test
}
};
Executor exec = new SimpleAsyncTaskExecutor();
Message<?> message;
// good message should be received
if ((deserializer instanceof ByteArrayRawSerializer)) { // restore old behavior
clientNio.setDeserializer(new ByteArrayRawSerializer(true));
}
exec.execute(command);
message = serverSideChannel.receive(10000);
assertThat(message).isNotNull();
assertThat(new String((byte[]) message.getPayload())).isEqualTo("Test");
((MessageChannel) message.getHeaders().getReplyChannel()).send(new GenericMessage<String>(reply));
((MessageChannel) message.getHeaders().getReplyChannel()).send(new GenericMessage<String>("reply"));
message = outputChannel.receive(10000);
assertThat(message).isNotNull();
assertThat(new String(((byte[]) message.getPayload()))).isEqualTo(reply);
assertThat(new String(((byte[]) message.getPayload()))).isEqualTo("reply");
}
private static class CustomDeserializer extends AbstractByteArraySerializer {