camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r679281 - in /activemq/camel/trunk/components/camel-xstream: pom.xml src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java src/test/resources/log4j.properties
Date Thu, 24 Jul 2008 06:01:27 GMT
Author: davsclaus
Date: Wed Jul 23 23:01:26 2008
New Revision: 679281

URL: http://svn.apache.org/viewvc?rev=679281&view=rev
Log:
CAMEL-749: Upgraded xstream to v1.3. Added unit test to verify CAMEL-744.

Added:
    activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
  (with props)
Modified:
    activemq/camel/trunk/components/camel-xstream/pom.xml
    activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties

Modified: activemq/camel/trunk/components/camel-xstream/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/pom.xml?rev=679281&r1=679280&r2=679281&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xstream/pom.xml (original)
+++ activemq/camel/trunk/components/camel-xstream/pom.xml Wed Jul 23 23:01:26 2008
@@ -44,9 +44,9 @@
       <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>xstream</groupId>
+      <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.1.3</version>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>stax</groupId>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>wstx-asl</artifactId>
-      <version>3.2.1</version>
+      <version>3.2.6</version>
       <scope>test</scope>
     </dependency>
 
@@ -83,6 +83,7 @@
       <artifactId>log4j</artifactId>
       <scope>test</scope>
     </dependency>
+
     <!-- to allow Spring annotations (jmx) to be tested -->
     <dependency>
       <groupId>org.springframework</groupId>

Added: activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java?rev=679281&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
(added)
+++ activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
Wed Jul 23 23:01:26 2008
@@ -0,0 +1,72 @@
+/**
+ * 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.dataformat.xstream;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * Marhsal tests with List objects.
+ */
+public class MarshalListTest extends ContextTestSupport {
+
+    public void testMarshalList() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+        mock.expectedBodiesReceived( "<?xml version='1.0' encoding='UTF-8'?>"
+            + "<list><string>Hello World</string></list>");
+
+        List<String> body = new ArrayList<String>();
+        body.add("Hello World");
+
+        template.sendBody("direct:in", body);
+
+        mock.assertIsSatisfied();
+    }
+
+    public void testMarshalListWithMap() throws Exception {
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMessageCount(1);
+        mock.expectedBodiesReceived(
+            "<?xml version='1.0' encoding='UTF-8'?><list><map><entry><string>city</string>"
+                + "<string>London</string></entry></map></list>");
+
+        List<Map<Object, String>> body = new ArrayList<Map<Object, String>>();
+        Map<Object, String> row = new HashMap<Object, String>();
+        row.put("city", "London");
+        body.add(row);
+
+        template.sendBody("direct:in", body);
+
+        mock.assertIsSatisfied();
+    }
+
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() throws Exception {
+                from("direct:in").marshal().xstream().to("mock:result");
+            }
+        };
+    }
+
+}

Propchange: activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties?rev=679281&r1=679280&r2=679281&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties (original)
+++ activemq/camel/trunk/components/camel-xstream/src/test/resources/log4j.properties Wed
Jul 23 23:01:26 2008
@@ -18,7 +18,7 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=INFO, file
+log4j.rootLogger=INFO, out
 
 log4j.logger.org.apache.activemq.spring=WARN
 
@@ -33,3 +33,5 @@
 log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
 log4j.appender.out.file=target/camel-xstream-test.log
 log4j.appender.out.append=true
+
+log4j.logger.org.apache.camel=DEBUG



Mime
View raw message