svn commit: r801638 - in /camel/sandbox/tuning-experiment/camel-core/src: main/java/org/apache/camel/processor/Pipeline.java test/java/org/apache/camel/processor/AOPAfterFinallyTest.java test/java/org/apache/camel/processor/AOPAroundFinallyTest.java

[davsclaus]

Author: davsclaus
Date: Thu Aug  6 13:13:54 2009
New Revision: 801638

URL: http://svn.apache.org/viewvc?rev=801638&view=rev
Log:
Fixed unit tests failing in camel-spring

Modified:
    
camel/sandbox/tuning-experiment/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
    
camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAfterFinallyTest.java
    
camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAroundFinallyTest.java

Modified: 
camel/sandbox/tuning-experiment/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
URL: 
http://svn.apache.org/viewvc/camel/sandbox/tuning-experiment/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java?rev=801638&r1=801637&r2=801638&view=diff
==============================================================================
--- 
camel/sandbox/tuning-experiment/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
 (original)
+++ 
camel/sandbox/tuning-experiment/camel-core/src/main/java/org/apache/camel/processor/Pipeline.java
 Thu Aug  6 13:13:54 2009
@@ -146,6 +146,7 @@
         return exchange;
     }
 
+    // TODO: delete me
     protected Exchange oldCreateNextExchange(Exchange previousExchange) {
         Exchange answer = new DefaultExchange(previousExchange);
         // we must use the same id as this is a snapshot strategy where Camel 
copies a snapshot

Modified: 
camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAfterFinallyTest.java
URL: 
http://svn.apache.org/viewvc/camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAfterFinallyTest.java?rev=801638&r1=801637&r2=801638&view=diff
==============================================================================
--- 
camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAfterFinallyTest.java
 (original)
+++ 
camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAfterFinallyTest.java
 Thu Aug  6 13:13:54 2009
@@ -18,6 +18,7 @@
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 
@@ -27,7 +28,7 @@
 public class AOPAfterFinallyTest extends ContextTestSupport {
 
     public void testAOPAfterFinally() throws Exception {
-        getMockEndpoint("mock:after").message(0).body().isEqualTo("Bye World");
+        getMockEndpoint("mock:after").expectedMessageCount(1);
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Bye World");
 
@@ -35,7 +36,14 @@
         assertEquals("Bye World", out);
 
         assertMockEndpointsSatisfied();
-    }
+
+        Exchange after = 
getMockEndpoint("mock:after").getReceivedExchanges().get(0);
+          if (after.hasOut()) {
+              assertEquals("Bye World", after.getOut().getBody());
+          } else {
+              assertEquals("Bye World", after.getIn().getBody());
+          }
+      }
 
     public void testAOPAfterFinallyWithException() throws Exception {
         getMockEndpoint("mock:after").message(0).body().isEqualTo("Kabom the 
World");

Modified: 
camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAroundFinallyTest.java
URL: 
http://svn.apache.org/viewvc/camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAroundFinallyTest.java?rev=801638&r1=801637&r2=801638&view=diff
==============================================================================
--- 
camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAroundFinallyTest.java
 (original)
+++ 
camel/sandbox/tuning-experiment/camel-core/src/test/java/org/apache/camel/processor/AOPAroundFinallyTest.java
 Thu Aug  6 13:13:54 2009
@@ -18,6 +18,7 @@
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 
@@ -28,7 +29,7 @@
 
     public void testAOPAroundFinally() throws Exception {
         getMockEndpoint("mock:before").expectedBodiesReceived("Hello World");
-        getMockEndpoint("mock:after").message(0).body().isEqualTo("Bye World");
+        getMockEndpoint("mock:after").expectedMessageCount(1);
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedBodiesReceived("Bye World");
 
@@ -36,11 +37,18 @@
         assertEquals("Bye World", out);
 
         assertMockEndpointsSatisfied();
+
+        Exchange after = 
getMockEndpoint("mock:after").getReceivedExchanges().get(0);
+        if (after.hasOut()) {
+            assertEquals("Bye World", after.getOut().getBody());
+        } else {
+            assertEquals("Bye World", after.getIn().getBody());
+        }
     }
 
     public void testAOPAroundFinallyWithException() throws Exception {
         getMockEndpoint("mock:before").expectedBodiesReceived("Kabom");
-        getMockEndpoint("mock:after").message(0).body().isEqualTo("Kabom the 
World");
+        getMockEndpoint("mock:after").expectedBodiesReceived("Kabom the 
World");
         
         try {
             template.requestBody("direct:start", "Kabom", String.class);