Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B541718E73 for ; Sat, 5 Dec 2015 09:02:46 +0000 (UTC) Received: (qmail 30466 invoked by uid 500); 5 Dec 2015 09:02:46 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 30352 invoked by uid 500); 5 Dec 2015 09:02:46 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 30160 invoked by uid 99); 5 Dec 2015 09:02:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Dec 2015 09:02:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4A343E0AFE; Sat, 5 Dec 2015 09:02:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Sat, 05 Dec 2015 09:02:51 -0000 Message-Id: In-Reply-To: <2daa1dfc5e604785ac6eceaa89b4cc30@git.apache.org> References: <2daa1dfc5e604785ac6eceaa89b4cc30@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] camel git commit: Fixed CS. Fixes #704. Fixes #707. Fixed CS. Fixes #704. Fixes #707. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b4b8c656 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b4b8c656 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b4b8c656 Branch: refs/heads/camel-2.16.x Commit: b4b8c656af1adee0877cb2b3dd41150fc9d65eae Parents: 913c8ec Author: Claus Ibsen Authored: Sat Dec 5 10:01:36 2015 +0100 Committer: Claus Ibsen Committed: Sat Dec 5 10:02:13 2015 +0100 ---------------------------------------------------------------------- .../camel/dataformat/csv/CsvMarshalTest.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b4b8c656/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java index 3827d67..35929e9 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java @@ -99,16 +99,15 @@ public class CsvMarshalTest extends CamelTestSupport { @Test public void shouldMarshalDifferentDynamicColumns() throws Exception { - output.expectedMessageCount(2); - - template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2")); - template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3")); - - output.assertIsSatisfied(); - assertArrayEquals(new String[]{"1,2"}, readOutputLines(0)); - assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(1)); + output.expectedMessageCount(2); + + template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2")); + template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3")); + + output.assertIsSatisfied(); + assertArrayEquals(new String[]{"1,2"}, readOutputLines(0)); + assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(1)); } - @Override protected RouteBuilder createRouteBuilder() throws Exception {