From 580ca865fee6316309fc0c1a9d99be78758f2939 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 30 Jul 2019 17:38:29 -0400 Subject: [PATCH] Test fixes for AssertJ changes --- .../aggregator/FluxAggregatorMessageHandlerTests.java | 5 ++--- .../integration/dsl/correlation/CorrelationHandlerTests.java | 3 ++- .../integration/dsl/transformers/TransformerTests.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandlerTests.java index 1f93f0d4fa..88ce4a3655 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/FluxAggregatorMessageHandlerTests.java @@ -31,7 +31,6 @@ import org.springframework.integration.IntegrationMessageHeaderAccessor; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; import reactor.core.publisher.Flux; @@ -65,7 +64,7 @@ class FluxAggregatorMessageHandlerTests { assertThat(result).isNotNull() .extracting(Message::getHeaders) .satisfies((headers) -> - assertThat((MessageHeaders) headers) + assertThat(headers) .containsEntry(IntegrationMessageHeaderAccessor.CORRELATION_ID, 0)); Object payload = result.getPayload(); @@ -87,7 +86,7 @@ class FluxAggregatorMessageHandlerTests { assertThat(result).isNotNull() .extracting(Message::getHeaders) .satisfies((headers) -> - assertThat((MessageHeaders) headers) + assertThat(headers) .containsEntry(IntegrationMessageHeaderAccessor.CORRELATION_ID, 1)); payload = result.getPayload(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/correlation/CorrelationHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/correlation/CorrelationHandlerTests.java index f23bb38c7d..f708d52a5a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/correlation/CorrelationHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/correlation/CorrelationHandlerTests.java @@ -56,6 +56,7 @@ import org.springframework.test.context.junit4.SpringRunner; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.TextNode; + import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -168,7 +169,7 @@ public class CorrelationHandlerTests { .isNotNull() .extracting(Message::getPayload) .isInstanceOf(ArrayNode.class) - .extracting("_children") + .extracting(new String[] { "_children" }) .element(0) .asList() .hasSize(0); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dsl/transformers/TransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dsl/transformers/TransformerTests.java index 1ca99e5eac..f821a9c7ce 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dsl/transformers/TransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dsl/transformers/TransformerTests.java @@ -99,7 +99,7 @@ public class TransformerTests { TestPojo result = (TestPojo) payload; assertThat(result.getName()).isEqualTo("Bar Bar"); assertThat(result.getDate()).isNotNull(); - assertThat(new Date()).isAfterOrEqualsTo(result.getDate()); + assertThat(new Date()).isAfterOrEqualTo(result.getDate()); this.enricherInput.send(new GenericMessage<>(new TestPojo("junk"))); @@ -122,7 +122,7 @@ public class TransformerTests { TestPojo result = (TestPojo) payload; assertThat(result.getName()).isEqualTo("Bar Bar"); assertThat(result.getDate()).isNotNull(); - assertThat(new Date()).isAfterOrEqualsTo(result.getDate()); + assertThat(new Date()).isAfterOrEqualTo(result.getDate()); } @Test