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 2009/06/19 13:46:36 UTC
svn commit: r786464 [2/2] - in /camel/trunk/components/camel-jms: ./
src/test/java/org/apache/camel/component/jms/
src/test/java/org/apache/camel/component/jms/bind/
src/test/java/org/apache/camel/component/jms/config/
src/test/java/org/apache/camel/co...
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java Fri Jun 19 11:46:34 2009
@@ -29,6 +29,8 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxp.StringSource;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
/**
@@ -36,11 +38,12 @@
*
* @version $Revision$
*/
-public class JmsXMLRouteTest extends ContextTestSupport {
+public class JmsXMLRouteTest extends CamelTestSupport {
private static final String TEST_LONDON = "src/test/data/message1.xml";
private static final String TEST_TAMPA = "src/test/data/message2.xml";
+ @Test
public void testLondonWithFileStreamAsObject() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
@@ -54,6 +57,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testLondonWithFileStreamAsBytes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
@@ -67,6 +71,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testLondonWithFileStreamAsDefault() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
@@ -80,6 +85,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testTampaWithFileStreamAsObject() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:tampa");
mock.expectedMessageCount(1);
@@ -93,6 +99,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testTampaWithFileStreamAsBytes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:tampa");
mock.expectedMessageCount(1);
@@ -106,6 +113,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testTampaWithFileStreamAsDefault() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:tampa");
mock.expectedMessageCount(1);
@@ -119,6 +127,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testLondonWithStringSourceAsObject() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
@@ -136,6 +145,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testLondonWithStringSourceAsBytes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
@@ -153,6 +163,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testLondonWithStringSourceAsDefault() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PassThroughJmsKeyFormatStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PassThroughJmsKeyFormatStrategyTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PassThroughJmsKeyFormatStrategyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PassThroughJmsKeyFormatStrategyTest.java Fri Jun 19 11:46:34 2009
@@ -16,15 +16,17 @@
*/
package org.apache.camel.component.jms;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class PassThroughJmsKeyFormatStrategyTest extends TestCase {
+public class PassThroughJmsKeyFormatStrategyTest extends Assert {
private JmsKeyFormatStrategy strategy = new PassThroughJmsKeyFormatStrategy();
+ @Test
public void testEncodeValidKeys() {
assertEquals("foo", strategy.encodeKey("foo"));
assertEquals("foo123bar", strategy.encodeKey("foo123bar"));
@@ -34,6 +36,7 @@
assertEquals("My-Header.You", strategy.encodeKey("My-Header.You"));
}
+ @Test
public void testDeccodeValidKeys() {
assertEquals("foo", strategy.decodeKey("foo"));
assertEquals("foo123bar", strategy.decodeKey("foo123bar"));
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java Fri Jun 19 11:46:34 2009
@@ -27,9 +27,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
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.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
@@ -37,10 +38,11 @@
/**
* Unit test that we send payload as byte[] for certain types
*/
-public class PayloadByteArrayJmsTest extends ContextTestSupport {
+public class PayloadByteArrayJmsTest extends CamelTestSupport {
protected String componentName = "activemq";
+ @Test
public void testReaderShouldBeByteArray() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -54,6 +56,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testInputStreamShouldBeByteArray() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -67,6 +70,7 @@
assertMockEndpointsSatisfied();
}
+ @Test
public void testByteBufferShouldBeByteArray() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/TransactedJmsRouteTest.java Fri Jun 19 11:46:34 2009
@@ -22,7 +22,6 @@
import javax.jms.Session;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Route;
@@ -34,8 +33,13 @@
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.transaction.PlatformTransactionManager;
@@ -47,7 +51,7 @@
/**
* @version $Revision$
*/
-public class TransactedJmsRouteTest extends ContextTestSupport {
+public class TransactedJmsRouteTest extends CamelTestSupport {
// TODO: This is not a nice unit test. Please do not do like this. Big, confusing and takes long time to run
@@ -193,7 +197,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
for (Route route : this.context.getRoutes()) {
@@ -207,7 +212,8 @@
}
@Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
spring.destroy();
// Waiting for the broker shutdown
@@ -217,8 +223,9 @@
/**
* This test seems to be fail every other run.
*/
+ @Ignore
public void disabledtestSenarioF() throws Exception {
- String expected = getName() + ": " + System.currentTimeMillis();
+ String expected = "testSenarioF" + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(0);
mockEndpointB.expectedMinimumMessageCount(2);
mockEndpointC.expectedMessageCount(0);
@@ -234,15 +241,17 @@
assertIsSatisfied(mockEndpointA, mockEndpointB, mockEndpointC, mockEndpointD);
}
+ @Test
public void testSenarioA() throws Exception {
- String expected = getName() + ": " + System.currentTimeMillis();
+ String expected = "testSenarioA" + ": " + System.currentTimeMillis();
mockEndpointA.expectedBodiesReceived(expected);
sendBody("activemq:queue:a", expected);
assertIsSatisfied(mockEndpointA);
}
+ @Test
public void testSenarioB() throws Exception {
- String expected = getName() + ": " + System.currentTimeMillis();
+ String expected = "testSenarioB" + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(0);
// May be more since spring seems to go into tight loop re-delivering.
mockEndpointB.expectedMinimumMessageCount(2);
@@ -250,8 +259,9 @@
assertIsSatisfied(assertTimeoutSeconds, TimeUnit.SECONDS, mockEndpointA, mockEndpointB);
}
+ @Ignore
public void disabledtestSenarioC() throws Exception {
- String expected = getName() + ": " + System.currentTimeMillis();
+ String expected = "testSenarioD" + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(0);
// Should only get 1 message the incoming transaction does not rollback.
mockEndpointB.expectedMessageCount(1);
@@ -266,8 +276,9 @@
assertIsSatisfied(mockEndpointA, mockEndpointB);
}
+ @Ignore
public void disabledtestSenarioD() throws Exception {
- String expected = getName() + ": " + System.currentTimeMillis();
+ String expected = "testSenarioD" + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(1);
sendBody("activemq:queue:d", expected);
@@ -280,8 +291,9 @@
assertIsSatisfied(mockEndpointA);
}
+ @Ignore
public void disabledtestSenarioE() throws Exception {
- String expected = getName() + ": " + System.currentTimeMillis();
+ String expected = "testSenarioE" + ": " + System.currentTimeMillis();
mockEndpointA.expectedMessageCount(0);
mockEndpointB.expectedMessageCount(1);
sendBody("activemq:queue:e", expected);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/bind/JmsMessageBindTest.java Fri Jun 19 11:46:34 2009
@@ -19,14 +19,16 @@
import java.util.Map;
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.ClassPathXmlApplicationContext;
/**
* @version $Revision$
*/
-public class JmsMessageBindTest extends SpringTestSupport {
+public class JmsMessageBindTest extends CamelSpringTestSupport {
+ @Test
public void testSendAMessageToBean() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:result");
endpoint.expectedBodiesReceived("Completed");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/config/JmsEndpointWithCustomDestinationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/config/JmsEndpointWithCustomDestinationTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/config/JmsEndpointWithCustomDestinationTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/config/JmsEndpointWithCustomDestinationTest.java Fri Jun 19 11:46:34 2009
@@ -21,15 +21,20 @@
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* @version $Revision$
*/
@ContextConfiguration
-public class JmsEndpointWithCustomDestinationTest extends AbstractJUnit38SpringContextTests {
+public class JmsEndpointWithCustomDestinationTest extends AbstractJUnit4SpringContextTests {
@Produce(uri = "direct:start")
protected ProducerTemplate template;
@EndpointInject(uri = "mock:result")
@@ -39,6 +44,7 @@
private Object expectedBody = "<hello>world!</hello>";
+ @Test
public void testMessageSentToCustomEndpoint() throws Exception {
assertNotNull("jmsQueue", jmsQueue);
assertEquals("jmsqueue.getPhysicalName()", "Test.Camel.CustomEndpoint", jmsQueue.getPhysicalName());
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java Fri Jun 19 11:46:34 2009
@@ -23,17 +23,19 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
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.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
/**
* @version $Revision$
*/
-public class JmsDiscoveryTest extends ContextTestSupport {
+public class JmsDiscoveryTest extends CamelTestSupport {
protected MyRegistry registry = new MyRegistry();
+ @Test
public void testDiscovery() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(3);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java Fri Jun 19 11:46:34 2009
@@ -23,25 +23,27 @@
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.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsExchange;
import org.apache.camel.component.mock.AssertionClause;
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 ActiveMQPropagateHeadersTest extends ContextTestSupport {
+public class ActiveMQPropagateHeadersTest extends CamelTestSupport {
protected Object expectedBody = "<time>" + new Date() + "</time>";
protected ActiveMQQueue replyQueue = new ActiveMQQueue("test.reply.queue");
protected String correlationID = "ABC-123";
protected String messageType = getClass().getName();
+ @Test
public void testForwardingAMessageAcrossJMSKeepingCustomJMSHeaders() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BruceHandlingBeanExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BruceHandlingBeanExceptionTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BruceHandlingBeanExceptionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BruceHandlingBeanExceptionTest.java Fri Jun 19 11:46:34 2009
@@ -20,25 +20,31 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
+import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
/**
* Unit test for request-reply with jms where processing the input could cause: OK, FAULT or Exception
*/
-public class BruceHandlingBeanExceptionTest extends ContextTestSupport {
+public class BruceHandlingBeanExceptionTest extends CamelTestSupport {
+ @Test
public void testSendOK() throws Exception {
Object out = template.requestBody("activemq:queue:ok", "Hello World");
assertEquals("Bye World", out);
}
+ @Test
public void testSendFailure() throws Exception {
Object out = template.requestBody("activemq:queue:fault", "Hello World");
assertEquals("This is a fault message", out);
}
+ @Ignore
+ @Test
public void xxxtestSendError() throws Exception {
// TODO: See CAMEL-585
Object out = template.requestBody("activemq:queue:error", "Hello World");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java Fri Jun 19 11:46:34 2009
@@ -21,19 +21,21 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.Body;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
/**
* Unit test for sending the bean method name as a key over the JMS wire, that we now support this.
*/
-public class JmsBeanMethodHeaderTest extends ContextTestSupport {
+public class JmsBeanMethodHeaderTest extends CamelTestSupport {
+ @Test
public void testPlainHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -44,6 +46,7 @@
mock.assertIsSatisfied();
}
+ @Test
public void testUnderscoreHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -54,6 +57,7 @@
mock.assertIsSatisfied();
}
+ @Test
public void testUsingBeanNoJMS() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:approve");
mock.expectedBodiesReceived("Yes");
@@ -64,6 +68,7 @@
mock.assertIsSatisfied();
}
+ @Test
public void testUsingBeanAndJMS() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:approve");
mock.expectedBodiesReceived("Yes");
@@ -74,6 +79,7 @@
mock.assertIsSatisfied();
}
+ @Test
public void testUsingJMStoJMStoBean() throws Exception {
// the big one from jms to jms to test that we do not lost the bean method name
MockEndpoint mock = getMockEndpoint("mock:approve");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java Fri Jun 19 11:46:34 2009
@@ -23,18 +23,20 @@
import org.apache.activemq.ActiveMQConnectionFactory;
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 org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import static org.apache.camel.component.jms.JmsComponent.jmsComponent;
/**
* Concurrent consumer with JMSReply test.
*/
-public class JmsConcurrentConsumersTest extends ContextTestSupport {
+public class JmsConcurrentConsumersTest extends CamelTestSupport {
+ @Test
public void testConcurrentConsumersWithReply() throws Exception {
// latch for the 5 exchanges we expect
final CountDownLatch latch = new CountDownLatch(5);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java Fri Jun 19 11:46:34 2009
@@ -22,18 +22,20 @@
import org.apache.activemq.ActiveMQConnectionFactory;
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.junit4.CamelTestSupport;
+import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
/**
* Unit test for sending the filename for file producer over the JMS wire.
*/
-public class JmsFilenameHeaderTest extends ContextTestSupport {
+public class JmsFilenameHeaderTest extends CamelTestSupport {
+ @Test
public void testFileNameOverJMS() throws Exception {
String filename = "jmsfilenameheadertest.txt";
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHammerTest.java Fri Jun 19 11:46:34 2009
@@ -18,11 +18,12 @@
import org.apache.activemq.camel.component.ActiveMQComponent;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
import static org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
/**
@@ -30,7 +31,7 @@
*
* @version $Revision$
*/
-public class JmsHammerTest extends ContextTestSupport {
+public class JmsHammerTest extends CamelTestSupport {
private static final Log LOG = LogFactory.getLog(JmsHammerTest.class);
@@ -58,6 +59,7 @@
return camelContext;
}
+ @Test
public void testHammerJms() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(size);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java Fri Jun 19 11:46:34 2009
@@ -23,11 +23,14 @@
import org.apache.camel.ContextTestSupport;
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;
-public class JmsHeaderAsObjectTest extends ContextTestSupport {
+public class JmsHeaderAsObjectTest extends CamelTestSupport {
+ @Test
public void testSendHeaderAsPrimitiveOnly() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
@@ -42,6 +45,7 @@
mock.assertIsSatisfied();
}
+ @Test
public void testSendHeaderAsObject() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java Fri Jun 19 11:46:34 2009
@@ -22,24 +22,29 @@
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import static org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
/**
* Unit test from an user request on the forum.
*/
-public class JmsInOutPipelineWithBeanTest extends ContextTestSupport {
+public class JmsInOutPipelineWithBeanTest extends CamelTestSupport {
+ @Test
public void testA() throws Exception {
Object response = template.requestBody("activemq:testA", "Hello World");
assertEquals("Reply", "Hello World,From Bean,From A,From B", response);
}
+ @Test
public void testB() throws Exception {
Object response = template.requestBody("activemq:testB", "Hello World");
assertEquals("Reply", "Hello World,From A,From Bean,From B", response);
}
+ @Test
public void testC() throws Exception {
Object response = template.requestBody("activemq:testC", "Hello World");
assertEquals("Reply", "Hello World,From A,From B,From Bean", response);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMessageHeaderContentBasedRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMessageHeaderContentBasedRouterTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMessageHeaderContentBasedRouterTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMessageHeaderContentBasedRouterTest.java Fri Jun 19 11:46:34 2009
@@ -21,6 +21,8 @@
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
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;
/**
@@ -28,8 +30,9 @@
*
* @version $Revision$
*/
-public class JmsMessageHeaderContentBasedRouterTest extends ContextTestSupport {
+public class JmsMessageHeaderContentBasedRouterTest extends CamelTestSupport {
+ @Test
public void testCBR() throws Exception {
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsRedeliveryWithInitialRedeliveryDelayTest.java Fri Jun 19 11:46:34 2009
@@ -19,19 +19,21 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
* Unit test to verify DLC and JSM based on user reporting
*/
@ContextConfiguration
-public class JmsRedeliveryWithInitialRedeliveryDelayTest extends AbstractJUnit38SpringContextTests {
+public class JmsRedeliveryWithInitialRedeliveryDelayTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected CamelContext context;
+ @Test
public void testDLCSpringConfiguredRedeliveryPolicy() throws Exception {
MockEndpoint dead = context.getEndpoint("mock:dead", MockEndpoint.class);
MockEndpoint result = context.getEndpoint("mock:result", MockEndpoint.class);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsResequencerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsResequencerTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsResequencerTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsResequencerTest.java Fri Jun 19 11:46:34 2009
@@ -20,15 +20,18 @@
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
/**
* Unit test for issues CAMEL-1034 and CAMEL-1037
*/
@ContextConfiguration
-public class JmsResequencerTest extends AbstractJUnit38SpringContextTests {
+public class JmsResequencerTest extends AbstractJUnit4SpringContextTests {
@Autowired
protected CamelContext context;
@@ -38,18 +41,22 @@
protected ProducerTemplate template;
+ @Before
public void setUp() {
template = context.createProducerTemplate();
}
+ @After
public void tearDown() {
result.reset();
}
+ @Test
public void testBatchResequencer() throws Exception {
testResequencer("activemq:queue:in1");
}
-
+
+ @Test
public void testStreamResequencer() throws Exception {
testResequencer("activemq:queue:in2");
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java Fri Jun 19 11:46:34 2009
@@ -20,19 +20,21 @@
import org.apache.activemq.ActiveMQConnectionFactory;
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.jms.JmsMessage;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
/**
* Unit test to verify issue we had in Camel 1.4
*/
-public class JmsToFileMessageIdTest extends ContextTestSupport {
+public class JmsToFileMessageIdTest extends CamelTestSupport {
+ @Test
public void testFromJmsToFileAndMessageId() throws Exception {
// Mock endpoint to collect message at the end of the route
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java Fri Jun 19 11:46:34 2009
@@ -27,11 +27,12 @@
import org.apache.activemq.ActiveMQConnectionFactory;
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 static org.apache.camel.builder.xml.XPathBuilder.xpath;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
@@ -42,7 +43,7 @@
*
* @version $Revision$
*/
-public class JmsTypeConverterIssueTest extends ContextTestSupport {
+public class JmsTypeConverterIssueTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
@@ -53,6 +54,7 @@
return camelContext;
}
+ @Test
public void testJmsTypeConverterIssue() throws Exception {
String body = "<?xml version=\"1.0\"?><portal agent=\"123\"><id>456</id><name>Cool Portal</name></portal>";
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/LarsIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/LarsIssueTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/LarsIssueTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/LarsIssueTest.java Fri Jun 19 11:46:34 2009
@@ -20,13 +20,14 @@
import org.apache.activemq.ActiveMQConnectionFactory;
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.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
@@ -36,9 +37,10 @@
*
* @version $Revision$
*/
-public class LarsIssueTest extends ContextTestSupport {
+public class LarsIssueTest extends CamelTestSupport {
private static final transient Log LOG = LogFactory.getLog(LarsIssueTest.class);
+ @Test
public void testSendSomeMessages() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:results");
String body1 = "Hello world!";
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/MQSeriesHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/MQSeriesHeaderTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/MQSeriesHeaderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/MQSeriesHeaderTest.java Fri Jun 19 11:46:34 2009
@@ -24,11 +24,12 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
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.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
@@ -39,8 +40,9 @@
*
* @version $Revision$
*/
-public class MQSeriesHeaderTest extends ContextTestSupport {
+public class MQSeriesHeaderTest extends CamelTestSupport {
+ @Test
public void testForwardingJmsMessageIgnoresHeadersMQDoesntLike() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:result");
endpoint.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/TransactionErrorHandlerRedeliveryDelayTest.java Fri Jun 19 11:46:34 2009
@@ -21,15 +21,18 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertTrue;
/**
* Unit test for issue CAMEL-706
*/
@ContextConfiguration
-public class TransactionErrorHandlerRedeliveryDelayTest extends AbstractJUnit38SpringContextTests {
+public class TransactionErrorHandlerRedeliveryDelayTest extends AbstractJUnit4SpringContextTests {
private static int counter;
@@ -39,6 +42,7 @@
@EndpointInject(uri = "mock:result")
protected MockEndpoint result;
+ @Test
public void testTransactedRedeliveryDelay() throws Exception {
result.expectedMessageCount(1);
result.expectedBodiesReceived("Bye World");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/RemotingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/RemotingTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/RemotingTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/RemotingTest.java Fri Jun 19 11:46:34 2009
@@ -19,20 +19,24 @@
import javax.annotation.Resource;
import org.apache.camel.spring.remoting.ISay;
+import org.junit.Assert;
+import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
/**
* @version $Revision$
*/
@ContextConfiguration
-public class RemotingTest extends AbstractJUnit38SpringContextTests {
+public class RemotingTest extends AbstractJUnit4SpringContextTests {
@Resource
protected ISay sayProxy;
+ @Test
public void testInvokeRemoteClient() throws Exception {
String rc = sayProxy.say();
- assertEquals("Hello", rc);
+ Assert.assertEquals("Hello", rc);
}
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsProviderTest.java Fri Jun 19 11:46:34 2009
@@ -23,15 +23,17 @@
import org.apache.activemq.camel.component.ActiveMQComponent;
import org.apache.activemq.command.ActiveMQTempQueue;
import org.apache.activemq.command.ActiveMQTempTopic;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.component.jms.JmsConfiguration;
import org.apache.camel.component.jms.JmsEndpoint;
import org.apache.camel.component.jms.JmsProviderMetadata;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class JmsProviderTest extends ContextTestSupport {
+public class JmsProviderTest extends CamelTestSupport {
+ @Test
public void testTemporaryDestinationTypes() throws Exception {
JmsEndpoint endpoint = getMandatoryEndpoint("activemq:test.queue", JmsEndpoint.class);
JmsConfiguration configuration = endpoint.getConfiguration();
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryQueueRouteTest.java Fri Jun 19 11:46:34 2009
@@ -32,8 +32,10 @@
import org.apache.camel.component.jms.BrowsableQueueTest;
import org.apache.camel.component.jms.JmsQueueEndpoint;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
@@ -41,13 +43,14 @@
/**
* @version $Revision$
*/
-public class TemporaryQueueRouteTest extends ContextTestSupport {
+public class TemporaryQueueRouteTest extends CamelTestSupport {
private static final transient Log LOG = LogFactory.getLog(TemporaryQueueRouteTest.class);
protected String endpointUri = "activemq:temp:queue:cheese";
protected Object expectedBody = "<hello>world!</hello>";
protected MyBean myBean = new MyBean();
+ @Test
public void testSendMessage() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:result");
endpoint.expectedBodiesReceived("Result");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/TemporaryTopicRouteTest.java Fri Jun 19 11:46:34 2009
@@ -20,6 +20,7 @@
import org.apache.activemq.command.ActiveMQTempTopic;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
/**
* @version $Revision$
@@ -28,7 +29,8 @@
private static final transient Log LOG = LogFactory.getLog(TemporaryQueueRouteTest.class);
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
endpointUri = "activemq:temp:topic:cheese";
super.setUp();
}
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AbstractTransactionTest.java Fri Jun 19 11:46:34 2009
@@ -16,9 +16,7 @@
*/
package org.apache.camel.component.jms.tx;
-import org.apache.camel.CamelContext;
import org.apache.camel.Channel;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.impl.EventDrivenConsumerRoute;
@@ -27,8 +25,10 @@
import org.apache.camel.processor.DelegateProcessor;
import org.apache.camel.processor.Pipeline;
import org.apache.camel.spring.spi.TransactionErrorHandler;
-
-import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.junit.After;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
* Test case derived from:
@@ -38,22 +38,19 @@
*
* @author Kevin Ross
*/
-public abstract class AbstractTransactionTest extends ContextTestSupport {
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
+public abstract class AbstractTransactionTest extends CamelSpringTestSupport {
- protected void tearDown() throws Exception {
+
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
setCamelContextService(null);
context = null;
template = null;
}
- protected CamelContext createCamelContext() throws Exception {
- return createSpringCamelContext(this, "org/apache/camel/component/jms/tx/JavaDSLTransactionTest.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JavaDSLTransactionTest.xml");
}
protected void assertResult() throws InterruptedException {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionErrorHandlerTest.java Fri Jun 19 11:46:34 2009
@@ -19,13 +19,14 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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.ClassPathXmlApplicationContext;
/**
* To demonstrate transacted with minimal configuration.
*/
-public class JMSTransactionErrorHandlerTest extends SpringTestSupport {
+public class JMSTransactionErrorHandlerTest extends CamelSpringTestSupport {
protected ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
@@ -36,6 +37,7 @@
return 1;
}
+ @Test
public void testTransactionSuccess() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientTest.java Fri Jun 19 11:46:34 2009
@@ -19,13 +19,14 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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.ClassPathXmlApplicationContext;
/**
* Simple unit test for transaction client EIP pattern and JMS.
*/
-public class JMSTransactionalClientTest extends SpringTestSupport {
+public class JMSTransactionalClientTest extends CamelSpringTestSupport {
protected ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
@@ -36,6 +37,7 @@
return 1;
}
+ @Test
public void testTransactionSuccess() throws Exception {
// START SNIPPET: e1
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTransactionalClientWithRollbackTest.java Fri Jun 19 11:46:34 2009
@@ -19,13 +19,14 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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.ClassPathXmlApplicationContext;
/**
* Simple unit test for transaction client EIP pattern and JMS.
*/
-public class JMSTransactionalClientWithRollbackTest extends SpringTestSupport {
+public class JMSTransactionalClientWithRollbackTest extends CamelSpringTestSupport {
protected ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
@@ -36,6 +37,7 @@
return 1;
}
+ @Test
public void testTransactionSuccess() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/NonTransactedInOutForJmsWithTxnMgrTest.java Fri Jun 19 11:46:34 2009
@@ -17,18 +17,22 @@
package org.apache.camel.component.jms.tx;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.spring.SpringRouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class NonTransactedInOutForJmsWithTxnMgrTest extends ContextTestSupport {
+public class NonTransactedInOutForJmsWithTxnMgrTest extends CamelTestSupport {
private static final transient Log LOG = LogFactory.getLog(NonTransactedInOutForJmsWithTxnMgrTest.class);
private MyActiveMQConsumer consumer;
+ @Test
public void testJmsNonTransactedInOutWithTxnMgr() throws Exception {
for (int i = 0; i < 10; i++) {
String tmpStr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><aft>" + i + "</aft>";
@@ -54,8 +58,9 @@
}
};
}
-
- protected void setUp() throws Exception {
+ @Override
+ @Before
+ public void setUp() throws Exception {
super.setUp();
// start the jms consumer here
consumer = new MyActiveMQConsumer();
@@ -63,8 +68,9 @@
thread.start();
}
@Override
- protected void tearDown() throws Exception {
- log.debug("tearDown test: " + getName());
+ @After
+ public void tearDown() throws Exception {
+ log.debug("tearDown test: ");
Thread.sleep(2000);
consumer.close();
super.tearDown();
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java Fri Jun 19 11:46:34 2009
@@ -19,6 +19,7 @@
import org.apache.camel.spi.Policy;
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.junit.Test;
/**
* Test case derived from:
@@ -32,7 +33,12 @@
*
*/
public class QueueToProcessorTransactionTest extends AbstractTransactionTest {
+
+ protected int getExpectedRouteCount() {
+ return 0;
+ }
+ @Test
public void testRollbackUsingXmlQueueToProcessor() throws Exception {
// configure routes and add to camel context
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java Fri Jun 19 11:46:34 2009
@@ -24,6 +24,7 @@
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.apache.log4j.Logger;
+import org.junit.Test;
/**
* Test case derived from:
@@ -40,7 +41,12 @@
public class QueueToQueueRequestReplyTransactionTest extends AbstractTransactionTest {
private Logger log = Logger.getLogger(getClass());
+
+ protected int getExpectedRouteCount() {
+ return 0;
+ }
+ @Test
public void testRollbackUsingXmlQueueToQueueRequestReplyUsingDynamicMessageSelector() throws Exception {
JmsComponent c = (JmsComponent)context.getComponent("activemq");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java Fri Jun 19 11:46:34 2009
@@ -20,6 +20,7 @@
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.apache.log4j.Logger;
+import org.junit.Test;
/**
* Test case derived from:
@@ -35,7 +36,12 @@
public class QueueToQueueTransactionTest extends AbstractTransactionTest {
private Logger log = Logger.getLogger(getClass());
+
+ protected int getExpectedRouteCount() {
+ return 0;
+ }
+ @Test
public void testRollbackUsingXmlQueueToQueue() throws Exception {
// configure routes and add to camel context
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java Fri Jun 19 11:46:34 2009
@@ -16,21 +16,27 @@
*/
package org.apache.camel.component.jms.tx;
-import org.apache.camel.CamelContext;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.log4j.Logger;
-import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
public class QueueToQueueTransactionWithoutDefineTransactionManagerTest extends AbstractTransactionTest {
private Logger log = Logger.getLogger(getClass());
- protected CamelContext createCamelContext() throws Exception {
-
- return createSpringCamelContext(this, "org/apache/camel/component/jms/tx/ActiveMQWithoutTransactionManager.xml");
+ protected int getExpectedRouteCount() {
+ return 0;
}
-
+
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/ActiveMQWithoutTransactionManager.xml");
+ }
+
+ @Ignore
public void xtestRollbackUsingXmlQueueToQueue() throws Exception {
// configure routes and add to camel context
@@ -52,6 +58,7 @@
endpoint.assertIsSatisfied();
}
+ @Test
public void testNoTransactionRollbackUsingXmlQueueToQueue() throws Exception {
// configure routes and add to camel context
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java Fri Jun 19 11:46:34 2009
@@ -19,13 +19,14 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
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.ClassPathXmlApplicationContext;
/**
* To demonstrate the TransactionErrorHandlerBuilder configured in Spring XML.
*/
-public class TransactionErrorHandlerBuilderAsSpringBeanTest extends SpringTestSupport {
+public class TransactionErrorHandlerBuilderAsSpringBeanTest extends CamelSpringTestSupport {
protected ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
@@ -36,6 +37,7 @@
return 1;
}
+ @Test
public void testTransactionSuccess() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionMinimalConfigurationTest.java Fri Jun 19 11:46:34 2009
@@ -19,13 +19,15 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spring.SpringTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* To demonstrate transacted with minimal configuration.
*/
-public class TransactionMinimalConfigurationTest extends SpringTestSupport {
+public class TransactionMinimalConfigurationTest extends CamelSpringTestSupport {
protected ClassPathXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
@@ -36,6 +38,7 @@
return 1;
}
+ @Test
public void testTransactionSuccess() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/XMLQueueToProcessorTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/XMLQueueToProcessorTransactionTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/XMLQueueToProcessorTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/XMLQueueToProcessorTransactionTest.java Fri Jun 19 11:46:34 2009
@@ -17,9 +17,10 @@
package org.apache.camel.component.jms.tx;
-import org.apache.camel.CamelContext;
import org.apache.log4j.Logger;
-import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
@@ -37,12 +38,11 @@
private Logger log = Logger.getLogger(getClass());
- protected CamelContext createCamelContext() throws Exception {
-
- return createSpringCamelContext(this,
- "org/apache/camel/component/jms/tx/XMLQueueToProcessorTransactionTest.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/XMLQueueToProcessorTransactionTest.xml");
}
-
+
+ @Test
public void testRollbackUsingXmlQueueToQueue() throws Exception {
// routes should have been configured via xml and added to the camel
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/XMLQueueToQueueTransactionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/XMLQueueToQueueTransactionTest.java?rev=786464&r1=786463&r2=786464&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/XMLQueueToQueueTransactionTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/XMLQueueToQueueTransactionTest.java Fri Jun 19 11:46:34 2009
@@ -16,9 +16,10 @@
*/
package org.apache.camel.component.jms.tx;
-import org.apache.camel.CamelContext;
import org.apache.log4j.Logger;
-import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
@@ -36,12 +37,11 @@
private Logger log = Logger.getLogger(getClass());
- protected CamelContext createCamelContext() throws Exception {
-
- return createSpringCamelContext(this,
- "org/apache/camel/component/jms/tx/XMLQueueToQueueTransactionTest.xml");
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/XMLQueueToQueueTransactionTest.xml");
}
-
+
+ @Test
public void testRollbackUsingXmlQueueToQueue() throws Exception {
// routes should have been configured via xml and added to the camel