CAMEL-7716 Fixed unit test errors in unix
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c05164c8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c05164c8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c05164c8 Branch: refs/heads/master Commit: c05164c8936254c791e2a3d289a34c0a312c24c6 Parents: 28c1a5a Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu Nov 27 17:42:44 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu Nov 27 17:42:44 2014 +0800 ---------------------------------------------------------------------- .../dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java | 8 ++++---- .../dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java | 4 ++-- .../camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c05164c8/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java index 2ec2ada..4665ddd 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java @@ -51,8 +51,8 @@ public class CsvMarshalAutogenColumnsSpringTest extends CamelSpringTestSupport { String body = result.getReceivedExchanges().get(0).getIn().getBody(String.class); String[] lines = body.split(System.lineSeparator()); assertEquals(2, lines.length); - assertEquals("Camel in Action", lines[0]); - assertEquals("ActiveMQ in Action", lines[1]); + assertEquals("Camel in Action", lines[0].trim()); + assertEquals("ActiveMQ in Action", lines[1].trim()); } @Test @@ -66,8 +66,8 @@ public class CsvMarshalAutogenColumnsSpringTest extends CamelSpringTestSupport { String body = result2.getReceivedExchanges().get(0).getIn().getBody(String.class); String[] lines = body.split(System.lineSeparator()); assertEquals(2, lines.length); - assertEquals("123|1", lines[0]); - assertEquals("124|2", lines[1]); + assertEquals("123|1", lines[0].trim()); + assertEquals("124|2", lines[1].trim()); } private static List<Map<String, Object>> createBody() { http://git-wip-us.apache.org/repos/asf/camel/blob/c05164c8/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java index 0db70ae..8d39fb2 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterSpringTest.java @@ -48,8 +48,8 @@ public class CsvMarshalPipeDelimiterSpringTest extends CamelSpringTestSupport { String.class); String[] lines = body.split(System.lineSeparator()); assertEquals(2, lines.length); - assertEquals("123|Camel in Action|1", lines[0]); - assertEquals("124|ActiveMQ in Action|2", lines[1]); + assertEquals("123|Camel in Action|1", lines[0].trim()); + assertEquals("124|ActiveMQ in Action|2", lines[1].trim()); } private List<Map<String, Object>> createBody() { http://git-wip-us.apache.org/repos/asf/camel/blob/c05164c8/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java index ad88927..8762505 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalPipeDelimiterTest.java @@ -45,8 +45,8 @@ public class CsvMarshalPipeDelimiterTest extends CamelTestSupport { String.class); String[] lines = body.split(System.lineSeparator()); assertEquals(2, lines.length); - assertEquals("123|Camel in Action|1", lines[0]); - assertEquals("124|ActiveMQ in Action|2", lines[1]); + assertEquals("123|Camel in Action|1", lines[0].trim()); + assertEquals("124|ActiveMQ in Action|2", lines[1].trim()); } private List<Map<String, Object>> createBody() {