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/15 06:59:53 UTC
svn commit: r964304 - in
/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam:
BamRouteTest.java MultipleActivitiesConcurrentlyTest.java
Author: davsclaus
Date: Thu Jul 15 04:59:53 2010
New Revision: 964304
URL: http://svn.apache.org/viewvc?rev=964304&view=rev
Log:
Fixed test on slower boxes.
Modified:
camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
Modified: camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java?rev=964304&r1=964303&r2=964304&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java (original)
+++ camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/BamRouteTest.java Thu Jul 15 04:59:53 2010
@@ -63,7 +63,7 @@ public class BamRouteTest extends CamelS
super.setUp();
overdueEndpoint = getMockEndpoint("mock:overdue");
- overdueEndpoint.setResultWaitTime(8000);
+ overdueEndpoint.setResultWaitTime(20000);
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java?rev=964304&r1=964303&r2=964304&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java (original)
+++ camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java Thu Jul 15 04:59:53 2010
@@ -17,6 +17,7 @@
package org.apache.camel.bam;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import org.junit.Before;
import org.junit.Test;
@@ -46,11 +47,13 @@ public class MultipleActivitiesConcurren
};
thread.start();
- startLatch.await();
+ // use a timeout to avoid test hang if something happens
+ startLatch.await(30, TimeUnit.SECONDS);
sendAMessages();
- endLatch.await();
+ // use a timeout to avoid test hang if something happens
+ endLatch.await(30, TimeUnit.SECONDS);
overdueEndpoint.assertIsSatisfied();
}