You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/12/02 07:54:55 UTC
git commit: CAMEL-7025 revert the change of StaxConverterTest which
should not be committed yet
Updated Branches:
refs/heads/master 644c1f0ab -> 42b463c42
CAMEL-7025 revert the change of StaxConverterTest which should not be committed yet
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42b463c4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42b463c4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42b463c4
Branch: refs/heads/master
Commit: 42b463c42bab7f2e63925275523801ffb93da3b5
Parents: 644c1f0
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Dec 2 14:54:35 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Dec 2 14:54:35 2013 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/converter/jaxp/StaxConverterTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/42b463c4/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 3a299af..1049332 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
@@ -58,7 +58,7 @@ public class StaxConverterTest extends ContextTestSupport {
output = new ByteArrayOutputStream();
// ensure UTF-8 encoding
Exchange exchange = new DefaultExchange(context);
- //exchange.setProperty(Exchange.CHARSET_NAME, ISO_8859_1.toString());
+ exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.toString());
writer = context.getTypeConverter().mandatoryConvertTo(XMLEventWriter.class, exchange, output);
while (reader.hasNext()) {
writer.add(reader.nextEvent());
@@ -74,7 +74,6 @@ public class StaxConverterTest extends ContextTestSupport {
assertNotNull(output);
String result = new String(output.toByteArray(), UTF_8.name());
- System.out.println(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);
}
@@ -93,7 +92,7 @@ public class StaxConverterTest extends ContextTestSupport {
output = new ByteArrayOutputStream();
// ensure UTF-8 encoding
Exchange exchange = new DefaultExchange(context);
- //exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.name());
+ exchange.setProperty(Exchange.CHARSET_NAME, UTF_8.name());
writer = context.getTypeConverter().mandatoryConvertTo(XMLStreamWriter.class, exchange, output);
// copy to writer
while (reader.hasNext()) {