svn commit: r809089 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/converter/stream/SourceCache.java test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java

[ni...@apache.org]

Author: ningjiang
Date: Sat Aug 29 07:35:23 2009
New Revision: 809089

URL: http://svn.apache.org/viewvc?rev=809089&view=rev
Log:
CAMEL-1957 fixed the construction method issue of SourceCache

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/SourceCache.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/SourceCache.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/SourceCache.java?rev=809089&r1=809088&r2=809089&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/SourceCache.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/stream/SourceCache.java Sat Aug 29 07:35:23 2009
@@ -34,7 +34,7 @@
     }
 
     public SourceCache(String data) {
-        new StringSource(data);
+        super(data);
     }
 
     public void reset() {

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java?rev=809089&r1=809088&r2=809089&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/converter/stream/StreamCacheConverterTest.java Sat Aug 29 07:35:23 2009
@@ -16,13 +16,20 @@
  */
 package org.apache.camel.converter.stream;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Source;
+import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 
+import org.xml.sax.InputSource;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.StreamCache;
@@ -30,12 +37,14 @@
 import org.apache.camel.converter.jaxp.XmlConverter;
 import org.apache.camel.impl.DefaultExchange;
 
+
 /**
  * Test cases for {@link StreamCacheConverter}
  */
 public class StreamCacheConverterTest extends ContextTestSupport {
     
     private static final String TEST_FILE = "org/apache/camel/converter/stream/test.xml";
+    private static final String MESSAGE = "<test>This is a test</test>";
     private StreamCacheConverter converter;
     private Exchange exchange;
     
@@ -45,6 +54,14 @@
         this.converter = new StreamCacheConverter();
         this.exchange = new DefaultExchange(context);
     }
+    
+    public void testConvertToStreamCache() throws Exception {
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(MESSAGE.getBytes());
+        StreamCache streamCache = converter.convertToStreamCache(new SAXSource(new InputSource(inputStream)), exchange);
+        String message = exchange.getContext().getTypeConverter().convertTo(String.class, streamCache);
+        assertNotNull(message);
+        assertEquals("The converted message is wrong", MESSAGE, message);
+    }
 
     public void testConvertToStreamCacheStreamSource() throws Exception {
         StreamSource source = new StreamSource(getTestFileStream());