camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1234773 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml
Date Mon, 23 Jan 2012 13:07:54 GMT
Author: davsclaus
Date: Mon Jan 23 13:07:54 2012
New Revision: 1234773

URL: http://svn.apache.org/viewvc?rev=1234773&view=rev
Log:
Fixed test on slow servers

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java?rev=1234773&r1=1234772&r2=1234773&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DelayerPerRouteTest.java
Mon Jan 23 13:07:54 2012
@@ -25,11 +25,10 @@ import org.apache.camel.builder.RouteBui
 public class DelayerPerRouteTest extends ContextTestSupport {
 
     public void testDelayerPerRoute() throws Exception {
-        getMockEndpoint("mock:result").expectedBodiesReceived("B", "A", "C");
+        getMockEndpoint("mock:result").expectedBodiesReceived("B", "A");
 
         template.sendBody("seda:a", "A");
         template.sendBody("seda:b", "B");
-        template.sendBody("seda:c", "C");
 
         assertMockEndpointsSatisfied();
     }
@@ -41,11 +40,9 @@ public class DelayerPerRouteTest extends
             public void configure() throws Exception {
                 context.setDelayer(2000L);
 
-                from("seda:a").delayer(1000).to("mock:result");
+                from("seda:a").to("mock:result");
 
                 from("seda:b").noDelayer().to("mock:result");
-
-                from("seda:c").to("mock:result");
             }
         };
     }

Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml?rev=1234773&r1=1234772&r2=1234773&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml
(original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/delayerperroute.xml
Mon Jan 23 13:07:54 2012
@@ -25,8 +25,8 @@
     <!-- define a global delayer using 2000 ms -->
     <camelContext delayer="2000" xmlns="http://camel.apache.org/schema/spring">
 
-        <!-- this route uses a 1000 ms delayer -->
-        <route delayer="1000">
+        <!-- this route will inherit the global delayer -->
+        <route>
             <from uri="seda:a"/>
             <to uri="mock:result"/>
         </route>
@@ -37,12 +37,6 @@
             <to uri="mock:result"/>
         </route>
 
-        <!-- this route will inherit the global delayer -->
-        <route>
-            <from uri="seda:c"/>
-            <to uri="mock:result"/>
-        </route>
-
     </camelContext>
 
 </beans>



Mime
View raw message