svn commit: r949143 - in /camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting: EchoSpringRemotingPojoOutOfCamelContextTest.java EchoSpringRemotingPojoTest.java

[davsclaus]

Author: davsclaus
Date: Fri May 28 10:31:43 2010
New Revision: 949143

URL: http://svn.apache.org/viewvc?rev=949143&view=rev
Log:
Fixed test after the big osgi related refactor.

Modified:
    
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoOutOfCamelContextTest.java
    
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java

Modified: 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoOutOfCamelContextTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoOutOfCamelContextTest.java?rev=949143&r1=949142&r2=949143&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoOutOfCamelContextTest.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoOutOfCamelContextTest.java
 Fri May 28 10:31:43 2010
@@ -20,6 +20,7 @@ import org.springframework.context.suppo
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class EchoSpringRemotingPojoOutOfCamelContextTest extends 
EchoSpringRemotingPojoTest {
+
     protected AbstractXmlApplicationContext createApplicationContext() {
         return new 
ClassPathXmlApplicationContext("org/apache/camel/spring/remoting/echo-pojo-out-of-camelContext.xml");
     }

Modified: 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java?rev=949143&r1=949142&r2=949143&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java
 (original)
+++ 
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoTest.java
 Fri May 28 10:31:43 2010
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.spring.remoting;
 
+import org.apache.camel.CamelExecutionException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spring.SpringTestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -44,9 +45,9 @@ public class EchoSpringRemotingPojoTest 
         try {
             template.requestBody("direct:start", "Kabom", String.class);
             fail("Should have thrown exception");
-        } catch (RuntimeCamelException e) {
-            assertIsInstanceOf(MyEchoRuntimeException.class, e.getCause());
-            assertEquals("Damn something went wrong", 
e.getCause().getMessage());
+        } catch (CamelExecutionException e) {
+            assertIsInstanceOf(MyEchoRuntimeException.class, 
e.getCause().getCause());
+            assertEquals("Damn something went wrong", 
e.getCause().getCause().getMessage());
         }
     }