From 3b9b23304c04d9ede57bddcb2e806f265fb7322e Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Mon, 7 Jun 2021 17:59:24 -0400 Subject: [PATCH] Fixing test issues --- .../cloud/stream/app/source/geode/GeodeSourceTests.java | 6 ++---- .../cloud/stream/app/source/mqtt/MqttSourceTests.java | 2 +- .../stream/app/source/rabbit/RabbitSourceListenerTests.java | 6 +++--- .../cloud/stream/app/source/time/TimeSourceTests.java | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java b/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java index 8f5f951f..3cc262cc 100644 --- a/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java +++ b/applications/source/geode-source/src/test/java/org/springframework/cloud/stream/app/source/geode/GeodeSourceTests.java @@ -30,7 +30,6 @@ import org.apache.geode.cache.Region; import org.apache.geode.pdx.PdxInstance; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -48,7 +47,6 @@ import org.springframework.messaging.Message; import static org.assertj.core.api.Assertions.assertThat; @Tag("integration") -@Disabled public class GeodeSourceTests { private static ApplicationContextRunner applicationContextRunner; @@ -93,7 +91,7 @@ public class GeodeSourceTests { List values = new ArrayList(); for (int i = 0; i < 3; i++) { - Message message = outputDestination.receive(Duration.ofSeconds(3).toMillis()); + Message message = outputDestination.receive(Duration.ofSeconds(3).toMillis(), "geodeSupplier-out-0"); assertThat(message).isNotNull(); values.add(new String(message.getPayload())); } @@ -122,7 +120,7 @@ public class GeodeSourceTests { putStockEvent(region, new Stock("YYY", 110.01)); putStockEvent(region, new Stock("XXX", 139.80)); - Message message = outputDestination.receive(Duration.ofSeconds(3).toMillis()); + Message message = outputDestination.receive(Duration.ofSeconds(3).toMillis(), "geodeSupplier-out-0"); assertThat(message).isNotNull(); Stock result = objectMapper.readValue(message.getPayload(), Stock.class); assertThat(result).isEqualTo(new Stock("XXX", 140.20)); diff --git a/applications/source/mqtt-source/src/test/java/org/springframework/cloud/stream/app/source/mqtt/MqttSourceTests.java b/applications/source/mqtt-source/src/test/java/org/springframework/cloud/stream/app/source/mqtt/MqttSourceTests.java index fbfe7b38..ea4342d7 100644 --- a/applications/source/mqtt-source/src/test/java/org/springframework/cloud/stream/app/source/mqtt/MqttSourceTests.java +++ b/applications/source/mqtt-source/src/test/java/org/springframework/cloud/stream/app/source/mqtt/MqttSourceTests.java @@ -69,7 +69,7 @@ public class MqttSourceTests { mqttOutbound.handleMessage(MessageBuilder.withPayload("hello").build()); OutputDestination target = context.getBean(OutputDestination.class); - Message sourceMessage = target.receive(10000); + Message sourceMessage = target.receive(10000, "mqttSupplier-out-0"); final String actual = new String(sourceMessage.getPayload()); assertThat(actual).isEqualTo("hello"); diff --git a/applications/source/rabbit-source/src/test/java/org/springframework/cloud/stream/app/source/rabbit/RabbitSourceListenerTests.java b/applications/source/rabbit-source/src/test/java/org/springframework/cloud/stream/app/source/rabbit/RabbitSourceListenerTests.java index d68f06d1..d744bdeb 100644 --- a/applications/source/rabbit-source/src/test/java/org/springframework/cloud/stream/app/source/rabbit/RabbitSourceListenerTests.java +++ b/applications/source/rabbit-source/src/test/java/org/springframework/cloud/stream/app/source/rabbit/RabbitSourceListenerTests.java @@ -86,7 +86,7 @@ public class RabbitSourceListenerTests { rabbitTemplate.convertAndSend("scsapp-testex", "", "hello"); OutputDestination target = context.getBean(OutputDestination.class); - Message sourceMessage = target.receive(600000); + Message sourceMessage = target.receive(600000, "rabbitSupplier-out-0"); final String actual = new String(sourceMessage.getPayload()); assertThat(actual).isEqualTo("hello"); @@ -114,7 +114,7 @@ public class RabbitSourceListenerTests { bootFactory.resetConnection(); OutputDestination target = context.getBean(OutputDestination.class); - Message sourceMessage = target.receive(600000); + Message sourceMessage = target.receive(600000, "rabbitSupplier-out-0"); final String actual = new String(sourceMessage.getPayload()); assertThat(actual).isEqualTo("foo"); @@ -170,7 +170,7 @@ public class RabbitSourceListenerTests { }); OutputDestination target = context.getBean(OutputDestination.class); - Message sourceMessage = target.receive(600000); + Message sourceMessage = target.receive(600000, "rabbitSupplier-out-0"); final String actual = new String(sourceMessage.getPayload()); assertThat(actual).isEqualTo("foo"); diff --git a/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java b/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java index a1b86d5f..476ef9f4 100644 --- a/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java +++ b/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java @@ -21,7 +21,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType;