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 B787DD2AC for ; Sat, 25 May 2013 16:09:14 +0000 (UTC) Received: (qmail 85405 invoked by uid 500); 25 May 2013 16:09:12 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 85251 invoked by uid 500); 25 May 2013 16:09:11 -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 85075 invoked by uid 99); 25 May 2013 16:09:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 May 2013 16:09:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C50693188E1; Sat, 25 May 2013 16:09:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cmueller@apache.org To: commits@camel.apache.org Date: Sat, 25 May 2013 16:09:11 -0000 Message-Id: In-Reply-To: <2ffb736f91c74d06ad604e2770878c85@git.apache.org> References: <2ffb736f91c74d06ad604e2770878c85@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: simplified the unit test by using CamelSpringTestSupport simplified the unit test by using CamelSpringTestSupport Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3dcf50f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3dcf50f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3dcf50f Branch: refs/heads/camel-2.11.x Commit: d3dcf50f463fdcc28bdecf27968b1e15eca81dd4 Parents: 93f717c Author: cmueller Authored: Sat May 25 17:41:45 2013 +0200 Committer: cmueller Committed: Sat May 25 18:07:26 2013 +0200 ---------------------------------------------------------------------- .../spring/batch/SpringBatchIntegrationTest.java | 32 +++++++------- 1 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d3dcf50f/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java index 12e9f80..77e3ad2 100644 --- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java +++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchIntegrationTest.java @@ -16,35 +16,30 @@ */ package org.apache.camel.component.spring.batch; -import org.apache.camel.CamelContext; -import org.apache.camel.ProducerTemplate; +import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Before; import org.junit.Test; -import org.springframework.context.ApplicationContext; +import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -public class SpringBatchIntegrationTest { - - ApplicationContext applicationContext; - - ProducerTemplate producerTemplate; +public class SpringBatchIntegrationTest extends CamelSpringTestSupport { + @EndpointInject(uri = "mock:output") MockEndpoint outputEndpoint; + @EndpointInject(uri = "mock:jobExecutionEventsQueue") MockEndpoint jobExecutionEventsQueueEndpoint; String[] inputMessages = new String[]{"foo", "bar", "baz", null}; @Before - public void setUp() { - applicationContext = new ClassPathXmlApplicationContext("classpath:org/apache/camel/component/spring/batch/springBatchtestContext.xml"); - producerTemplate = applicationContext.getBean(ProducerTemplate.class); - outputEndpoint = applicationContext.getBean(CamelContext.class).getEndpoint("mock:output", MockEndpoint.class); - jobExecutionEventsQueueEndpoint = applicationContext.getBean(CamelContext.class).getEndpoint("mock:jobExecutionEventsQueue", MockEndpoint.class); + public void setUp() throws Exception { + super.setUp(); for (String message : inputMessages) { - producerTemplate.sendBody("seda:inputQueue", message); + template.sendBody("seda:inputQueue", message); } } @@ -52,7 +47,7 @@ public class SpringBatchIntegrationTest { public void shouldEchoInBatch() throws InterruptedException { outputEndpoint.expectedBodiesReceived("Echo foo", "Echo bar", "Echo baz"); - producerTemplate.sendBody("direct:start", "Start batch!"); + template.sendBody("direct:start", "Start batch!"); outputEndpoint.assertIsSatisfied(); } @@ -61,8 +56,13 @@ public class SpringBatchIntegrationTest { public void shouldGenerateBatchExecutionEvents() throws InterruptedException { jobExecutionEventsQueueEndpoint.setExpectedMessageCount(2); - producerTemplate.sendBody("direct:start", "Start batch!"); + template.sendBody("direct:start", "Start batch!"); jobExecutionEventsQueueEndpoint.assertIsSatisfied(); } + + @Override + protected AbstractApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/apache/camel/component/spring/batch/springBatchtestContext.xml"); + } }