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 2013/10/07 09:16:59 UTC
[6/8] git commit: Fixed test on CI servers
Fixed test on CI servers
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a355e68d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a355e68d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a355e68d
Branch: refs/heads/camel-2.12.x
Commit: a355e68d95fe48b6714a3f9395693d5cea6fed75
Parents: d9d3b41
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Oct 7 08:59:45 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Oct 7 09:16:24 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/converter/jaxp/StaxConverterTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a355e68d/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 eba7b59..5fe411b 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
@@ -75,8 +75,8 @@ public class StaxConverterTest extends ContextTestSupport {
String result = new String(output.toByteArray(), UTF_8.name());
- assertEquals(TEST_XML_WITH_XML_HEADER, result);
-
+ boolean equals = TEST_XML_WITH_XML_HEADER.equals(result) || TEST_XML_WITH_XML_HEADER_ISO_8859_1.equals(result);
+ assertTrue("Should match header", equals);
}
public void testEncodingXmlStreamReader() throws Exception {