You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/03/01 09:43:23 UTC
svn commit: r1075707 - in /camel/trunk/components/camel-jaxb: ./
src/test/java/org/apache/camel/jaxb/ src/test/resources/
Author: davsclaus
Date: Tue Mar 1 08:43:23 2011
New Revision: 1075707
URL: http://svn.apache.org/viewvc?rev=1075707&view=rev
Log:
CAMEL-3729: Added test for jaxb issue when using spring java config.
Added:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueUsingSpringJavaConfigTest.java
Modified:
camel/trunk/components/camel-jaxb/pom.xml
camel/trunk/components/camel-jaxb/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/pom.xml?rev=1075707&r1=1075706&r2=1075707&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/pom.xml (original)
+++ camel/trunk/components/camel-jaxb/pom.xml Tue Mar 1 08:43:23 2011
@@ -64,6 +64,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-javaconfig</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
<scope>test</scope>
</dependency>
@@ -88,6 +93,11 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Added: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java?rev=1075707&view=auto
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java (added)
+++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java Tue Mar 1 08:43:23 2011
@@ -0,0 +1,71 @@
+/**
+ * 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.jaxb;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.converter.jaxb.JaxbDataFormat;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class JaxbDataFormatIssueTest extends CamelTestSupport {
+
+ @Test
+ public void testJaxbMarshalling() throws InterruptedException {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().endsWith("<foo><bar>Hello Bar</bar></foo>");
+
+ Foo foo = new Foo();
+ foo.setBar("Hello Bar");
+ template.sendBody("direct:start", foo);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ JaxbDataFormat jaxb = new JaxbDataFormat(JAXBContext.newInstance(Foo.class));
+ jaxb.setPrettyPrint(false);
+
+ from("direct:start").marshal(jaxb).to("log:xml", "mock:result");
+ }
+ };
+ }
+
+ @XmlRootElement
+ public static class Foo {
+ private String bar;
+
+ public String getBar() {
+ return bar;
+ }
+
+ public void setBar(String bar) {
+ this.bar = bar;
+ }
+ }
+}
Added: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueUsingSpringJavaConfigTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueUsingSpringJavaConfigTest.java?rev=1075707&view=auto
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueUsingSpringJavaConfigTest.java (added)
+++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueUsingSpringJavaConfigTest.java Tue Mar 1 08:43:23 2011
@@ -0,0 +1,93 @@
+/**
+ * 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.jaxb;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.converter.jaxb.JaxbDataFormat;
+import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
+import org.apache.camel.spring.javaconfig.test.JavaConfigContextLoader;
+import org.junit.Test;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+/**
+ *
+ */
+@ContextConfiguration(locations = "org.apache.camel.jaxb.JaxbDataFormatIssueUsingSpringJavaConfigTest$ContextConfig",
+ loader = JavaConfigContextLoader.class)
+public class JaxbDataFormatIssueUsingSpringJavaConfigTest extends AbstractJUnit4SpringContextTests {
+
+ @EndpointInject(uri = "mock:result")
+ protected MockEndpoint mock;
+
+ @Produce(uri = "direct:start")
+ protected ProducerTemplate template;
+
+ @Test
+ @DirtiesContext
+ public void testJaxbMarshalling() throws InterruptedException {
+ mock.expectedMessageCount(1);
+ mock.message(0).body().endsWith("<foo><bar>Hello Bar</bar></foo>");
+
+ Foo foo = new Foo();
+ foo.setBar("Hello Bar");
+ template.sendBody("direct:start", foo);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Configuration
+ public static class ContextConfig extends SingleRouteCamelConfiguration {
+
+ @Bean
+ public RouteBuilder route() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ JaxbDataFormat jaxb = new JaxbDataFormat(JAXBContext.newInstance(Foo.class));
+ jaxb.setPrettyPrint(false);
+
+ from("direct:start").marshal(jaxb).to("log:xml", "mock:result");
+ }
+ };
+
+ }
+ }
+
+ @XmlRootElement
+ public static class Foo {
+ private String bar;
+
+ public String getBar() {
+ return bar;
+ }
+
+ public void setBar(String bar) {
+ this.bar = bar;
+ }
+ }
+}
Modified: camel/trunk/components/camel-jaxb/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/resources/log4j.properties?rev=1075707&r1=1075706&r2=1075707&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-jaxb/src/test/resources/log4j.properties Tue Mar 1 08:43:23 2011
@@ -16,14 +16,12 @@
## ---------------------------------------------------------------------------
#
-# The logging properties used during tests..
+# The logging properties used during tests
#
-log4j.rootLogger=DEBUG, file
+log4j.rootLogger=INFO, file
# uncomment this to turn on debug of camel
-log4j.logger.org.apache.camel=DEBUG
-
-log4j.logger.org.apache.activemq.spring=WARN
+#log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
log4j.appender.stdout=org.apache.log4j.ConsoleAppender