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 42fb6b62d724 fix(components): smooks test proper assert type and
resource closure
42fb6b62d724 is described below
commit 42fb6b62d724ec098d7bad7648c9a8e5f2b8968e
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Tue Dec 9 11:50:59 2025 +0100
fix(components): smooks test proper assert type and resource closure
---
.../component/smooks/SmooksProcessorTest.java | 15 +++++-
.../smooks/converter/SinkConverterTest.java | 8 ++--
.../smooks/converter/SourceConverterTest.java | 7 +--
.../smooks/routing/BeanRouterFunctionalTest.java | 13 +++---
.../component/smooks/routing/BeanRouterTest.java | 53 ++++++++++++----------
.../dataformat/smooks/SmooksDataFormatTest.java | 8 +++-
6 files changed, 65 insertions(+), 39 deletions(-)
diff --git
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java
index 93c35d63beab..7fff65d6ead0 100644
---
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java
+++
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/SmooksProcessorTest.java
@@ -191,7 +191,8 @@ public class SmooksProcessorTest extends CamelTestSupport {
template.sendBody("direct://input", getOrderEdi());
Exchange exchange = result.assertExchangeReceived(0);
- assertNotEquals(executionContext[0],
exchange.getMessage().getHeader(SmooksConstants.SMOOKS_EXECUTION_CONTEXT));
+ assertNotEquals(executionContext[0],
+
exchange.getMessage().getHeader(SmooksConstants.SMOOKS_EXECUTION_CONTEXT,
ExecutionContext.class));
}
@Test
@@ -299,6 +300,8 @@ public class SmooksProcessorTest extends CamelTestSupport {
@Test
public void testProcessGivenCamelCharsetNameProperty() throws Exception {
context.addRoutes(new RouteBuilder() {
+ @SuppressWarnings("resource")
+ // NOTE: the context will take care to clean resources
@Override
public void configure() {
Smooks smooks = new Smooks().setExports(new
Exports(JavaSink.class));
@@ -366,6 +369,8 @@ public class SmooksProcessorTest extends CamelTestSupport {
public void testProcessWhenBodyIsFileAndSmooksExportIsStringSink() throws
Exception {
deleteDirectory("target/smooks");
context.addRoutes(new RouteBuilder() {
+ @SuppressWarnings("resource")
+ // NOTE: the context will take care to clean resources
public void configure() {
from("file://target/smooks")
.process(new SmooksProcessor(new
Smooks().setExports(new Exports(StringSink.class)), context))
@@ -384,6 +389,8 @@ public class SmooksProcessorTest extends CamelTestSupport {
}
@Test
+ @SuppressWarnings("resource")
+ // NOTE: the context will take care to clean resources
public void
testProcessWhenSmooksExportIsJavaSinkAndBodyIsVisitedByJavaBeanValue() throws
Exception {
Smooks smooks = new Smooks().setExports(new Exports(JavaSink.class));
context.addRoutes(new RouteBuilder() {
@@ -403,6 +410,8 @@ public class SmooksProcessorTest extends CamelTestSupport {
}
@Test
+ @SuppressWarnings("resource")
+ // NOTE: the context will take care to clean resources
public void
testProcessWhenSmooksExportIsJavaSinkAndBodyIsVisitedByMultipleJavaBeanValues()
throws Exception {
Smooks smooks = new Smooks().setExports(new Exports(JavaSink.class));
context.addRoutes(new RouteBuilder() {
@@ -424,6 +433,8 @@ public class SmooksProcessorTest extends CamelTestSupport {
}
@Test
+ @SuppressWarnings("resource")
+ // NOTE: the context will take care to clean resources
public void testProcessWhenSmooksExportIsJavaSinkAndBodyIsVisitedByBean()
throws Exception {
Smooks smooks = new Smooks().setExports(new Exports(JavaSink.class));
context.addRoutes(new RouteBuilder() {
@@ -445,6 +456,8 @@ public class SmooksProcessorTest extends CamelTestSupport {
}
@Test
+ @SuppressWarnings("resource")
+ // NOTE: the context will take care to clean resources
public void testProcessWhenSmooksExportIsStringSink() throws Exception {
context.addRoutes(new RouteBuilder() {
public void configure() {
diff --git
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/converter/SinkConverterTest.java
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/converter/SinkConverterTest.java
index ebb673f93543..162ca07eea62 100644
---
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/converter/SinkConverterTest.java
+++
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/converter/SinkConverterTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.smooks.converter;
import java.io.BufferedReader;
+import java.io.IOException;
import org.apache.camel.TypeConverter;
import org.apache.camel.impl.DefaultCamelContext;
@@ -32,9 +33,10 @@ public class SinkConverterTest {
private TypeConverter typeConverter;
@BeforeEach
- public void beforeEach() {
- DefaultCamelContext camelContext = new DefaultCamelContext();
- typeConverter = camelContext.getTypeConverter();
+ public void beforeEach() throws IOException {
+ try (DefaultCamelContext camelContext = new DefaultCamelContext()) {
+ this.typeConverter = camelContext.getTypeConverter();
+ }
}
@Test
diff --git
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/converter/SourceConverterTest.java
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/converter/SourceConverterTest.java
index ba93c5b2ce80..37334f7633ea 100644
---
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/converter/SourceConverterTest.java
+++
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/converter/SourceConverterTest.java
@@ -33,9 +33,10 @@ public class SourceConverterTest {
private TypeConverter typeConverter;
@BeforeEach
- public void beforeEach() {
- CamelContext camelContext = new DefaultCamelContext();
- typeConverter = camelContext.getTypeConverter();
+ public void beforeEach() throws Exception {
+ try (CamelContext camelContext = new DefaultCamelContext()) {
+ typeConverter = camelContext.getTypeConverter();
+ }
}
@Test
diff --git
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterFunctionalTest.java
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterFunctionalTest.java
index cfbe0af9454f..a1b246581769 100644
---
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterFunctionalTest.java
+++
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterFunctionalTest.java
@@ -32,13 +32,14 @@ public class BeanRouterFunctionalTest extends
CamelTestSupport {
MockEndpoint endpoint =
createAndConfigureMockEndpoint("mock://beanRouterUnitTest");
endpoint.setExpectedMessageCount(1);
- Smooks smooks = new Smooks("bean-routing-smooks-config.xml");
-
smooks.getApplicationContext().getRegistry().registerObject(CamelContext.class,
endpoint.getCamelContext());
- smooks.filterSource(new
StreamSource<>(getClass().getResourceAsStream("/xml/customer.xml")));
+ try (Smooks smooks = new Smooks("bean-routing-smooks-config.xml")) {
+
smooks.getApplicationContext().getRegistry().registerObject(CamelContext.class,
endpoint.getCamelContext());
+ smooks.filterSource(new
StreamSource<>(getClass().getResourceAsStream("/xml/customer.xml")));
- endpoint.assertIsSatisfied();
- Customer customer =
endpoint.getReceivedExchanges().get(0).getMessage().getBody(Customer.class);
- assertEquals("Wonderland", customer.getCountry());
+ endpoint.assertIsSatisfied();
+ Customer customer =
endpoint.getReceivedExchanges().get(0).getMessage().getBody(Customer.class);
+ assertEquals("Wonderland", customer.getCountry());
+ }
}
private MockEndpoint createAndConfigureMockEndpoint(String endpointUri)
throws Exception {
diff --git
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterTest.java
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterTest.java
index fcf3c435b3d6..ccdd7996bb80 100644
---
a/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterTest.java
+++
b/components/camel-smooks/src/test/java/org/apache/camel/component/smooks/routing/BeanRouterTest.java
@@ -76,47 +76,50 @@ public class BeanRouterTest extends CamelTestSupport {
endpoint.setExpectedMessageCount(1);
endpoint.expectedBodiesReceived(myBean);
- Smooks smooks = new Smooks();
- ExecutionContext executionContext = smooks.createExecutionContext();
+ try (Smooks smooks = new Smooks()) {
+ ExecutionContext executionContext =
smooks.createExecutionContext();
- BeanRouter beanRouter = createBeanRouter(null, BEAN_ID, END_POINT_URI);
- beanRouter.onPreExecution(executionContext);
- executionContext.getBeanContext().addBean(BEAN_ID, myBean);
+ BeanRouter beanRouter = createBeanRouter(null, BEAN_ID,
END_POINT_URI);
+ beanRouter.onPreExecution(executionContext);
+ executionContext.getBeanContext().addBean(BEAN_ID, myBean);
- // Force an END event
- executionContext.getBeanContext().notifyObservers(new
DefaultBeanContextLifecycleEvent(
- executionContext,
- null, BeanLifecycle.END_FRAGMENT,
executionContext.getBeanContext().getBeanId(BEAN_ID), myBean));
+ // Force an END event
+ executionContext.getBeanContext().notifyObservers(new
DefaultBeanContextLifecycleEvent(
+ executionContext,
+ null, BeanLifecycle.END_FRAGMENT,
executionContext.getBeanContext().getBeanId(BEAN_ID), myBean));
- endpoint.assertIsSatisfied();
+ endpoint.assertIsSatisfied();
+ }
}
@Test
public void testBeanRouterAddsCamelSmooksExecutionContextHeader() throws
Exception {
- Smooks smooks = new Smooks();
- ExecutionContext executionContext = smooks.createExecutionContext();
+ try (Smooks smooks = new Smooks()) {
+ ExecutionContext executionContext =
smooks.createExecutionContext();
- endpoint.setExpectedMessageCount(1);
-
endpoint.expectedHeaderReceived(SmooksConstants.SMOOKS_EXECUTION_CONTEXT,
executionContext);
+ endpoint.setExpectedMessageCount(1);
+
endpoint.expectedHeaderReceived(SmooksConstants.SMOOKS_EXECUTION_CONTEXT,
executionContext);
- BeanRouter beanRouter = createBeanRouter(null, BEAN_ID, END_POINT_URI);
- beanRouter.onPreExecution(executionContext);
- executionContext.getBeanContext().addBean(BEAN_ID, myBean);
+ BeanRouter beanRouter = createBeanRouter(null, BEAN_ID,
END_POINT_URI);
+ beanRouter.onPreExecution(executionContext);
+ executionContext.getBeanContext().addBean(BEAN_ID, myBean);
- // Force an END event
- executionContext.getBeanContext().notifyObservers(new
DefaultBeanContextLifecycleEvent(
- executionContext,
- null, BeanLifecycle.END_FRAGMENT,
executionContext.getBeanContext().getBeanId(BEAN_ID), myBean));
+ // Force an END event
+ executionContext.getBeanContext().notifyObservers(new
DefaultBeanContextLifecycleEvent(
+ executionContext,
+ null, BeanLifecycle.END_FRAGMENT,
executionContext.getBeanContext().getBeanId(BEAN_ID), myBean));
- endpoint.assertIsSatisfied();
- assertNotNull(endpoint.getReceivedExchanges().get(0).getMessage()
- .getHeader(SmooksConstants.SMOOKS_EXECUTION_CONTEXT,
ExecutionContext.class).getBeanContext().getBean(BEAN_ID));
+ endpoint.assertIsSatisfied();
+ assertNotNull(endpoint.getReceivedExchanges().get(0).getMessage()
+ .getHeader(SmooksConstants.SMOOKS_EXECUTION_CONTEXT,
ExecutionContext.class).getBeanContext()
+ .getBean(BEAN_ID));
+ }
}
@BeforeEach
public void beforeEach() throws Exception {
endpoint = createAndConfigureMockEndpoint(END_POINT_URI);
- Exchange exchange = createExchange(endpoint);
+ createExchange(endpoint);
BeanContext beanContext =
createBeanContextAndSetBeanInContext(BEAN_ID, myBean);
smooksExecutionContext = createExecutionContext();
diff --git
a/components/camel-smooks/src/test/java/org/apache/camel/dataformat/smooks/SmooksDataFormatTest.java
b/components/camel-smooks/src/test/java/org/apache/camel/dataformat/smooks/SmooksDataFormatTest.java
index c7b3b9ed320c..d3b6bedf3651 100644
---
a/components/camel-smooks/src/test/java/org/apache/camel/dataformat/smooks/SmooksDataFormatTest.java
+++
b/components/camel-smooks/src/test/java/org/apache/camel/dataformat/smooks/SmooksDataFormatTest.java
@@ -60,12 +60,16 @@ public class SmooksDataFormatTest extends CamelTestSupport {
}
@AfterEach
- public void afterEach() {
+ public void afterEach() throws IOException {
dataFormatter.stop();
+ camelContext.stop();
+ camelContext.close();
}
@Test
public void unmarshal() throws Exception {
+ @SuppressWarnings("resource")
+ // NOTE: resource will be closed by the context
final UnmarshalProcessor unmarshalProcessor = new
UnmarshalProcessor(dataFormatter);
final DefaultExchange exchange = new DefaultExchange(camelContext);
exchange.getIn().setBody(getCustomerInputStream(CUSTOMER_XML));
@@ -77,6 +81,8 @@ public class SmooksDataFormatTest extends CamelTestSupport {
@Test
public void marshal() throws Exception {
+ @SuppressWarnings("resource")
+ // NOTE: resource will be closed by the context
final MarshalProcessor marshalProcessor = new
MarshalProcessor(dataFormatter);
final DefaultExchange exchange = new DefaultExchange(camelContext);
final Customer customer = new Customer();
