Author: davsclaus Date: Wed Jul 4 09:16:53 2012 New Revision: 1357188 URL: http://svn.apache.org/viewvc?rev=1357188&view=rev Log: Added test based on user forum issue
Added: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssue2Test.java - copied, changed from r1357182, camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java Added: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java?rev=1357188&view=auto ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java (added) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalssueTest.java Wed Jul 4 09:16:53 2012 @@ -0,0 +1,70 @@ +/** + * 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.bindy.csv2; + +import java.util.List; +import java.util.Map; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat; +import org.apache.camel.model.dataformat.BindyType; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +/** + * + */ +public class BindyMarshalUnmarshalssueTest extends CamelTestSupport { + + @Test + public void testMarshalUnmarshal() throws Exception { + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMessageCount(1); + + WeatherModel body = new WeatherModel(); + body.setId(123); + body.setPlace("Central California"); + body.setDate("Wednesday November 9 2011"); + template.sendBody("direct:start", body); + + assertMockEndpointsSatisfied(); + + Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0); + WeatherModel model = (WeatherModel) map.values().iterator().next(); + + assertEquals(123, model.getId()); + assertEquals("Wednesday November 9 2011", model.getDate()); + assertEquals("Central California", model.getPlace()); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:start") + .marshal().bindy(BindyType.Csv, "org.apache.camel.dataformat.bindy.csv2") + .to("direct:middle"); + + from("direct:middle") + .unmarshal(new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.csv2")) + .to("mock:result"); + } + }; + } +} Copied: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssue2Test.java (from r1357182, camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssue2Test.java?p2=camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssue2Test.java&p1=camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java&r1=1357182&r2=1357188&rev=1357188&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssue2Test.java Wed Jul 4 09:16:53 2012 @@ -16,91 +16,13 @@ */ package org.apache.camel.dataformat.bindy.csv2; -import java.util.List; -import java.util.Map; - import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.model.dataformat.BindyType; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat; /** - * cd wo + * */ -public class BindyUnmarshalCommaIssueTest extends CamelTestSupport { - - @Test - public void testBindyUnmarshalNoCommaIssue() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - - String body = "123,\"Wednesday November 9 2011\",\"Central California\""; - template.sendBody("direct:start", body); - - assertMockEndpointsSatisfied(); - - Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0); - WeatherModel model = (WeatherModel) map.values().iterator().next(); - - assertEquals(123, model.getId()); - assertEquals("Wednesday November 9 2011", model.getDate()); - assertEquals("Central California", model.getPlace()); - } - - @Test - public void testBindyUnmarshalCommaIssue() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - - String body = "123,\"Wednesday, November 9, 2011\",\"Central California\""; - template.sendBody("direct:start", body); - - assertMockEndpointsSatisfied(); - - Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0); - WeatherModel model = (WeatherModel) map.values().iterator().next(); - - assertEquals(123, model.getId()); - assertEquals("Wednesday, November 9, 2011", model.getDate()); - assertEquals("Central California", model.getPlace()); - } - - @Test - public void testBindyUnmarshalCommaIssueTwo() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - - String body = "123,\"Wednesday, November 9, 2011\",\"Central California, United States\""; - template.sendBody("direct:start", body); - - assertMockEndpointsSatisfied(); - - Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0); - WeatherModel model = (WeatherModel) map.values().iterator().next(); - - assertEquals(123, model.getId()); - assertEquals("Wednesday, November 9, 2011", model.getDate()); - assertEquals("Central California, United States", model.getPlace()); - } - - @Test - public void testBindyUnmarshalSingleQuoteCommaIssueTwo() throws Exception { - MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMessageCount(1); - - String body = "123,'Wednesday, November 9, 2011','Central California, United States'"; - template.sendBody("direct:start", body); - - assertMockEndpointsSatisfied(); - - Map<?, ?> map = (Map<?, ?>) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0); - WeatherModel model = (WeatherModel) map.values().iterator().next(); - - assertEquals(123, model.getId()); - assertEquals("Wednesday, November 9, 2011", model.getDate()); - assertEquals("Central California, United States", model.getPlace()); - } +public class BindyUnmarshalCommaIssue2Test extends BindyUnmarshalCommaIssueTest { @Override protected RouteBuilder createRouteBuilder() throws Exception { @@ -108,7 +30,7 @@ public class BindyUnmarshalCommaIssueTes @Override public void configure() throws Exception { from("direct:start") - .unmarshal().bindy(BindyType.Csv, "org.apache.camel.dataformat.bindy.csv2") + .unmarshal(new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.csv2")) .to("mock:result"); } }; Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java?rev=1357188&r1=1357187&r2=1357188&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyUnmarshalCommaIssueTest.java Wed Jul 4 09:16:53 2012 @@ -26,7 +26,7 @@ import org.apache.camel.test.junit4.Came import org.junit.Test; /** - * cd wo + * */ public class BindyUnmarshalCommaIssueTest extends CamelTestSupport {