You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/03/02 03:44:52 UTC
svn commit: r917843 - in /camel/trunk/components/camel-jms: ./
src/test/java/org/apache/camel/component/jms/
src/test/java/org/apache/camel/component/jms/issues/
Author: ningjiang
Date: Tue Mar 2 02:44:52 2010
New Revision: 917843
URL: http://svn.apache.org/viewvc?rev=917843&view=rev
Log:
Clean up the unit test of camel-jms
Modified:
camel/trunk/components/camel-jms/pom.xml
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BeanConsumerIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java
Modified: camel/trunk/components/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/pom.xml?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/pom.xml (original)
+++ camel/trunk/components/camel-jms/pom.xml Tue Mar 2 02:44:52 2010
@@ -70,12 +70,14 @@
</dependency>
<!-- testing -->
+ <!-- for JmsIssue170Test -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <!-- for JmsRemotingTest and RemotingTest -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java Tue Mar 2 02:44:52 2010
@@ -18,23 +18,25 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.CamelTestSupport;
import org.junit.Test;
+
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
/**
* @version $Revision$
*/
-public class JmsProducerWithJMSHeaderTest extends ContextTestSupport {
+public class JmsProducerWithJMSHeaderTest extends CamelTestSupport {
@Test
public void testInOnlyJMSPrioritory() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BeanConsumerIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BeanConsumerIssueTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BeanConsumerIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BeanConsumerIssueTest.java Tue Mar 2 02:44:52 2010
@@ -19,19 +19,21 @@
import java.util.List;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @version $Revision$
*/
-public class BeanConsumerIssueTest extends SpringTestSupport {
+public class BeanConsumerIssueTest extends CamelSpringTestSupport {
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/issues/BeanConsumerIssue.xml");
}
+ @Test
public void testCollectMessages() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java Tue Mar 2 02:44:52 2010
@@ -21,22 +21,23 @@
import org.apache.activemq.camel.component.ActiveMQComponent;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.springframework.jms.core.JmsTemplate;
import static org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
/**
* @version $Revision$
*/
-public class JmsAnotherCustomJMSReplyToTest extends ContextTestSupport {
+public class JmsAnotherCustomJMSReplyToTest extends CamelTestSupport {
private static final String MQURI = "vm://localhost?broker.persistent=false&broker.useJmx=false";
private ActiveMQComponent amq;
-
+ @Test
public void testCustomJMSReplyToInOnly() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("My name is Arnio");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java Tue Mar 2 02:44:52 2010
@@ -21,21 +21,23 @@
import org.apache.activemq.camel.component.ActiveMQComponent;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.springframework.jms.core.JmsTemplate;
import static org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
/**
* @version $Revision$
*/
-public class JmsCustomJMSReplyToIssueTest extends ContextTestSupport {
+public class JmsCustomJMSReplyToIssueTest extends CamelTestSupport {
private ActiveMQComponent amq;
+ @Test
public void testCustomJMSReplyTo() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java Tue Mar 2 02:44:52 2010
@@ -17,19 +17,19 @@
package org.apache.camel.component.jms.issues;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import static org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
/**
* @version $Revision$
*/
-public class JmsInOnlyIssueTest extends ContextTestSupport {
+public class JmsInOnlyIssueTest extends CamelTestSupport {
@Test
public void testInOnlyWithSendBody() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutIssueTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutIssueTest.java Tue Mar 2 02:44:52 2010
@@ -19,18 +19,18 @@
import java.util.concurrent.Future;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import static org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
/**
* @version $Revision$
*/
-public class JmsInOutIssueTest extends ContextTestSupport {
+public class JmsInOutIssueTest extends CamelTestSupport {
@Test
public void testInOutWithRequestBody() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutWithSpringRestartIssueTest.java Tue Mar 2 02:44:52 2010
@@ -17,7 +17,7 @@
package org.apache.camel.component.jms.issues;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -25,7 +25,7 @@
/**
* @version $Revision$
*/
-public class JmsInOutWithSpringRestartIssueTest extends SpringTestSupport {
+public class JmsInOutWithSpringRestartIssueTest extends CamelSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java Tue Mar 2 02:44:52 2010
@@ -18,10 +18,11 @@
import org.apache.activemq.camel.component.ActiveMQComponent;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import static org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
/**
@@ -29,10 +30,11 @@
*
* @version $Revision$
*/
-public class JmsJMSReplyToConsumerEndpointUsingInOutTest extends ContextTestSupport {
+public class JmsJMSReplyToConsumerEndpointUsingInOutTest extends CamelTestSupport {
private static final String MQURI = "vm://localhost?broker.persistent=false&broker.useJmx=false";
private ActiveMQComponent amq;
+ @Test
public void testCustomJMSReplyToInOut() throws Exception {
template.sendBody("activemq:queue:hello", "What is your name?");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java Tue Mar 2 02:44:52 2010
@@ -27,12 +27,13 @@
import org.apache.activemq.camel.component.ActiveMQComponent;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessageCreator;
@@ -42,11 +43,12 @@
*
* @version $Revision$
*/
-public class JmsJMSReplyToEndpointUsingInOutTest extends ContextTestSupport {
+public class JmsJMSReplyToEndpointUsingInOutTest extends CamelTestSupport {
private static final String MQURI = "vm://localhost?broker.persistent=false&broker.useJmx=false";
private ActiveMQComponent amq;
+ @Test
public void testCustomJMSReplyToInOut() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java?rev=917843&r1=917842&r2=917843&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsSendToAlotOfDestinationWithSameEndpointTest.java Tue Mar 2 02:44:52 2010
@@ -18,7 +18,7 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.component.jms.JmsConstants;
-import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
@@ -28,7 +28,7 @@
/**
* @version $Revision$
*/
-public class JmsSendToAlotOfDestinationWithSameEndpointTest extends SpringTestSupport {
+public class JmsSendToAlotOfDestinationWithSameEndpointTest extends CamelSpringTestSupport {
private static final transient Log LOG = LogFactory.getLog(JmsSendToAlotOfDestinationWithSameEndpointTest.class);
private static final String URI = "activemq:queue:foo?autoStartup=false";