Repository: camel Updated Branches: refs/heads/master 9b7cc6b5c -> 394dbb462
Polished the unit tests of camel-test-spring Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/394dbb46 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/394dbb46 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/394dbb46 Branch: refs/heads/master Commit: 394dbb462a462fbd5ba3cd6aa63439efa7aefbca Parents: f1ab869 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Jun 19 18:55:45 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Jun 19 18:55:58 2014 +0800 ---------------------------------------------------------------------- ...Unit4ClassRunnerMockEndpointsAndSkipTest.java | 1 + ...SpringJUnit4ClassRunnerMockEndpointsTest.java | 19 +++++++++++++------ .../CamelSpringJUnit4ClassRunnerPlainTest.java | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/394dbb46/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java index ce57fbe..d20e72b 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java @@ -50,6 +50,7 @@ public class CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest start2.sendBody("David"); MockEndpoint.assertIsSatisfied(camelContext); + MockEndpoint.assertIsSatisfied(camelContext2); assertTrue("Original endpoint was invoked", ((SedaEndpoint) original.getDelegate()).getExchanges().isEmpty()); } } http://git-wip-us.apache.org/repos/asf/camel/blob/394dbb46/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java index 0febb1e..73dac9f 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerMockEndpointsTest.java @@ -19,16 +19,21 @@ package org.apache.camel.test.spring; import org.apache.camel.EndpointInject; import org.apache.camel.ServiceStatus; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.component.seda.SedaEndpoint; +import org.apache.camel.impl.InterceptSendToEndpoint; import org.junit.Test; - import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; -@MockEndpoints("mock:c*") +@MockEndpoints("seda:context2.seda") public class CamelSpringJUnit4ClassRunnerMockEndpointsTest extends CamelSpringJUnit4ClassRunnerPlainTest { - @EndpointInject(uri = "mock:mock:c", context = "camelContext2") - protected MockEndpoint mockMockC; + @EndpointInject(uri = "mock:seda:context2.seda", context = "camelContext2") + protected MockEndpoint mock; + + @EndpointInject(uri = "seda:context2.seda", context = "camelContext2") + private InterceptSendToEndpoint original; @Test @Override @@ -39,12 +44,14 @@ public class CamelSpringJUnit4ClassRunnerMockEndpointsTest mockA.expectedBodiesReceived("David"); mockB.expectedBodiesReceived("Hello David"); - mockC.expectedBodiesReceived("Hello David"); - mockMockC.expectedBodiesReceived("Hello David"); + mockC.expectedBodiesReceived("David"); + mock.expectedBodiesReceived("Hello David"); start.sendBody("David"); start2.sendBody("David"); MockEndpoint.assertIsSatisfied(camelContext); + MockEndpoint.assertIsSatisfied(camelContext2); + assertTrue("Original endpoint should be invoked", ((SedaEndpoint) original.getDelegate()).getExchanges().size() == 1); } } http://git-wip-us.apache.org/repos/asf/camel/blob/394dbb46/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest.java ---------------------------------------------------------------------- diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest.java index b5ddb6d..337d387 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunnerPlainTest.java @@ -83,6 +83,7 @@ public class CamelSpringJUnit4ClassRunnerPlainTest { start2.sendBody("David"); MockEndpoint.assertIsSatisfied(camelContext); + MockEndpoint.assertIsSatisfied(camelContext2); } @Test
