[camel] branch main updated: Fix flaky test

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 64df81798a0 Fix flaky test
64df81798a0 is described below

commit 64df81798a05feb9914bb7ab26eada68a617286c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Aug 9 07:14:37 2023 +0200

    Fix flaky test
---
 .../aggregator/SpringAggregateCompleteAllOnStopTest.xml          | 4 +++-
 .../processor/aggregator/AggregateCompleteAllOnStopTest.java     | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.xml
 
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.xml
index 95f1bb3f49c..a444315524e 100644
--- 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.xml
+++ 
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateCompleteAllOnStopTest.xml
@@ -28,7 +28,9 @@
     <camelContext xmlns="http://camel.apache.org/schema/spring";>
         <route id="foo">
             <from uri="seda:start"/>
-            <aggregate aggregationStrategy="aggregatorStrategy" 
completionSize="2" completionTimeout="2000" completeAllOnStop="true">
+            <to uri="mock:input"/>
+            <aggregate aggregationStrategy="aggregatorStrategy" 
completionSize="2" completionTimeout="100"
+                       completionTimeoutCheckerInterval="10" 
completeAllOnStop="true">
                 <correlationExpression>
                     <simple>header.id</simple>
                 </correlationExpression>
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompleteAllOnStopTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompleteAllOnStopTest.java
index ab95bdef708..dfdac8b2d0b 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompleteAllOnStopTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateCompleteAllOnStopTest.java
@@ -30,12 +30,17 @@ public class AggregateCompleteAllOnStopTest extends 
ContextTestSupport {
         MockEndpoint mock = getMockEndpoint("mock:aggregated");
         mock.expectedBodiesReceived("A+B", "C");
 
+        MockEndpoint input = getMockEndpoint("mock:input");
+        input.expectedMessageCount(3);
+
         // we only send 3, but we get 2 exchanges completed when stopping
         // as we tell it to complete all on stop
         template.sendBodyAndHeader("seda:start", "A", "id", "foo");
         template.sendBodyAndHeader("seda:start", "B", "id", "foo");
         template.sendBodyAndHeader("seda:start", "C", "id", "foo");
 
+        input.assertIsSatisfied();
+
         context.getRouteController().stopRoute("foo");
 
         assertMockEndpointsSatisfied();
@@ -46,7 +51,9 @@ public class AggregateCompleteAllOnStopTest extends 
ContextTestSupport {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("seda:start").routeId("foo").aggregate(header("id"), new 
BodyInAggregatingStrategy())
+                from("seda:start").routeId("foo")
+                        .to("mock:input")
+                        .aggregate(header("id"), new 
BodyInAggregatingStrategy())
                         .aggregationRepository(new 
MemoryAggregationRepository())
                         
.completionSize(2).completionTimeout(100).completeAllOnStop().completionTimeoutCheckerInterval(10)
                         .to("mock:aggregated");