You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/18 06:52:17 UTC
[camel] 06/06: Fixed spring test
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
commit 47ace4f126244bc38fd007d33af4fafeb0732a5a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 18 07:22:38 2020 +0200
Fixed spring test
---
.../apache/camel/spring/config/CamelProxyTest.java | 34 ++++++++--------------
.../apache/camel/spring/config/CamelProxyTest.xml | 7 -----
2 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
index f9f6f1d..cdb3d0c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/config/CamelProxyTest.java
@@ -16,46 +16,36 @@
*/
package org.apache.camel.spring.config;
-import org.apache.camel.TestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.util.IOHelper;
+import org.apache.camel.spring.SpringTestSupport;
import org.junit.jupiter.api.Test;
-import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class CamelProxyTest extends TestSupport {
+public class CamelProxyTest extends SpringTestSupport {
+
+ @Override
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/spring/config/CamelProxyTest.xml");
+ }
@Test
public void testCamelProxy() throws Exception {
- AbstractApplicationContext ac = new ClassPathXmlApplicationContext("org/apache/camel/spring/config/CamelProxyTest.xml");
-
- MyProxySender sender = ac.getBean("myProxySender", MyProxySender.class);
+ SpringCamelContext scc = context.adapt(SpringCamelContext.class);
+ MyProxySender sender = scc.getApplicationContext().getBean("myProxySender", MyProxySender.class);
String reply = sender.hello("World");
assertEquals("Hello World", reply);
// test sending inOnly message
- MyProxySender anotherSender = ac.getBean("myAnotherProxySender", MyProxySender.class);
- SpringCamelContext context = ac.getBeansOfType(SpringCamelContext.class).values().iterator().next();
- MockEndpoint result = resolveMandatoryEndpoint(context, "mock:result", MockEndpoint.class);
+ MyProxySender anotherSender = scc.getApplicationContext().getBean("myAnotherProxySender", MyProxySender.class);
+ MockEndpoint result = resolveMandatoryEndpoint(scc, "mock:result", MockEndpoint.class);
result.expectedBodiesReceived("Hello my friends!");
anotherSender.greeting("Hello my friends!");
result.assertIsSatisfied();
-
- result.reset();
- // test sending inOnly message with other sender
- MyProxySender myProxySenderWithCamelContextId = ac.getBean("myProxySenderWithCamelContextId", MyProxySender.class);
-
- result.expectedBodiesReceived("Hello my friends again!");
- myProxySenderWithCamelContextId.greeting("Hello my friends again!");
- result.assertIsSatisfied();
-
- // we're done so let's properly close the application context
- IOHelper.close(ac);
}
-
}
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml
index fdf2741..4512a3f 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/config/CamelProxyTest.xml
@@ -24,7 +24,6 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <!-- START SNIPPET: e1 -->
<camelContext id="myCamel" xmlns="http://camel.apache.org/schema/spring">
<!-- create a proxy that will route to the direct:start endpoint when invoked -->
@@ -54,10 +53,4 @@
</camelContext>
- <proxy id="myProxySenderWithCamelContextId"
- serviceInterface="org.apache.camel.spring.config.MyProxySender"
- serviceUrl="direct:inOnly"
- camelContextId ="myCamel" xmlns="http://camel.apache.org/schema/spring"/>
- <!-- END SNIPPET: e1 -->
-
</beans>