You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/09/25 10:09:49 UTC
svn commit: r1175323 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
Author: davsclaus
Date: Sun Sep 25 08:09:48 2011
New Revision: 1175323
URL: http://svn.apache.org/viewvc?rev=1175323&view=rev
Log:
Merged revisions 1175321 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 25 08:09:48 2011
@@ -1 +1 @@
-/camel/trunk:1173732,1173958,1174047,1174129,1174245,1174565,1174626,1174745,1174817,1174837,1175139,1175313
+/camel/trunk:1173732,1173958,1174047,1174129,1174245,1174565,1174626,1174745,1174817,1174837,1175139,1175313,1175321
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=1175323&r1=1175322&r2=1175323&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Sun Sep 25 08:09:48 2011
@@ -1013,6 +1013,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>();
Modified: camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java?rev=1175323&r1=1175322&r2=1175323&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java Sun Sep 25 08:09:48 2011
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
@@ -800,6 +801,29 @@ public class MockEndpointTest extends Co
assertMockEndpointsSatisfied();
}
+ 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);