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

pcongiusti 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 f622eb40a718 fix(components): close context when getting route list
f622eb40a718 is described below

commit f622eb40a718f3384813cf34a709f4878ce0e111
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Tue Dec 2 12:11:12 2025 +0100

    fix(components): close context when getting route list
    
    Beside that, refactoring of a flaky test that I found while testing the 
original fix.
---
 .../main/java/org/apache/camel/test/junit5/TestSupport.java | 13 +++++++------
 .../patterns/FilterCreateCamelContextPerClassTest.java      | 13 +++++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
 
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
index 2041300447f1..bb63d1270387 100644
--- 
a/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
+++ 
b/components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
@@ -466,12 +466,13 @@ public final class TestSupport {
      * A helper method to create a list of Route objects for a given route 
builder.
      */
     public static List<Route> getRouteList(RouteBuilder builder) throws 
Exception {
-        CamelContext context = new DefaultCamelContext();
-        context.addRoutes(builder);
-        context.start();
-        List<Route> answer = context.getRoutes();
-        context.stop();
-        return answer;
+        try (CamelContext context = new DefaultCamelContext()) {
+            context.addRoutes(builder);
+            context.start();
+            List<Route> answer = context.getRoutes();
+            context.stop();
+            return answer;
+        }
     }
 
     /**
diff --git 
a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
 
b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
index d1d7d3af05c0..e26287ce5add 100644
--- 
a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
+++ 
b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/FilterCreateCamelContextPerClassTest.java
@@ -32,21 +32,26 @@ public class FilterCreateCamelContextPerClassTest extends 
CamelTestSupport {
     @Test
     public void testSendMatchingMessage() throws Exception {
         String expectedBody = "<matched/>";
+        MockEndpoint endpoint = getMockEndpoint("mock:result");
+        endpoint.reset();
 
-        getMockEndpoint("mock:result").expectedBodiesReceived(expectedBody);
+        endpoint.expectedMessageCount(1);
+        endpoint.expectedBodiesReceived(expectedBody);
 
         template.sendBodyAndHeader("direct:start", expectedBody, "foo", "bar");
 
-        MockEndpoint.assertIsSatisfied(context);
+        endpoint.assertIsSatisfied();
     }
 
     @Test
     public void testSendNotMatchingMessage() throws Exception {
-        getMockEndpoint("mock:result").expectedMessageCount(0);
+        MockEndpoint endpoint = getMockEndpoint("mock:result");
+        endpoint.reset();
+        endpoint.expectedMessageCount(0);
 
         template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", 
"notMatchedHeaderValue");
 
-        MockEndpoint.assertIsSatisfied(context);
+        endpoint.assertIsSatisfied();
     }
 
     @Override

Reply via email to