Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to SF-5.0.2.B-S to ensure compatibility

Browse Source 
* Fix `EnableIntegrationTests.testMessagingGateway()` do not check for
compiled SpEL since it isn't compilable any more for the Proxy classes
This commit is contained in:
Artem Bilan
2017-11-15 14:52:35 -05:00
parent 9414ceef86
commit 89614f7ff6
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -137,7 +137,7 @@ subprojects { subproject ->
springSecurityVersion = '5.0.0.RC1'
springSocialTwitterVersion = '2.0.0.M4'
springRetryVersion = '1.2.1.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.1.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.2.BUILD-SNAPSHOT'
springWsVersion = '3.0.0.RELEASE'
tomcatVersion = "8.5.23"
xmlUnitVersion = '1.6'

5
spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java
View File

@@ -21,7 +21,6 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -452,12 +451,12 @@ public class EnableIntegrationTests {
assertThat(result, containsString("SpelExpression"));
assertThat(result, containsString("CompoundExpression.getValueInternal"));
assertNotNull(this.testGateway2.echo2("baz"));
result = this.testGateway2.echo2("baz"); // third one should be compiled
// third one should be compiled, but it's not since SF-5.0.2 - proxies aren't compilable SpELs any more
result = this.testGateway2.echo2("baz");
assertNotNull(result);
assertEquals("BAZ2", result.substring(0, 4));
assertThat(result, not(containsString("InvocableHandlerMethod")));
assertThat(result, containsString("SpelExpression"));
assertThat(result, is(new RegexMatcher<String>(".+Ex\\d.getValue\\(.+")));
this.testGateway.sendAsync("foo");
assertTrue(this.asyncAnnotationProcessLatch.await(1, TimeUnit.SECONDS));
assertNotSame(Thread.currentThread(), this.asyncAnnotationProcessThread.get());