This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 967e7ad Upgrade SI
967e7ad is described below
commit 967e7adb6ab822e6b545d09ad006ea8c1f750a54
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Mar 30 21:35:53 2020 +0200
Upgrade SI
---
.../spring/integration/adapter/ConfigurationTest.java | 11 ++++++++---
parent/pom.xml | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
index dd8cf53..bdd805f 100644
---
a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
+++
b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java
@@ -24,6 +24,7 @@ import
org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class ConfigurationTest {
@@ -37,26 +38,30 @@ public class ConfigurationTest {
@Test
public void testCamelSourceEndpoint() throws Exception {
context = new
ClassPathXmlApplicationContext("/org/apache/camel/component/spring/integration/adapter/CamelSource.xml");
+ context.start();
+
CamelSourceAdapter camelSourceA = context.getBean("camelSourceA",
CamelSourceAdapter.class);
assertNotNull(camelSourceA);
- assertEquals("Get the wrong request channel name",
camelSourceA.getChannel().toString(), "channelA");
+ assertTrue(camelSourceA.getChannel().toString().contains("channelA"));
assertEquals("ExpectReply should be false ",
camelSourceA.isExpectReply(), false);
CamelSourceAdapter camelSourceB = context.getBean("camelSourceB",
CamelSourceAdapter.class);
assertNotNull(camelSourceB);
- assertEquals("Get the wrong request channel name",
camelSourceB.getChannel().toString(), "channelB");
+ assertTrue(camelSourceB.getChannel().toString().contains("channelB"));
assertEquals("ExpectReply should be true ",
camelSourceB.isExpectReply(), true);
}
@Test
public void testCamelTragetEndpoint() throws Exception {
context = new ClassPathXmlApplicationContext(new
String[]{"/org/apache/camel/component/spring/integration/adapter/CamelTarget.xml"});
+ context.start();
+
CamelTargetAdapter camelTargetA = context.getBean("camelTargetA",
CamelTargetAdapter.class);
assertNotNull(camelTargetA);
assertEquals("Subscript the wrong CamelEndpointUri",
camelTargetA.getCamelEndpointUri(), "direct:EndpointA");
CamelTargetAdapter camelTargetB = context.getBean("camelTargetB",
CamelTargetAdapter.class);
assertNotNull(camelTargetB);
- assertEquals("Subscript the wrong reply channel name",
camelTargetB.getReplyChannel().toString(), "channelC");
+
assertTrue(camelTargetB.getReplyChannel().toString().contains("channelC"));
}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index a7df125..df266c6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -535,7 +535,7 @@
<spring-data-keyvalue-bundle-version>2.2.4.RELEASE_1</spring-data-keyvalue-bundle-version>
<spring-data-redis-version>2.2.4.RELEASE</spring-data-redis-version>
<spring-data-redis-bundle-version>2.2.4.RELEASE_1</spring-data-redis-bundle-version>
- <spring-integration-version>5.1.8.RELEASE</spring-integration-version>
+ <spring-integration-version>5.2.5.RELEASE</spring-integration-version>
<spring-ldap-version>2.3.2.RELEASE</spring-ldap-version>
<spring-ldap-bundle-version>2.3.2.RELEASE_2</spring-ldap-bundle-version>
<spring-version-range>[5,6)</spring-version-range>
