Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-3967: Fixed unit test after upgrading Camel 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378100 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Claus Ibsen 2012-08-28 12:19:07 +00:00
parent b496c0a38c
commit 3a3416caa7
3 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-camel/pom.xml
View File

@ -213,8 +213,6 @@
</systemProperties>
<excludes>
<exclude>**/JmsJdbcXALoadTest.java</exclude><!-- used only for manual xa performance testing -->
<!-- This currently fails with Camel 2.10-->
<exclude>**/ActiveMQJmsHeaderRouteTest.*</exclude>
</excludes>
</configuration>
</plugin>

49
activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteForceTest.java Normal file
View File

@ -0,0 +1,49 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.camel.component;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsMessage;
/**
*
*/
public class ActiveMQJmsHeaderRouteForceTest extends ActiveMQJmsHeaderRouteTest {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
// do not map jms message as we want to tamper with the JMS message directly, and not use the Camel API for that
from("activemq:test.a?mapJmsMessage=false").process(new Processor() {
public void process(Exchange exchange) throws Exception {
// lets set the custom JMS headers using the JMS API
JmsMessage jmsMessage = assertIsInstanceOf(JmsMessage.class, exchange.getIn());
jmsMessage.getJmsMessage().setJMSReplyTo(replyQueue);
jmsMessage.getJmsMessage().setJMSCorrelationID(correlationID);
jmsMessage.getJmsMessage().setJMSType(messageType); }
// force sending the incoming JMS Message, as we want to tamper with the JMS API directly
// instead of using the Camel API for setting JMS headers.
}).to("activemq:test.b?preserveMessageQos=true&forceSendOriginalMessage=true");
from("activemq:test.b").to("mock:result");
}
};
}
}

24
activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQJmsHeaderRouteTest.java
View File

@ -18,11 +18,12 @@ package org.apache.activemq.camel.component;
import java.util.Date;
import java.util.List;
import javax.jms.Destination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.component.mock.MockEndpoint;
@ -30,6 +31,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.activemq.camel.component.ActiveMQComponent.activeMQComponent;
/**
@ -56,11 +58,9 @@ public class ActiveMQJmsHeaderRouteTest extends CamelTestSupport {
template.sendBodyAndHeader("activemq:test.a", expectedBody, "cheese", 123);
resultEndpoint.setResultWaitTime(10000);
//resultEndpoint.assertIsSatisfied();
resultEndpoint.assertIsSatisfied();
List<Exchange> list = resultEndpoint.getReceivedExchanges();
System.err.println("The lisr = " + list);
Exchange exchange = list.get(0);
Object replyTo = exchange.getIn().getHeader("JMSReplyTo");
LOG.info("Reply to is: " + replyTo);
@ -82,25 +82,17 @@ public class ActiveMQJmsHeaderRouteTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
/***
from("activemq:test.a").process(new Processor() {
public void process(Exchange exchange) throws Exception {
// lets set the custom JMS headers using the JMS API
JmsMessage jmsMessage = assertIsInstanceOf(JmsMessage.class, exchange.getIn());
jmsMessage.getJmsMessage().setJMSReplyTo(replyQueue);
jmsMessage.getJmsMessage().setJMSCorrelationID(correlationID);
jmsMessage.getJmsMessage().setJMSType(messageType);
// lets set the custom JMS headers using the Camel API
exchange.getIn().setHeader("JMSReplyTo", replyQueue);
exchange.getIn().setHeader("JMSCorrelationID", correlationID);
exchange.getIn().setHeader("JMSType", messageType);
}
}).to("activemq:test.b?preserveMessageQos=true");
from("activemq:test.b").to("mock:result");
*/
from("activemq:test.b").to("mock:result");
from("activemq:test.a").to("activemq:test.b?preserveMessageQos=true");
}
};
}