From 014ed83967a6e8988b49c58d3f83ac4d2cae2e21 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 10 Aug 2016 19:28:46 -0400 Subject: [PATCH] Fix SF-4.3.3 Compatibility https://build.spring.io/browse/INT-B43-JOB1-274 --- build.gradle | 2 +- .../aggregator/integration/AggregatorIntegrationTests.java | 2 +- .../integration/transformer/ContentEnricherTests.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0da9e2d0dc..f87969def7 100644 --- a/build.gradle +++ b/build.gradle @@ -137,7 +137,7 @@ subprojects { subproject -> springSecurityVersion = '4.1.0.RELEASE' springSocialTwitterVersion = '1.1.2.RELEASE' springRetryVersion = '1.1.2.RELEASE' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.1.RELEASE' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.2.RELEASE' springWsVersion = '2.3.0.RELEASE' xmlUnitVersion = '1.6' xstreamVersion = '1.4.7' diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java index b27d3d0154..eed7921cb9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java @@ -242,7 +242,7 @@ public class AggregatorIntegrationTests { this.zeroGroupTimeoutExpressionAggregatorInput.send(new GenericMessage(1, stubHeaders(1, 2, 1))); ErrorMessage em = (ErrorMessage) this.errors.receive(10000); assertNotNull(em); - assertThat(em.getPayload().getMessage(), + assertThat(em.getPayload().getMessage().toLowerCase(), containsString("failed to send message to channel 'output' within timeout: 10")); } finally { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java index 6a94dee7bb..4e5eeb8d39 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java @@ -17,6 +17,7 @@ package org.springframework.integration.transformer; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalToIgnoringCase; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; @@ -180,8 +181,8 @@ public class ContentEnricherTests { enricher.handleMessage(requestMessage); } catch (MessageDeliveryException e) { - assertEquals("failed to send message to channel '" + requestChannelName - + "' within timeout: " + requestTimeout, e.getMessage()); + assertThat(e.getMessage(), equalToIgnoringCase("failed to send message to channel '" + requestChannelName + + "' within timeout: " + requestTimeout)); } }