Fix SF-4.3.3 Compatibility

https://build.spring.io/browse/INT-B43-JOB1-274
This commit is contained in:
Artem Bilan
2016-08-10 19:28:46 -04:00
parent 19b6b0409e
commit 014ed83967
3 changed files with 5 additions and 4 deletions

View File

@@ -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'

View File

@@ -242,7 +242,7 @@ public class AggregatorIntegrationTests {
this.zeroGroupTimeoutExpressionAggregatorInput.send(new GenericMessage<Integer>(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 {

View File

@@ -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));
}
}