Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0F10FD6E9 for ; Fri, 6 Jul 2012 12:48:06 +0000 (UTC) Received: (qmail 59516 invoked by uid 500); 6 Jul 2012 12:48:05 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 59413 invoked by uid 500); 6 Jul 2012 12:48:04 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 59389 invoked by uid 99); 6 Jul 2012 12:48:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jul 2012 12:48:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jul 2012 12:48:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 54F05238889B; Fri, 6 Jul 2012 12:47:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1358169 - in /camel/trunk/components/camel-test-spring/src: main/java/org/apache/camel/test/spring/ test/java/org/apache/camel/test/junit4/ test/resources/org/apache/camel/test/junit4/ Date: Fri, 06 Jul 2012 12:47:42 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120706124742.54F05238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Fri Jul 6 12:47:41 2012 New Revision: 1358169 URL: http://svn.apache.org/viewvc?rev=1358169&view=rev Log: CAMEL-5242: Fixed @MockEndpointsAndSkip. Thanks to Michal Svab for the patch. Modified: camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerPlainTest-context.xml Modified: camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java?rev=1358169&r1=1358168&r2=1358169&view=diff ============================================================================== --- camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java (original) +++ camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java Fri Jul 6 12:47:41 2012 @@ -430,10 +430,10 @@ public class CamelSpringTestContextLoade * @param testClass the test class being executed */ protected void handleMockEndpointsAndSkip(GenericApplicationContext context, Class testClass) throws Exception { - if (testClass.isAnnotationPresent(MockEndpoints.class)) { + if (testClass.isAnnotationPresent(MockEndpointsAndSkip.class)) { final String mockEndpoints = testClass.getAnnotation( - MockEndpoints.class).value(); + MockEndpointsAndSkip.class).value(); CamelSpringTestHelper.doToSpringCamelContexts(context, new DoToSpringCamelContextsStrategy() { @Override Modified: camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java?rev=1358169&r1=1358168&r2=1358169&view=diff ============================================================================== --- camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java (original) +++ camel/trunk/components/camel-test-spring/src/test/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest.java Fri Jul 6 12:47:41 2012 @@ -19,35 +19,38 @@ package org.apache.camel.test.junit4; 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.apache.camel.test.spring.MockEndpointsAndSkip; import org.junit.Test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; -@MockEndpointsAndSkip("mock:c") +@MockEndpointsAndSkip("seda:*") public class CamelSpringJUnit4ClassRunnerMockEndpointsAndSkipTest extends CamelSpringJUnit4ClassRunnerPlainTest { - @EndpointInject(uri = "mock:mock:c", context = "camelContext2") - protected MockEndpoint mockMockC; - - @EndpointInject(uri = "mock:c", context = "camelContext2") - protected MockEndpoint mockC; - + @EndpointInject(uri = "mock:seda:context2.seda", context = "camelContext2") + protected MockEndpoint mock; + + @EndpointInject(uri = "seda:context2.seda", context = "camelContext2") + private InterceptSendToEndpoint original; + @Test @Override public void testPositive() throws Exception { assertEquals(ServiceStatus.Started, camelContext.getStatus()); assertEquals(ServiceStatus.Started, camelContext2.getStatus()); - + mockA.expectedBodiesReceived("David"); mockB.expectedBodiesReceived("Hello David"); - mockC.expectedMessageCount(0); - mockMockC.expectedBodiesReceived("Hello David"); - + mock.expectedBodiesReceived("Hello David"); + start.sendBody("David"); start2.sendBody("David"); - + MockEndpoint.assertIsSatisfied(camelContext); + assertTrue("Original endpoint was invoked", ((SedaEndpoint) original.getDelegate()).getExchanges().isEmpty()); } } Modified: camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerPlainTest-context.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerPlainTest-context.xml?rev=1358169&r1=1358168&r2=1358169&view=diff ============================================================================== --- camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerPlainTest-context.xml (original) +++ camel/trunk/components/camel-test-spring/src/test/resources/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunnerPlainTest-context.xml Fri Jul 6 12:47:41 2012 @@ -46,6 +46,7 @@ Hello ${body} +