svn commit: r1084055 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/processor/onexception/ components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/ components/camel-spring/src/test/resources/org/apache/camel/sp...

[ningjiang]

Author: ningjiang
Date: Tue Mar 22 02:26:06 2011
New Revision: 1084055

URL: http://svn.apache.org/viewvc?rev=1084055&view=rev
Log:
CAMEL-3791，CAMLE-3792 Fixed the spring tests

Modified:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java
    
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.java
    
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java?rev=1084055&r1=1084054&r2=1084055&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionUseOriginalMessageTest.java
 Tue Mar 22 02:26:06 2011
@@ -16,14 +16,11 @@
  */
 package org.apache.camel.processor.onexception;
 
-import java.io.File;
-import java.io.InputStream;
-
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.stream.FileInputStreamCache;
+import org.apache.camel.converter.stream.InputStreamCache;
 
 /**
  * @version 
@@ -32,7 +29,7 @@ public class OnExceptionUseOriginalMessa
     
     private static final String HELLO_WORLD = "Hello World";
     
-    private static final String TEST_FILE = 
"src/test/resources/org/apache/camel/converter/stream/test.xml";
+    private static final String TEST_STRING = "<firstName>James</firstName>";
 
     public void testOnExceptionError() throws Exception {
         getMockEndpoint("mock:middle").expectedBodiesReceived(HELLO_WORLD);
@@ -51,9 +48,8 @@ public class OnExceptionUseOriginalMessa
         
getMockEndpoint("mock:middle").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class);
         getMockEndpoint("mock:end").expectedMessageCount(1);
         
getMockEndpoint("mock:end").message(0).property(Exchange.EXCEPTION_CAUGHT).isInstanceOf(IllegalArgumentException.class);
-        
-        File file = new File(TEST_FILE).getAbsoluteFile();
-        FileInputStreamCache cache = new FileInputStreamCache(file);
+    
+        InputStreamCache cache = new InputStreamCache(TEST_STRING.getBytes());
         
         template.sendBody("direct:a", cache);
 

Modified: 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.java?rev=1084055&r1=1084054&r2=1084055&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.java
 Tue Mar 22 02:26:06 2011
@@ -28,7 +28,7 @@ import static org.apache.camel.spring.pr
 public class SpringOnExceptionUseOriginalMessageTest extends 
OnExceptionUseOriginalMessageTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, 
"org/apache/camel/spring/processor/OnExceptionUseOriginalMessageTest.xml");
+        return createSpringCamelContext(this, 
"org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml");
     }
 
 }
\ No newline at end of file

Modified: 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml?rev=1084055&r1=1084054&r2=1084055&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/onexception/SpringOnExceptionUseOriginalMessageTest.xml
 Tue Mar 22 02:26:06 2011
@@ -31,17 +31,17 @@
         <onException useOriginalMessage="true">
             <exception>java.lang.IllegalArgumentException</exception>
             <handled><constant>true</constant></handled>
-            <to uri="sead:test"/>
+            <to uri="seda:test"/>
         </onException>
 
         <route>
             <from uri="direct:a"/>
-            <inOut/>
-            <process ref="proc"/>
+            <inOut uri="log:test"/>
+            <process ref="proc" />
         </route>
 
         <route>
-            <from uri="sead:test"/>
+            <from uri="seda:test"/>
             <to uri="mock:middle" />
             <to uri="mock:end" />
         </route>