From f5f7e410107bd5494bdc94ae710ef0446b1bf4d6 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 14 Jul 2022 16:46:26 +0200 Subject: [PATCH] Fix tests after SI update --- .../cloud/stream/binding/BindingService.java | 7 ++++--- .../cloud/stream/function/PollableSourceTests.java | 10 +++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingService.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingService.java index 938874841..56c9f262f 100644 --- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingService.java +++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindingService.java @@ -16,10 +16,10 @@ package org.springframework.cloud.stream.binding; -import java.sql.Date; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -404,8 +404,9 @@ public class BindingService { } private void scheduleTask(Runnable task) { - this.taskScheduler.schedule(task, new Date(System.currentTimeMillis() - + this.bindingServiceProperties.getBindingRetryInterval() * 1_000)); + Date d = new Date(System.currentTimeMillis() + + this.bindingServiceProperties.getBindingRetryInterval() * 1_000); + this.taskScheduler.schedule(task, d.toInstant()); } private void assertNotIllegalException(RuntimeException exception) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/PollableSourceTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/PollableSourceTests.java index 23426179d..ae06a6dc5 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/PollableSourceTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/PollableSourceTests.java @@ -16,6 +16,8 @@ package org.springframework.cloud.stream.function; +import java.time.Duration; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanCreationException; @@ -36,6 +38,8 @@ import org.springframework.scheduling.support.PeriodicTrigger; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + + /** * * @author Oleg Zhurakousky @@ -75,7 +79,7 @@ public class PollableSourceTests { PollerMetadata pollerMetadata = context.getBean(PollerMetadata.class); assertThat(pollerMetadata.getTrigger()).isInstanceOf(PeriodicTrigger.class); assertThat(TestUtils.getPropertyValue(pollerMetadata.getTrigger(), "fixedRate")).isEqualTo(false); - assertThat(TestUtils.getPropertyValue(pollerMetadata.getTrigger(), "period")).isEqualTo(1000L); + assertThat(TestUtils.getPropertyValue(pollerMetadata.getTrigger(), "period")).isEqualTo(Duration.ofSeconds(1)); assertThat(pollerMetadata.getMaxMessagesPerPoll()).isEqualTo(1); } } @@ -91,7 +95,7 @@ public class PollableSourceTests { PollerMetadata pollerMetadata = context.getBean(PollerMetadata.class); assertThat(pollerMetadata.getTrigger()).isInstanceOf(PeriodicTrigger.class); assertThat(TestUtils.getPropertyValue(pollerMetadata.getTrigger(), "fixedRate")).isEqualTo(false); - assertThat(TestUtils.getPropertyValue(pollerMetadata.getTrigger(), "period")).isEqualTo(7000L); + assertThat(TestUtils.getPropertyValue(pollerMetadata.getTrigger(), "period")).isEqualTo(Duration.ofSeconds(7)); assertThat(pollerMetadata.getMaxMessagesPerPoll()).isEqualTo(13); } } @@ -105,7 +109,7 @@ public class PollableSourceTests { PollerMetadata pollerMetadata = context.getBean(PollerMetadata.class); assertThat(pollerMetadata.getTrigger()).isInstanceOf(PeriodicTrigger.class); assertThat(TestUtils.getPropertyValue(pollerMetadata.getTrigger(), "fixedRate")).isEqualTo(true); - assertThat(TestUtils.getPropertyValue(pollerMetadata.getTrigger(), "period")).isEqualTo(200L); + assertThat(TestUtils.getPropertyValue(pollerMetadata.getTrigger(), "period")).isEqualTo(Duration.ofMillis(200)); assertThat(pollerMetadata.getMaxMessagesPerPoll()).isEqualTo(1); } }