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

Fix EnableIntegrationTests to use regex matcher

Browse Source 
https://build.spring.io/browse/INT-MASTER-575

Looks like SpEL compiles classes to name with unpredictable number
This commit is contained in:
Artem Bilan
2017-03-03 22:35:25 -05:00
parent a50d866f81
commit dd0c426d14
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ 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;
@@ -49,6 +50,8 @@ import java.util.concurrent.atomic.AtomicReference;
import org.aopalliance.intercept.MethodInterceptor;
import org.apache.commons.logging.Log;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matchers;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -454,7 +457,7 @@ public class EnableIntegrationTests {
assertEquals("BAZ2", result.substring(0, 4));
assertThat(result, not(containsString("InvocableHandlerMethod")));
assertThat(result, containsString("SpelExpression"));
assertThat(result, containsString("Ex2.getValue("));
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());
@@ -1626,4 +1629,23 @@ public class EnableIntegrationTests {
}
public class RegexMatcher<T> extends BaseMatcher<T> {
private final String regex;
public RegexMatcher(String regex) {
this.regex = regex;
}
public boolean matches(Object o) {
return ((String) o).matches(regex);
}
public void describeTo(Description description) {
description.appendText("matches regex=");
}
}
}