You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/03/06 18:16:07 UTC
(camel) 04/08: CAMEL-20477: stop using a broker with custom configuration for tests that need a common one
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7c41c15258d403caf2eb1bd0b323d7f233062311
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Mar 6 11:19:30 2024 +0100
CAMEL-20477: stop using a broker with custom configuration for tests that need a common one
---
.../spring/AbstractSpringJMSITSupport.java | 2 +-
.../integration/spring/JmsConsumerShutdownIT.java | 19 ++++++++++++++++-
...kerClientITSupport.java => SpringJMSBasic.java} | 24 +++++-----------------
.../issues/AdviceWithTransactionIssueIT.java | 4 ++--
.../AsyncJmsProducerExceptionInTXManualIT.java | 4 ++--
.../spring/issues/FileToJmsIssueIT.java | 4 ++--
...ndToMultipleDestinationsWithSameEndpointIT.java | 4 ++--
.../spring/issues/JmsSpringValidatorIT.java | 4 ++--
.../spring/polling/JmsPollingConsumerSpringIT.java | 4 ++--
.../spring/tx/JMSNestedTransactionRollbackIT.java | 4 ++--
.../integration/spring/JmsConsumerShutdownIT.xml | 2 +-
.../{camelBrokerClient.xml => SpringJMSBasic.xml} | 2 +-
.../spring/issues/AdviceWithTransactionIssueIT.xml | 2 +-
.../integration/spring/issues/FileToJmsIssueIT.xml | 2 +-
.../spring/issues/JmsSpringValidatorIT.xml | 2 +-
.../spring/polling/JmsPollingConsumerIT.xml | 2 +-
.../spring/tx/JMSNestedTransactionRollbackIT.xml | 2 +-
17 files changed, 45 insertions(+), 42 deletions(-)
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/AbstractSpringJMSITSupport.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/AbstractSpringJMSITSupport.java
index fca0815ed6a..038caf56695 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/AbstractSpringJMSITSupport.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/AbstractSpringJMSITSupport.java
@@ -29,7 +29,7 @@ import org.springframework.context.support.AbstractApplicationContext;
public abstract class AbstractSpringJMSITSupport extends CamelSpringTestSupport {
@RegisterExtension
- public static ArtemisService service = ArtemisServiceFactory.createVMService();
+ public static ArtemisService service = ArtemisServiceFactory.createSingletonVMService();
/**
* Used by spring xml configurations
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.java
index 88d7eaa5eef..22cafe28d99 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.java
@@ -16,17 +16,30 @@
*/
package org.apache.camel.component.jms.integration.spring;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.artemis.services.ArtemisEmbeddedServiceBuilder;
+import org.apache.camel.test.infra.artemis.services.ArtemisService;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
-public class JmsConsumerShutdownIT extends CamelBrokerClientITSupport {
+public final class JmsConsumerShutdownIT extends CamelSpringTestSupport {
+ @RegisterExtension
+ public static ArtemisService service = new ArtemisEmbeddedServiceBuilder()
+ .withCustomConfiguration(configuration -> {
+ AddressSettings addressSettings = new AddressSettings();
+ addressSettings.setMaxSizeMessages(5);
+ configuration.addAddressSetting("#", addressSettings);
+ })
+ .build();
@Produce("jms:start")
protected ProducerTemplate activemq;
@@ -46,6 +59,10 @@ public class JmsConsumerShutdownIT extends CamelBrokerClientITSupport {
"org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.xml");
}
+ public static String getServiceAddress() {
+ return service.serviceAddress();
+ }
+
@Test
@DirtiesContext
void testJmsConsumerShutdownWithMessageInFlight() throws InterruptedException {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/CamelBrokerClientITSupport.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/SpringJMSBasic.java
similarity index 57%
rename from components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/CamelBrokerClientITSupport.java
rename to components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/SpringJMSBasic.java
index 4a8c2a9fb71..696bc3e506f 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/CamelBrokerClientITSupport.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/SpringJMSBasic.java
@@ -16,27 +16,13 @@
*/
package org.apache.camel.component.jms.integration.spring;
-import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.apache.camel.test.infra.artemis.services.ArtemisEmbeddedServiceBuilder;
-import org.apache.camel.test.infra.artemis.services.ArtemisService;
-import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Tags;
-import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.context.support.AbstractApplicationContext;
-@Tags({ @Tag("not-parallel"), @Tag("spring") })
-public abstract class CamelBrokerClientITSupport extends CamelSpringTestSupport {
-
- @RegisterExtension
- public static ArtemisService service = new ArtemisEmbeddedServiceBuilder()
- .withCustomConfiguration(configuration -> {
- AddressSettings addressSettings = new AddressSettings();
- addressSettings.setMaxSizeMessages(50);
- configuration.addAddressSetting("#", addressSettings);
- })
- .build();
+/**
+ * For tests that need a basic Spring camel context without additional configuration
+ */
+public abstract class SpringJMSBasic extends AbstractSpringJMSITSupport {
public static String getServiceAddress() {
return service.serviceAddress();
@@ -46,6 +32,6 @@ public abstract class CamelBrokerClientITSupport extends CamelSpringTestSupport
protected AbstractApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
new String[] {
- "classpath:org/apache/camel/component/jms/integration/spring/camelBrokerClient.xml" });
+ "classpath:org/apache/camel/component/jms/integration/spring/SpringJMSBasic.xml" });
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AdviceWithTransactionIssueIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AdviceWithTransactionIssueIT.java
index c0cf6f4a1be..d4a2bd7606a 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AdviceWithTransactionIssueIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AdviceWithTransactionIssueIT.java
@@ -18,13 +18,13 @@ package org.apache.camel.component.jms.integration.spring.issues;
import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.AdviceWithRouteBuilder;
-import org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport;
+import org.apache.camel.component.jms.integration.spring.SpringJMSBasic;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
-public class AdviceWithTransactionIssueIT extends CamelBrokerClientITSupport {
+public class AdviceWithTransactionIssueIT extends SpringJMSBasic {
@Override
protected AbstractApplicationContext createApplicationContext() {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AsyncJmsProducerExceptionInTXManualIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AsyncJmsProducerExceptionInTXManualIT.java
index 3650ca85555..8b6b5678be2 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AsyncJmsProducerExceptionInTXManualIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AsyncJmsProducerExceptionInTXManualIT.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jms.integration.spring.issues;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport;
+import org.apache.camel.component.jms.integration.spring.SpringJMSBasic;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.fail;
* @see <a href="https://activemq.apache.org/producer-flow-control.html">ActiveMQ flow control</a>
*/
@Disabled("Cannot reproduce with Artemis")
-class AsyncJmsProducerExceptionInTXManualIT extends CamelBrokerClientITSupport {
+class AsyncJmsProducerExceptionInTXManualIT extends SpringJMSBasic {
@BeforeAll
static void setSystemProperties() {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/FileToJmsIssueIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/FileToJmsIssueIT.java
index ce3757b1796..9c5b0868cc5 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/FileToJmsIssueIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/FileToJmsIssueIT.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jms.integration.spring.issues;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
-import org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport;
+import org.apache.camel.component.jms.integration.spring.SpringJMSBasic;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.junit.jupiter.api.Tag;
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
@Tags({ @Tag("not-parallel"), @Tag("spring") })
-public class FileToJmsIssueIT extends CamelBrokerClientITSupport {
+public class FileToJmsIssueIT extends SpringJMSBasic {
@EndpointInject("mock:result")
protected MockEndpoint result;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSendToMultipleDestinationsWithSameEndpointIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSendToMultipleDestinationsWithSameEndpointIT.java
index 196d73cb558..311fe5a2099 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSendToMultipleDestinationsWithSameEndpointIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSendToMultipleDestinationsWithSameEndpointIT.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jms.integration.spring.issues;
import org.apache.camel.ExchangePattern;
import org.apache.camel.component.jms.JmsConstants;
-import org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport;
+import org.apache.camel.component.jms.integration.spring.SpringJMSBasic;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
// This one does not run well in parallel: it becomes flaky
@Tags({ @Tag("not-parallel") })
-public class JmsSendToMultipleDestinationsWithSameEndpointIT extends CamelBrokerClientITSupport {
+public class JmsSendToMultipleDestinationsWithSameEndpointIT extends SpringJMSBasic {
private static final Logger LOG = LoggerFactory.getLogger(JmsSendToMultipleDestinationsWithSameEndpointIT.class);
private static final String URI = "activemq:queue:JmsSendToMultipleDestinationsWithSameEndpointIT?autoStartup=false";
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.java
index eeb2babeb25..353fb0c6fdf 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.jms.integration.spring.issues;
-import org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport;
+import org.apache.camel.component.jms.integration.spring.SpringJMSBasic;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class JmsSpringValidatorIT extends CamelBrokerClientITSupport {
+public class JmsSpringValidatorIT extends SpringJMSBasic {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/polling/JmsPollingConsumerSpringIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/polling/JmsPollingConsumerSpringIT.java
index e107db29e02..8e004e3dbc9 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/polling/JmsPollingConsumerSpringIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/polling/JmsPollingConsumerSpringIT.java
@@ -22,7 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Handler;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport;
+import org.apache.camel.component.jms.integration.spring.SpringJMSBasic;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
@@ -33,7 +33,7 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@Tags({ @Tag("not-parallel"), @Tag("spring") })
-public class JmsPollingConsumerSpringIT extends CamelBrokerClientITSupport {
+public class JmsPollingConsumerSpringIT extends SpringJMSBasic {
@Produce("jms:JmsPollingConsumerSpringITStartConsumer")
protected ProducerTemplate startConsumer;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSNestedTransactionRollbackIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSNestedTransactionRollbackIT.java
index 4e7d365ad9e..30baa08f17f 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSNestedTransactionRollbackIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/JMSNestedTransactionRollbackIT.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.component.jms.integration.spring.tx;
-import org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport;
+import org.apache.camel.component.jms.integration.spring.SpringJMSBasic;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class JMSNestedTransactionRollbackIT extends CamelBrokerClientITSupport {
+public class JMSNestedTransactionRollbackIT extends SpringJMSBasic {
@Override
protected ClassPathXmlApplicationContext createApplicationContext() {
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.xml
index 97d4b9dad5a..78ddded96e4 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/JmsConsumerShutdownIT.xml
@@ -26,7 +26,7 @@
<bean id="jmsConnectionFactory" class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport" factory-method="getServiceAddress"/>
+ <bean class="org.apache.camel.component.jms.integration.spring.JmsConsumerShutdownIT" factory-method="getServiceAddress"/>
</property>
</bean>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/camelBrokerClient.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/SpringJMSBasic.xml
similarity index 96%
rename from components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/camelBrokerClient.xml
rename to components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/SpringJMSBasic.xml
index 2dfe1747531..b130af13328 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/camelBrokerClient.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/SpringJMSBasic.xml
@@ -30,7 +30,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/came
<bean class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory" id="activeMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport" factory-method="getServiceAddress"/>
+ <bean class="org.apache.camel.component.jms.integration.spring.SpringJMSBasic" factory-method="getServiceAddress"/>
</property>
</bean>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/AdviceWithTransactionIssueIT.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/AdviceWithTransactionIssueIT.xml
index a5127d00f73..3fb79be2a9a 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/AdviceWithTransactionIssueIT.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/AdviceWithTransactionIssueIT.xml
@@ -30,7 +30,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/came
<bean id="jmsConnectionFactory" class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport" factory-method="getServiceAddress"/>
+ <bean class="org.apache.camel.component.jms.integration.spring.SpringJMSBasic" factory-method="getServiceAddress"/>
</property>
</bean>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/FileToJmsIssueIT.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/FileToJmsIssueIT.xml
index 292455ff8db..3588d4ff80f 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/FileToJmsIssueIT.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/FileToJmsIssueIT.xml
@@ -30,7 +30,7 @@
<bean id="jmsConnectionFactory" class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport" factory-method="getServiceAddress"/>
+ <bean class="org.apache.camel.component.jms.integration.spring.SpringJMSBasic" factory-method="getServiceAddress"/>
</property>
</bean>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.xml
index 8a91e9e725e..e8d2f718123 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/issues/JmsSpringValidatorIT.xml
@@ -25,7 +25,7 @@
<bean id="jmsConnectionFactory" class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport" factory-method="getServiceAddress"/>
+ <bean class="org.apache.camel.component.jms.integration.spring.SpringJMSBasic" factory-method="getServiceAddress"/>
</property>
</bean>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/polling/JmsPollingConsumerIT.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/polling/JmsPollingConsumerIT.xml
index 01d7524f2e9..359094ed408 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/polling/JmsPollingConsumerIT.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/polling/JmsPollingConsumerIT.xml
@@ -30,7 +30,7 @@
<bean id="jmsConnectionFactory" class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport" factory-method="getServiceAddress"/>
+ <bean class="org.apache.camel.component.jms.integration.spring.SpringJMSBasic" factory-method="getServiceAddress"/>
</property>
</bean>
diff --git a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/tx/JMSNestedTransactionRollbackIT.xml b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/tx/JMSNestedTransactionRollbackIT.xml
index 9867974f90d..4b650678a33 100644
--- a/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/tx/JMSNestedTransactionRollbackIT.xml
+++ b/components/camel-jms/src/test/resources/org/apache/camel/component/jms/integration/spring/tx/JMSNestedTransactionRollbackIT.xml
@@ -32,7 +32,7 @@
<bean id="jmsConnectionFactory" class="org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory">
<property name="brokerURL">
- <bean class="org.apache.camel.component.jms.integration.spring.CamelBrokerClientITSupport" factory-method="getServiceAddress"/>
+ <bean class="org.apache.camel.component.jms.integration.spring.SpringJMSBasic" factory-method="getServiceAddress"/>
</property>
</bean>