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 CDF3210A80 for ; Tue, 27 May 2014 16:26:52 +0000 (UTC) Received: (qmail 80064 invoked by uid 500); 27 May 2014 16:26:52 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 80009 invoked by uid 500); 27 May 2014 16:26:52 -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 80001 invoked by uid 99); 27 May 2014 16:26:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2014 16:26:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7D00532A22B; Tue, 27 May 2014 16:26:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ay@apache.org To: commits@camel.apache.org Date: Tue, 27 May 2014 16:26:52 -0000 Message-Id: <5f8ab8ebc0f64d75b5de9d6c62869e9c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: normalize the quotation mark in StaxConverter's xml comparison test Repository: camel Updated Branches: refs/heads/master 349b2fe20 -> de56e0bdd normalize the quotation mark in StaxConverter's xml comparison test Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/db80b933 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/db80b933 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/db80b933 Branch: refs/heads/master Commit: db80b933e751d7fff49f9a9c97f55395c56ca4af Parents: 349b2fe Author: Akitoshi Yoshida Authored: Tue May 27 18:13:17 2014 +0200 Committer: Akitoshi Yoshida Committed: Tue May 27 18:25:57 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/converter/jaxp/StaxConverterTest.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/db80b933/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java index 7cd070d..d6d37e0 100644 --- a/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java +++ b/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java @@ -74,6 +74,10 @@ public class StaxConverterTest extends ContextTestSupport { assertNotNull(output); String result = new String(output.toByteArray(), UTF_8.name()); + // normalize the auotation mark + if (result.indexOf('\'') > 0) { + result = result.replace('\'', '"'); + } boolean equals = TEST_XML_WITH_XML_HEADER.equals(result) || TEST_XML_WITH_XML_HEADER_ISO_8859_1.equals(result); assertTrue("Should match header", equals); }