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 1c8a77c6b63c fix(components): test junit6 stream closure
1c8a77c6b63c is described below
commit 1c8a77c6b63c864874c58000d4b10a997dac3abe
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Thu Dec 4 09:07:23 2025 +0100
fix(components): test junit6 stream closure
Beside, removing some useless empty methods from tests and fixing a flaky
test.
---
.../main/java/org/apache/camel/test/junit6/TestSupport.java | 13 +++++++------
.../junit6/patterns/CreateCamelContextPerTestFalseTest.java | 1 -
.../apache/camel/test/junit6/patterns/DebugJUnit6Test.java | 2 --
.../test/junit6/patterns/DebugNoLazyTypeConverterTest.java | 2 --
.../org/apache/camel/test/junit6/patterns/DebugTest.java | 2 --
.../patterns/FilterCreateCamelContextPerClassTest.java | 8 ++++++--
6 files changed, 13 insertions(+), 15 deletions(-)
diff --git
a/components/camel-test/camel-test-junit6/src/main/java/org/apache/camel/test/junit6/TestSupport.java
b/components/camel-test/camel-test-junit6/src/main/java/org/apache/camel/test/junit6/TestSupport.java
index 75eed958e406..2ae2fe5433ee 100644
---
a/components/camel-test/camel-test-junit6/src/main/java/org/apache/camel/test/junit6/TestSupport.java
+++
b/components/camel-test/camel-test-junit6/src/main/java/org/apache/camel/test/junit6/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-junit6/src/test/java/org/apache/camel/test/junit6/patterns/CreateCamelContextPerTestFalseTest.java
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/CreateCamelContextPerTestFalseTest.java
index d143fc96d312..69e35545104c 100644
---
a/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/CreateCamelContextPerTestFalseTest.java
+++
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/CreateCamelContextPerTestFalseTest.java
@@ -59,7 +59,6 @@ public class CreateCamelContextPerTestFalseTest extends
CamelTestSupport {
protected void doPostTearDown() throws Exception {
LOG.info("doPostTearDown()");
POST_TEAR_DOWN.incrementAndGet();
- super.doPostTearDown();
}
@Test
diff --git
a/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugJUnit6Test.java
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugJUnit6Test.java
index fa8ace732ed6..17583b1c02bc 100644
---
a/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugJUnit6Test.java
+++
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugJUnit6Test.java
@@ -29,8 +29,6 @@ public class DebugJUnit6Test extends CamelTestSupport {
@Override
public void doPreSetup() throws Exception {
- super.doPreSetup();
-
camelContextConfiguration()
.withBreakpoint(createBreakpoint());
}
diff --git
a/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugNoLazyTypeConverterTest.java
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugNoLazyTypeConverterTest.java
index 5fddd7644b9d..b4faf5cae805 100644
---
a/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugNoLazyTypeConverterTest.java
+++
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugNoLazyTypeConverterTest.java
@@ -29,8 +29,6 @@ public class DebugNoLazyTypeConverterTest extends
CamelTestSupport {
@Override
public void doPreSetup() throws Exception {
- super.doPreSetup();
-
camelContextConfiguration()
.withBreakpoint(createBreakpoint());
}
diff --git
a/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugTest.java
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugTest.java
index acb31fea8e21..8334921b099b 100644
---
a/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugTest.java
+++
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/DebugTest.java
@@ -29,8 +29,6 @@ public class DebugTest extends CamelTestSupport {
@Override
public void doPreSetup() throws Exception {
- super.doPreSetup();
-
camelContextConfiguration()
.withBreakpoint(createBreakpoint());
}
diff --git
a/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/FilterCreateCamelContextPerClassTest.java
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/FilterCreateCamelContextPerClassTest.java
index ce3358ab23fa..6730c1694b03 100644
---
a/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/FilterCreateCamelContextPerClassTest.java
+++
b/components/camel-test/camel-test-junit6/src/test/java/org/apache/camel/test/junit6/patterns/FilterCreateCamelContextPerClassTest.java
@@ -33,7 +33,9 @@ public class FilterCreateCamelContextPerClassTest extends
CamelTestSupport {
public void testSendMatchingMessage() throws Exception {
String expectedBody = "<matched/>";
- getMockEndpoint("mock:result").expectedBodiesReceived(expectedBody);
+ MockEndpoint me = getMockEndpoint("mock:result");
+ me.reset();
+ me.expectedBodiesReceived(expectedBody);
template.sendBodyAndHeader("direct:start", expectedBody, "foo", "bar");
@@ -42,7 +44,9 @@ public class FilterCreateCamelContextPerClassTest extends
CamelTestSupport {
@Test
public void testSendNotMatchingMessage() throws Exception {
- getMockEndpoint("mock:result").expectedMessageCount(0);
+ MockEndpoint me = getMockEndpoint("mock:result");
+ me.reset();
+ me.expectedMessageCount(0);
template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo",
"notMatchedHeaderValue");
