You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/09/16 01:33:34 UTC

svn commit: r695687 - in /servicemix/utils/trunk/src/test: java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java resources/org/apache/servicemix/components/util/encoding.xml

Author: gnodet
Date: Mon Sep 15 16:33:34 2008
New Revision: 695687

URL: http://svn.apache.org/viewvc?rev=695687&view=rev
Log:
Trying to fix encoding tests problems

Added:
    servicemix/utils/trunk/src/test/resources/org/apache/servicemix/components/util/encoding.xml
Modified:
    servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java

Modified: servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java?rev=695687&r1=695686&r2=695687&view=diff
==============================================================================
--- servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java (original)
+++ servicemix/utils/trunk/src/test/java/org/apache/servicemix/components/util/DefaultFileMarshalerTest.java Mon Sep 15 16:33:34 2008
@@ -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/utils/trunk/src/test/resources/org/apache/servicemix/components/util/encoding.xml
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/test/resources/org/apache/servicemix/components/util/encoding.xml?rev=695687&view=auto
==============================================================================
--- servicemix/utils/trunk/src/test/resources/org/apache/servicemix/components/util/encoding.xml (added)
+++ servicemix/utils/trunk/src/test/resources/org/apache/servicemix/components/util/encoding.xml Mon Sep 15 16:33:34 2008
@@ -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