camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1407755 - in /camel/branches/camel-2.9.x: ./ camel-core/src/test/java/org/apache/camel/processor/aggregator/ components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/ components/camel-spring/src/test/resources/org...
Date Sat, 10 Nov 2012 10:59:36 GMT
Author: davsclaus
Date: Sat Nov 10 10:59:35 2012
New Revision: 1407755

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

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateDiscardOnTimeoutTest.java
    camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java
    camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1407752
  Merged /camel/branches/camel-2.10.x:r1407753

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateDiscardOnTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateDiscardOnTimeoutTest.java?rev=1407755&r1=1407754&r2=1407755&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateDiscardOnTimeoutTest.java
(original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateDiscardOnTimeoutTest.java
Sat Nov 10 10:59:35 2012
@@ -35,8 +35,8 @@ public class AggregateDiscardOnTimeoutTe
         template.sendBodyAndHeader("direct:start", "A", "id", 123);
         template.sendBodyAndHeader("direct:start", "B", "id", 123);
 
-        // wait 3 seconds
-        Thread.sleep(3000);
+        // wait 4 seconds
+        Thread.sleep(4000);
 
         mock.assertIsSatisfied();
 
@@ -61,7 +61,7 @@ public class AggregateDiscardOnTimeoutTe
                 from("direct:start")
                     .aggregate(header("id"), new BodyInAggregatingStrategy())
                         .completionSize(3)
-                        // use a 3 second timeout
+                        // use a 2 second timeout
                         .completionTimeout(2000)
                         // and if timeout occurred then just discard the aggregated message
                         .discardOnCompletionTimeout()

Modified: camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java?rev=1407755&r1=1407754&r2=1407755&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java
(original)
+++ camel/branches/camel-2.9.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.java
Sat Nov 10 10:59:35 2012
@@ -27,7 +27,7 @@ import static org.apache.camel.spring.pr
 public class SpringAggregateDiscardOnTimeoutTest extends AggregateDiscardOnTimeoutTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/spring/processor/aggregator/SpringAggregateSimpleTimeoutTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml");
     }
 
 }

Modified: camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml?rev=1407755&r1=1407754&r2=1407755&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml
(original)
+++ camel/branches/camel-2.9.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateDiscardOnTimeoutTest.xml
Sat Nov 10 10:59:35 2012
@@ -26,7 +26,7 @@
     <camelContext xmlns="http://camel.apache.org/schema/spring">
         <route>
             <from uri="direct:start"/>
-            <aggregate strategyRef="aggregatorStrategy" completionTimeout="3000" discardOnCompletionTimeout="true">
+            <aggregate strategyRef="aggregatorStrategy" completionTimeout="2000" discardOnCompletionTimeout="true">
                 <correlationExpression>
                     <simple>header.id</simple>
                 </correlationExpression>



Mime
View raw message