Author: davsclaus
Date: Mon Apr 20 06:25:52 2009
New Revision: 766589
URL: http://svn.apache.org/viewvc?rev=766589&view=rev
Log:
Merged revisions 766588 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r766588 | davsclaus | 2009-04-20 08:23:26 +0200 (Mon, 20 Apr 2009) | 1 line
Fixed failing unit test on some slow servers reported by TC.
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 20 06:25:52 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java?rev=766589&r1=766588&r2=766589&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/timer/TimerRouteTest.java
Mon Apr 20 06:25:52 2009
@@ -17,11 +17,11 @@
package org.apache.camel.component.timer;
import java.util.concurrent.atomic.AtomicInteger;
-
import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.jndi.JndiContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,17 +34,19 @@
private MyBean bean = new MyBean();
public void testTimerInvokesBeanMethod() throws Exception {
- // now lets wait for the timer to fire a few times.
- Thread.sleep(1000 * 2);
- assertTrue("", bean.counter.get() >= 2);
- }
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMinimumMessageCount(2);
+ assertMockEndpointsSatisfied();
+
+ assertTrue("Should have fired 2 or more times was: " +
bean.counter.get(), bean.counter.get() >= 2);
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
-
from("timer://foo?fixedRate=true&delay=0&period=500").to("bean:myBean");
+
from("timer://foo?fixedRate=true&delay=0&period=500").to("bean:myBean",
"mock:result");
}
};
}
