Author: ningjiang
Date: Mon Sep 26 01:33:57 2011
New Revision: 1175645

URL: http://svn.apache.org/viewvc?rev=1175645&view=rev
Log:
Merged revisions 1175323 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x

........
  r1175323 | davsclaus | 2011-09-25 16:09:48 +0800 (Sun, 25 Sep 2011) | 4 lines
  
  Merged revisions 1175321 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
........

Modified:
    camel/branches/camel-2.7.x/   (props changed)
    
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
   (props changed)
    
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
    
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
   (props changed)
    
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 26 01:33:57 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x:1174571
-/camel/trunk:1146608,1146903,1147216,1174565
+/camel/branches/camel-2.8.x:1174571,1175323
+/camel/trunk:1146608,1146903,1147216,1174565,1175321

Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 26 01:33:57 2011
@@ -1 +1 @@
-/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1174571
+/camel/branches/camel-2.8.x:1-1146127,1146608,1146653,1146771,1146903,1147216,1174571,1175323

Propchange: 
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 26 01:33:57 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java:1174571
+/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java:1174571,1175323
 
/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java:1124595

Modified: 
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=1175645&r1=1175644&r2=1175645&view=diff
==============================================================================
--- 
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
 (original)
+++ 
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
 Mon Sep 26 01:33:57 2011
@@ -955,6 +955,7 @@ public class MockEndpoint extends Defaul
     private void init() {
         expectedCount = -1;
         counter = 0;
+        defaultProcessor = null;
         processors = new HashMap<Integer, Processor>();
         receivedExchanges = new CopyOnWriteArrayList<Exchange>();
         failures = new CopyOnWriteArrayList<Throwable>();

Propchange: 
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 26 01:33:57 2011
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java:1174571
+/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java:1174571,1175323
 
/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/GenericFileConverterTest.java:1124595

Modified: 
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java?rev=1175645&r1=1175644&r2=1175645&view=diff
==============================================================================
--- 
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
 (original)
+++ 
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
 Mon Sep 26 01:33:57 2011
@@ -19,6 +19,7 @@ package org.apache.camel.component.mock;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
@@ -537,6 +538,29 @@ public class MockEndpointTest extends Co
         }
     }
 
+    public void testResetDefaultProcessor() throws Exception {
+        final AtomicInteger counter = new AtomicInteger();
+
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.whenAnyExchangeReceived(new Processor() {
+            @Override
+            public void process(Exchange exchange) throws Exception {
+                counter.incrementAndGet();
+            }
+        });
+        mock.expectedMessageCount(1);
+        sendMessages(1);
+        mock.assertIsSatisfied();
+        assertEquals(1, counter.get());
+
+        resetMocks();
+        mock.expectedMessageCount(1);
+        sendMessages(1);
+        mock.assertIsSatisfied();
+        // counter should not be changed this time
+        assertEquals(1, counter.get());
+    }
+
     protected void sendMessages(int... counters) {
         for (int counter : counters) {
             template.sendBodyAndHeader("direct:a", createTestMessage(counter), 
"counter", counter);


Reply via email to