From 3f98c2e6442e1aefaffefd5d817d1563338b35e7 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Tue, 8 Jun 2021 10:40:47 -0400 Subject: [PATCH] Fixing FtpSourceTests/ScriptProcessorTests --- .../ScriptProcessorIntegrationTests.java | 22 +++++++++---------- .../stream/app/source/ftp/FtpSourceTests.java | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/applications/processor/script-processor/src/test/java/org/springframework/cloud/stream/app/processor/script/ScriptProcessorIntegrationTests.java b/applications/processor/script-processor/src/test/java/org/springframework/cloud/stream/app/processor/script/ScriptProcessorIntegrationTests.java index 6305dd41..0dd5bc2b 100644 --- a/applications/processor/script-processor/src/test/java/org/springframework/cloud/stream/app/processor/script/ScriptProcessorIntegrationTests.java +++ b/applications/processor/script-processor/src/test/java/org/springframework/cloud/stream/app/processor/script/ScriptProcessorIntegrationTests.java @@ -58,7 +58,7 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>("hello world")); - Message sourceMessage = processorOutput.receive(10000); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); assertThat(new String(sourceMessage.getPayload())).matches(s -> s.equals("4") || s.equals("4.0")); ObjectMapper objectMapper = new ObjectMapper(); final Integer deserializedValue = objectMapper.readValue(sourceMessage.getPayload(), Integer.class); @@ -80,7 +80,7 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>("hello world")); - Message sourceMessage = processorOutput.receive(10000); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); assertThat(new String(sourceMessage.getPayload())).isEqualTo("hello world WORLD"); } } @@ -99,8 +99,8 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>(9)); - Message sourceMessage = processorOutput.receive(10000); - assertThat(new String(sourceMessage.getPayload())).isEqualTo("45"); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); + assertThat(new String(sourceMessage.getPayload())).isEqualTo("45.0"); } } @@ -118,7 +118,7 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>("hello world")); - Message sourceMessage = processorOutput.receive(10000); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); assertThat(new String(sourceMessage.getPayload())).isEqualTo("hello world WORLD"); } } @@ -137,7 +137,7 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>("hello world")); - Message sourceMessage = processorOutput.receive(10000); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); assertThat(new String(sourceMessage.getPayload())).isEqualTo("hello WORLD"); } } @@ -155,7 +155,7 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>("hello world")); - Message sourceMessage = processorOutput.receive(10000); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); assertThat(new String(sourceMessage.getPayload())).isEqualTo("HELLO WORLD"); } } @@ -173,7 +173,7 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>(9)); - Message sourceMessage = processorOutput.receive(10000); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); assertThat(new String(sourceMessage.getPayload())).isEqualTo("14"); } } @@ -191,7 +191,7 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>(6)); - Message sourceMessage = processorOutput.receive(10000); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); assertThat(new String(sourceMessage.getPayload())).isEqualTo("30"); } } @@ -209,7 +209,7 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>("world")); - Message sourceMessage = processorOutput.receive(10000); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); assertThat(new String(sourceMessage.getPayload())).isEqualTo("hello world"); } } @@ -227,7 +227,7 @@ public class ScriptProcessorIntegrationTests { OutputDestination processorOutput = context.getBean(OutputDestination.class); processorInput.send(new GenericMessage<>("def age=18")); - Message sourceMessage = processorOutput.receive(10000); + Message sourceMessage = processorOutput.receive(10000, "scriptProcessorFunction-out-0"); assertThat(new String(sourceMessage.getPayload())).isEqualTo("var age = 18;" + System.getProperty("line.separator")); } diff --git a/applications/source/ftp-source/src/test/java/org/springframework/cloud/stream/app/source/ftp/FtpSourceTests.java b/applications/source/ftp-source/src/test/java/org/springframework/cloud/stream/app/source/ftp/FtpSourceTests.java index 00067dff..0de38641 100644 --- a/applications/source/ftp-source/src/test/java/org/springframework/cloud/stream/app/source/ftp/FtpSourceTests.java +++ b/applications/source/ftp-source/src/test/java/org/springframework/cloud/stream/app/source/ftp/FtpSourceTests.java @@ -58,7 +58,7 @@ public class FtpSourceTests extends FtpTestSupport { Message message = output.receive(10000); assertThat(new File(new String(message.getPayload()).replaceAll("\"", ""))).isEqualTo( new File(this.config.getLocalDir(), "ftpSource1.txt")); - message = output.receive(10000); + message = output.receive(10000, "ftpSupplier-out-0"); assertThat(new File(new String(message.getPayload()).replaceAll("\"", ""))).isEqualTo( new File(this.config.getLocalDir(), "ftpSource2.txt")); }