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 2010/07/10 09:53:35 UTC
svn commit: r962779 - in
/camel/trunk/camel-core/src/test/java/org/apache/camel/processor:
ShutdownCompleteAllTasksTest.java ShutdownCompleteCurrentTaskOnlyTest.java
Author: davsclaus
Date: Sat Jul 10 07:53:35 2010
New Revision: 962779
URL: http://svn.apache.org/viewvc?rev=962779&view=rev
Log:
Fixed test
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java?rev=962779&r1=962778&r2=962779&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java Sat Jul 10 07:53:35 2010
@@ -45,19 +45,18 @@ public class ShutdownCompleteAllTasksTes
// give it 20 seconds to shutdown
context.getShutdownStrategy().setTimeout(20);
- // start route which will pickup the 5 files
- context.startRoute("route1");
-
MockEndpoint bar = getMockEndpoint("mock:bar");
bar.expectedMinimumMessageCount(1);
assertMockEndpointsSatisfied();
+ int batch = bar.getReceivedExchanges().get(0).getProperty(Exchange.BATCH_SIZE, int.class);
+
// shutdown during processing
context.stop();
// should route all 5
- assertEquals("Should complete all messages", 5, bar.getReceivedCounter());
+ assertEquals("Should complete all messages", batch, bar.getReceivedCounter());
}
@Override
@@ -66,7 +65,7 @@ public class ShutdownCompleteAllTasksTes
@Override
// START SNIPPET: e1
public void configure() throws Exception {
- from(url).routeId("route1").noAutoStartup()
+ from(url)
// let it complete all tasks during shutdown
.shutdownRunningTask(ShutdownRunningTask.CompleteAllTasks)
.delay(1000).to("seda:foo");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java?rev=962779&r1=962778&r2=962779&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteCurrentTaskOnlyTest.java Sat Jul 10 07:53:35 2010
@@ -45,9 +45,6 @@ public class ShutdownCompleteCurrentTask
// give it 20 seconds to shutdown
context.getShutdownStrategy().setTimeout(20);
- // start route which will pickup the 5 files
- context.startRoute("route1");
-
MockEndpoint bar = getMockEndpoint("mock:bar");
bar.expectedMinimumMessageCount(1);
@@ -65,7 +62,7 @@ public class ShutdownCompleteCurrentTask
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from(url).routeId("route1").noAutoStartup()
+ from(url)
// let it complete only current task so we shutdown faster
.shutdownRunningTask(ShutdownRunningTask.CompleteCurrentTaskOnly)
.delay(1000).to("seda:foo");