You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2008/03/27 16:23:43 UTC
svn commit: r641845 - in /activemq/camel/trunk/components/camel-jms: ./
src/test/java/org/apache/camel/component/jms/
Author: jstrachan
Date: Thu Mar 27 08:23:39 2008
New Revision: 641845
URL: http://svn.apache.org/viewvc?rev=641845&view=rev
Log:
fixed up some failing JMS test cases
Added:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithObjectMessageTest.java
- copied, changed from r641728, activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
Modified:
activemq/camel/trunk/components/camel-jms/pom.xml
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
Modified: activemq/camel/trunk/components/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/pom.xml?rev=641845&r1=641844&r2=641845&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jms/pom.xml Thu Mar 27 08:23:39 2008
@@ -116,6 +116,7 @@
<configuration>
<childDelegation>false</childDelegation>
<useFile>true</useFile>
+ <forkMode>pertest</forkMode>
</configuration>
</plugin>
Modified: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java?rev=641845&r1=641844&r2=641845&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java Thu Mar 27 08:23:39 2008
@@ -19,6 +19,7 @@
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
@@ -31,6 +32,7 @@
*/
public class JmsQosRouteTest extends ContextTestSupport {
protected String componentName = "activemq";
+ protected BrokerService brokerService;
public void testJmsRoutePreserveQos() throws Exception {
@@ -67,13 +69,23 @@
@Override
protected void setUp() throws Exception {
+ brokerService = new BrokerService();
+ brokerService.setPersistent(false);
+ brokerService.start();
+
super.setUp();
}
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ brokerService.stop();
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+ ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost");
camelContext.addComponent(componentName, jmsComponentClientAcknowledge(connectionFactory));
return camelContext;
Modified: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java?rev=641845&r1=641844&r2=641845&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java Thu Mar 27 08:23:39 2008
@@ -34,20 +34,11 @@
protected String componentName = "activemq";
protected String startEndpointUri;
- public void testJmsRouteWithTextMessage() throws Exception {
- String expectedBody = "Hello there!";
-
- resultEndpoint.expectedBodiesReceived(expectedBody);
- resultEndpoint.message(0).header("cheese").isEqualTo(123);
-
- sendExchange(expectedBody);
-
- resultEndpoint.assertIsSatisfied();
+ public void testSendAndReceiveMessage() throws Exception {
+ assertSendAndReceiveBody("Hello there!");
}
- public void testJmsRouteWithObjectMessage() throws Exception {
- PurchaseOrder expectedBody = new PurchaseOrder("Beer", 10);
-
+ protected void assertSendAndReceiveBody(Object expectedBody) throws InterruptedException {
resultEndpoint.expectedBodiesReceived(expectedBody);
resultEndpoint.message(0).header("cheese").isEqualTo(123);
Copied: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithObjectMessageTest.java (from r641728, activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithObjectMessageTest.java?p2=activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithObjectMessageTest.java&p1=activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java&r1=641728&r2=641845&rev=641845&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithObjectMessageTest.java Thu Mar 27 08:23:39 2008
@@ -29,62 +29,11 @@
/**
* @version $Revision$
*/
-public class JmsRouteTest extends ContextTestSupport {
- protected MockEndpoint resultEndpoint;
- protected String componentName = "activemq";
- protected String startEndpointUri;
-
- public void testJmsRouteWithTextMessage() throws Exception {
- String expectedBody = "Hello there!";
-
- resultEndpoint.expectedBodiesReceived(expectedBody);
- resultEndpoint.message(0).header("cheese").isEqualTo(123);
-
- sendExchange(expectedBody);
-
- resultEndpoint.assertIsSatisfied();
- }
-
- public void testJmsRouteWithObjectMessage() throws Exception {
- PurchaseOrder expectedBody = new PurchaseOrder("Beer", 10);
-
- resultEndpoint.expectedBodiesReceived(expectedBody);
- resultEndpoint.message(0).header("cheese").isEqualTo(123);
-
- sendExchange(expectedBody);
-
- resultEndpoint.assertIsSatisfied();
- }
-
- protected void sendExchange(final Object expectedBody) {
- template.sendBodyAndHeader(startEndpointUri, expectedBody, "cheese", 123);
- }
-
+public class JmsRouteWithObjectMessageTest extends JmsRouteTest {
@Override
- protected void setUp() throws Exception {
- startEndpointUri = componentName + ":queue:test.a";
-
- super.setUp();
-
- resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
- }
-
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
- camelContext.addComponent(componentName, jmsComponentClientAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() throws Exception {
- from(startEndpointUri).to(componentName + ":queue:test.b");
- from(componentName + ":queue:test.b").to("mock:result");
- }
- };
+ public void testSendAndReceiveMessage() throws Exception {
+ assertSendAndReceiveBody(new PurchaseOrder("Beer", 10));
}
-}
+
+}
\ No newline at end of file