You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/02/19 23:10:58 UTC
svn commit: r746024 - in
/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test:
java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java
resources/org/apache/servicemix/components/util/encoding.xml
Author: ccustine
Date: Thu Feb 19 22:10:58 2009
New Revision: 746024
URL: http://svn.apache.org/viewvc?rev=746024&view=rev
Log:
Backported fix for encoding test failures on certain platforms
Added:
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/resources/org/apache/servicemix/components/util/encoding.xml
Modified:
servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java
Modified: servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java?rev=746024&r1=746023&r2=746024&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java Thu Feb 19 22:10:58 2009
@@ -18,6 +18,8 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.nio.charset.Charset;
import javax.jbi.messaging.MessageExchange;
@@ -35,10 +37,24 @@
*/
public class DefaultFileMarshalerTest extends TestCase {
- private static final String MESSAGE = "<test>l'élève est à l'école</test>";
+ private static final String MESSAGE;
private static final SourceTransformer TRANSFORMER = new SourceTransformer();
private DefaultFileMarshaler marshaler = new DefaultFileMarshaler();
-
+
+ static {
+ String txt = "";
+ try {
+ InputStream is = DefaultFileMarshalerTest.class.getResourceAsStream("encoding.xml");
+ InputStreamReader r = new InputStreamReader(is, "UTF-8");
+ char[] buf = new char[8192];
+ int nb = r.read(buf);
+ txt = new String(buf, 0, nb);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ MESSAGE = txt.substring(txt.indexOf("<test")).trim();
+ }
+
public void testReadExplicitEncoding() throws Exception {
//create a mock exchange
MessageExchange exchange = createMockExchange();
Added: servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/resources/org/apache/servicemix/components/util/encoding.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/resources/org/apache/servicemix/components/util/encoding.xml?rev=746024&view=auto
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/resources/org/apache/servicemix/components/util/encoding.xml (added)
+++ servicemix/smx3/branches/servicemix-3.2/core/servicemix-core/src/test/resources/org/apache/servicemix/components/util/encoding.xml Thu Feb 19 22:10:58 2009
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test>l'élève est à l'école</test>
\ No newline at end of file