svn commit: r1023314 - /camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.java

[da...@apache.org]

Author: davsclaus
Date: Sat Oct 16 15:45:22 2010
New Revision: 1023314

URL: http://svn.apache.org/viewvc?rev=1023314&view=rev
Log:
Fixed test

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownCompleteAllTasksTest.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=1023314&r1=1023313&r2=1023314&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 Oct 16 15:45:22 2010
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.processor;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
 import org.apache.camel.ShutdownRunningTask;
@@ -27,7 +29,7 @@ import org.apache.camel.component.mock.M
  */
 public class ShutdownCompleteAllTasksTest extends ContextTestSupport {
 
-    private static String url = "file:target/pending?initialDelay=3000";
+    private static String url = "file:target/pending";
 
     @Override
     protected void setUp() throws Exception {
@@ -42,13 +44,17 @@ public class ShutdownCompleteAllTasksTes
     }
 
     public void testShutdownCompleteAllTasks() throws Exception {
-        // give it 20 seconds to shutdown
-        context.getShutdownStrategy().setTimeout(20);
+        // give it 30 seconds to shutdown
+        context.getShutdownStrategy().setTimeout(30);
+
+        // start route
+        context.startRoute("foo");
 
         MockEndpoint bar = getMockEndpoint("mock:bar");
         bar.expectedMinimumMessageCount(1);
 
-        assertMockEndpointsSatisfied();
+        // wait 20 seconds to give more time for slowe servers
+        bar.await(20, TimeUnit.SECONDS);
 
         int batch = bar.getReceivedExchanges().get(0).getProperty(Exchange.BATCH_SIZE, int.class);
 
@@ -65,7 +71,7 @@ public class ShutdownCompleteAllTasksTes
             @Override
             // START SNIPPET: e1
             public void configure() throws Exception {
-                from(url)
+                from(url).routeId("foo").noAutoStartup()
                     // let it complete all tasks during shutdown
                     .shutdownRunningTask(ShutdownRunningTask.CompleteAllTasks)
                     .delay(1000).to("seda:foo");