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 26fc8c0b6d1 CAMEL-18275: Amend the OnCompletion Chained Seda Routes 
tests to check the order of competions execution (#8120)
26fc8c0b6d1 is described below

commit 26fc8c0b6d1f26e6d904799bde338ee95bd2312f
Author: Eduard Gomoliako <[email protected]>
AuthorDate: Sat Aug 6 08:55:54 2022 +0200

    CAMEL-18275: Amend the OnCompletion Chained Seda Routes tests to check the 
order of competions execution (#8120)
---
 .../OnCompletionAfterChainedSedaRoutes.java        | 47 +++++++++++++------
 .../OnCompletionBeforeChainedSedaRoutes.java       | 52 +++++++++++++++-------
 2 files changed, 70 insertions(+), 29 deletions(-)

diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionAfterChainedSedaRoutes.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionAfterChainedSedaRoutes.java
index b5a39b7af40..4418a4802d2 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionAfterChainedSedaRoutes.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionAfterChainedSedaRoutes.java
@@ -24,13 +24,13 @@ public class OnCompletionAfterChainedSedaRoutes extends 
ContextTestSupport {
 
     @Test
     public void testOnCompletionChained() throws Exception {
-        String body = "<body>";
+        final var body = "<body>";
 
-        getMockEndpoint("mock:end").expectedBodiesReceived(body);
-        getMockEndpoint("mock:adone").expectedBodiesReceived(body);
-        getMockEndpoint("mock:bdone").expectedBodiesReceived(body);
-        getMockEndpoint("mock:cdone").expectedBodiesReceived(body);
-        getMockEndpoint("mock:ddone").expectedBodiesReceived(body);
+        final var completionMockEndpoint = getMockEndpoint("mock:completion");
+
+        completionMockEndpoint.expectedMessageCount(5);
+        completionMockEndpoint.expectedBodiesReceived(
+                body, "completion:d", "completion:c", "completion:b", 
"completion:a");
 
         template.sendBody("direct:a", body);
 
@@ -43,20 +43,39 @@ public class OnCompletionAfterChainedSedaRoutes extends 
ContextTestSupport {
             @Override
             public void configure() throws Exception {
                 from("direct:a")
-                .onCompletion().log("a - done").to("mock:adone").end()
-                .to("seda:b");
+                    .onCompletion()
+                        .log("a - done")
+                        .process(exchange -> 
exchange.getMessage().setBody("completion:a"))
+                        .to("mock:completion")
+                        .end()
+                    .to("seda:b");
 
                 from("seda:b")
-                .onCompletion().log("b - done").to("mock:bdone").end()
-                .to("seda:c");
+                    .onCompletion()
+                        .log("b - done")
+                        .process(exchange -> 
exchange.getMessage().setBody("completion:b"))
+                        .to("mock:completion")
+                        .end()
+                    .delay(100)
+                    .to("seda:c");
 
                 from("seda:c")
-                .onCompletion().log("c - done").to("mock:cdone").end()
-                .to("seda:d");
+                    .onCompletion()
+                        .log("c - done")
+                        .process(exchange -> 
exchange.getMessage().setBody("completion:c"))
+                        .to("mock:completion")
+                        .end()
+                    .delay(100)
+                    .to("seda:d");
 
                 from("seda:d")
-                .onCompletion().log("d - done").to("mock:ddone").end()
-                .to("mock:end");
+                    .onCompletion()
+                        .log("d - done")
+                        .process(exchange -> 
exchange.getMessage().setBody("completion:d"))
+                        .to("mock:completion")
+                        .end()
+                    .delay(100)
+                    .to("mock:completion");
             }
 
         };
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionBeforeChainedSedaRoutes.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionBeforeChainedSedaRoutes.java
index a51e5afb55e..46f6ee8bf8e 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionBeforeChainedSedaRoutes.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/OnCompletionBeforeChainedSedaRoutes.java
@@ -24,13 +24,13 @@ public class OnCompletionBeforeChainedSedaRoutes extends 
ContextTestSupport {
 
     @Test
     public void testOnCompletionChained() throws Exception {
-        String body = "<body>";
+        final var body = "<body>";
 
-        getMockEndpoint("mock:end").expectedBodiesReceived(body);
-        getMockEndpoint("mock:adone").expectedBodiesReceived(body);
-        getMockEndpoint("mock:bdone").expectedBodiesReceived(body);
-        getMockEndpoint("mock:cdone").expectedBodiesReceived(body);
-        getMockEndpoint("mock:ddone").expectedBodiesReceived(body);
+        final var completionMockEndpoint = getMockEndpoint("mock:completion");
+
+        completionMockEndpoint.expectedMessageCount(5);
+        completionMockEndpoint.expectedBodiesReceived(
+                "completion:a", "completion:b", "completion:c", body, 
"completion:d");
 
         template.sendBody("direct:a", body);
 
@@ -43,22 +43,44 @@ public class OnCompletionBeforeChainedSedaRoutes extends 
ContextTestSupport {
             @Override
             public void configure() throws Exception {
                 from("direct:a")
-                .onCompletion().modeBeforeConsumer().log("a - 
done").to("mock:adone").end()
-                .to("seda:b");
+                    .onCompletion()
+                            .modeBeforeConsumer()
+                            .log("a - done")
+                            .process(exchange -> 
exchange.getMessage().setBody("completion:a"))
+                            .to("mock:completion")
+                            .end()
+                    .to("seda:b");
 
                 from("seda:b")
-                .onCompletion().modeBeforeConsumer().log("b - 
done").to("mock:bdone").end()
-                .to("seda:c");
+                    .onCompletion()
+                        .modeBeforeConsumer()
+                        .log("b - done")
+                        .process(exchange -> 
exchange.getMessage().setBody("completion:b"))
+                        .to("mock:completion")
+                        .end()
+                    .delay(100)
+                    .to("seda:c");
 
                 from("seda:c")
-                .onCompletion().modeBeforeConsumer().log("c - 
done").to("mock:cdone").end()
-                .to("seda:d");
+                    .onCompletion()
+                        .modeBeforeConsumer()
+                        .log("c - done")
+                        .process(exchange -> 
exchange.getMessage().setBody("completion:c"))
+                        .to("mock:completion")
+                        .end()
+                    .delay(100)
+                    .to("seda:d");
 
                 from("seda:d")
-                .onCompletion().modeBeforeConsumer().log("d - 
done").to("mock:ddone").end()
-                .to("mock:end");
+                    .onCompletion()
+                        .modeBeforeConsumer()
+                        .log("d - done")
+                        .process(exchange -> 
exchange.getMessage().setBody("completion:d"))
+                        .to("mock:completion")
+                        .end()
+                    .delay(100)
+                    .to("mock:completion");
             }
-
         };
     }
 }

Reply via email to