camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r782887 - in /camel/branches/camel-1.x: ./ components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java
Date Tue, 09 Jun 2009 06:00:03 GMT
Author: davsclaus
Date: Tue Jun  9 06:00:03 2009
New Revision: 782887

URL: http://svn.apache.org/viewvc?rev=782887&view=rev
Log:
Merged revisions 782886 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r782886 | davsclaus | 2009-06-09 07:52:46 +0200 (Tue, 09 Jun 2009) | 1 line
  
  Added unit test based on user forum issue
........

Added:
    camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java
  (with props)
Modified:
    camel/branches/camel-1.x/   (props changed)

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  9 06:00:03 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 923,781974,781993,782557,782594,782681
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
 923,781974,781993,782557,782594,782681,782886

Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Added: camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java?rev=782887&view=auto
==============================================================================
--- camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java
(added)
+++ camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java
Tue Jun  9 06:00:03 2009
@@ -0,0 +1,143 @@
+/**
+ * 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.camel.component.jms.issues;
+
+import java.io.File;
+import javax.jms.ConnectionFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+
+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.file.FileComponent;
+import org.apache.camel.component.mock.MockEndpoint;
+
+import static org.apache.camel.builder.xml.XPathBuilder.xpath;
+import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
+import static org.apache.camel.language.simple.SimpleLanguage.simple;
+
+/**
+ * Unit test based on user forum issue.
+ *
+ * @version $Revision$
+ */
+public class JmsTypeConverterIssueTest extends ContextTestSupport {
+
+    protected CamelContext createCamelContext() throws Exception {
+        CamelContext camelContext = super.createCamelContext();
+
+        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+        camelContext.addComponent("activemq", jmsComponentClientAcknowledge(connectionFactory));
+
+        return camelContext;
+    }
+
+    public void testJmsTypeConverterIssue() throws Exception {
+        String body = "<?xml version=\"1.0\"?><portal agent=\"123\"><id>456</id><name>Cool
Portal</name></portal>";
+
+        // create local file
+        deleteDirectory("./target/files");
+        template.sendBodyAndHeader("file://target/files/123", body, FileComponent.HEADER_FILE_NAME,
"agent.xml");
+
+        MockEndpoint filter = getMockEndpoint("mock:filterxml");
+        filter.expectedMessageCount(1);
+        filter.message(0).body().isInstanceOf(Document.class);
+
+        getMockEndpoint("mock:portalxml").expectedMessageCount(1);
+        getMockEndpoint("mock:historyxml").expectedMessageCount(1);
+
+        template.sendBody("activemq:queue:inbox", "<?xml version=\"1.0\"?><agent
id=\"123\"></agent>");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("activemq:queue:inbox")
+                        .setProperty(Exchange.CHARSET_NAME, constant("UTF-8"))
+                        .setHeader("agentId", xpath("/agent/@id"))
+                        .process(new FixateHeaderValuesProcessor())
+                        .setHeader(FileComponent.HEADER_FILE_NAME, simple("target/files/${in.header.agentId}/agent.xml"))
+                        .process(new ReadLocalFile())
+                        .to("direct:filterxml")
+                        .multicast().to("direct:portalxml", "direct:historyxml");
+
+                from("direct:filterxml")
+                        .process(new FilterProcessor())
+                        .to("mock:filterxml");
+
+                from("direct:portalxml")
+                        .to("mock:portalxml");
+
+                from("direct:historyxml")
+                        .to("mock:historyxml");
+            }
+        };
+    }
+
+    private class FixateHeaderValuesProcessor implements Processor {
+        public void process(Exchange exchange) throws Exception {
+            String id = exchange.getIn().getHeader("agentId", String.class);
+            exchange.getIn().setHeader("agentId", id);
+        }
+    }
+
+    private class ReadLocalFile implements Processor {
+        public void process(Exchange exchange) throws Exception {
+            String filename = exchange.getIn().getHeader(FileComponent.HEADER_FILE_NAME,
String.class);
+            exchange.getIn().setBody(new File(filename));
+        }
+    }
+
+    private class FilterProcessor implements Processor {
+        public void process(Exchange exchange) throws Exception {
+            Document document = exchange.getIn().getBody(Document.class);
+            assertNotNull("Should be able to convert to XML Document", document);
+
+            XPathFactory factory = XPathFactory.newInstance();
+            XPath xpath = factory.newXPath();
+
+            String id = exchange.getIn().getHeader("agentId", String.class);
+            String expr = "//portal[/portal/@agent = '" + id + "']";
+
+            NodeList nodes = (NodeList) xpath.compile(expr).evaluate(document, XPathConstants.NODESET);
+            assertNotNull("Should be able to do xpath", nodes);
+            assertEquals(1, nodes.getLength());
+
+            String portalId = nodes.item(0).getFirstChild().getTextContent();
+            String portalName = nodes.item(0).getLastChild().getTextContent();
+
+            assertEquals("456", portalId);
+            assertEquals("Cool Portal", portalName);
+
+            exchange.getIn().setHeader("portalId", portalId);
+            exchange.getIn().setBody(document);
+        }
+    }
+
+}

Propchange: camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/branches/camel-1.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsTypeConverterIssueTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message