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
The following commit(s) were added to refs/heads/main by this push:
new 9ec5de53b62 (chores) camel-jms: consolidate duplicate test code
9ec5de53b62 is described below
commit 9ec5de53b62f1bcbc42a49ffa619d1a2b8a7ec0a
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Aug 17 13:34:04 2022 +0200
(chores) camel-jms: consolidate duplicate test code
---
.../component/jms/AbstractPersistentJMSTest.java | 20 ++++++++++++++++++++
.../jms/ConsumerTemplateJmsSelectorTest.java | 6 +-----
.../component/jms/JmsAsyncStartListenerTest.java | 6 +-----
.../component/jms/JmsAsyncStartStopListenerTest.java | 6 +-----
.../camel/component/jms/JmsAutoStartupTest.java | 16 ----------------
.../camel/component/jms/JmsConsumeTemplateTest.java | 16 ----------------
.../component/jms/JmsDeadLetterChannelInOutTest.java | 17 -----------------
.../camel/component/jms/JmsDurableTopicTest.java | 13 -------------
.../component/jms/JmsProducerDisableReplyToTest.java | 17 -----------------
.../jms/JmsRouteDeliveryModePreserveQoSTest.java | 14 --------------
...etBodyNullErrorHandlerUseOriginalMessageTest.java | 13 -------------
.../camel/component/jms/JmsSuspendResumeTest.java | 16 ----------------
.../jms/JmsThrottlingInflightRoutePolicyTest.java | 7 +------
.../camel/component/jms/JmsToDSendDynamicTest.java | 14 --------------
.../jms/JmsToDSendDynamicTwoDisabledTest.java | 15 ---------------
.../component/jms/JmsToDSendDynamicTwoTest.java | 14 --------------
.../camel/component/jms/ManagedJmsEndpointTest.java | 15 ---------------
.../component/jms/TwoConsumerOnSameQueueTest.java | 14 --------------
.../component/jms/TwoConsumerOnSameTopicTest.java | 16 ----------------
.../jms/issues/JmsDirectStartupOrderIssueTest.java | 15 ---------------
20 files changed, 24 insertions(+), 246 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractPersistentJMSTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractPersistentJMSTest.java
index 36b8b9af3bf..5dc720b3a52 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractPersistentJMSTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractPersistentJMSTest.java
@@ -17,6 +17,10 @@
package org.apache.camel.component.jms;
+import javax.jms.ConnectionFactory;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
import org.apache.camel.test.infra.activemq.services.ActiveMQService;
import org.apache.camel.test.infra.activemq.services.ActiveMQServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -25,9 +29,25 @@ import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+
@Tags({ @Tag("jms") })
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public abstract class AbstractPersistentJMSTest extends CamelTestSupport {
@RegisterExtension
public static ActiveMQService service =
ActiveMQServiceFactory.createPersistentVMService();
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext camelContext = super.createCamelContext();
+
+ createConnectionFactory(camelContext);
+
+ return camelContext;
+ }
+
+ protected void createConnectionFactory(CamelContext camelContext) {
+ ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
+ camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
+ }
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java
index 822c2ab16dd..b12cb24904c 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumerTemplateJmsSelectorTest.java
@@ -43,14 +43,10 @@ public class ConsumerTemplateJmsSelectorTest extends
AbstractPersistentJMSTest {
}
@Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- // must be persistent to remember the messages
+ protected void createConnectionFactory(CamelContext camelContext) {
ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
JmsComponent component = jmsComponentTransacted(connectionFactory);
camelContext.addComponent("activemq", component);
- return camelContext;
}
@Override
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartListenerTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartListenerTest.java
index 7a698a802f0..eef320d21dd 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartListenerTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartListenerTest.java
@@ -45,17 +45,13 @@ public class JmsAsyncStartListenerTest extends
AbstractPersistentJMSTest {
}
@Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
+ protected void createConnectionFactory(CamelContext camelContext) {
// use a persistent queue as the consumer is started asynchronously
// so we need a persistent store in case no active consumers when we
send the messages
ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
JmsComponent jms = jmsComponentAutoAcknowledge(connectionFactory);
jms.getConfiguration().setAsyncStartListener(true);
camelContext.addComponent(componentName, jms);
-
- return camelContext;
}
@Override
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartStopListenerTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartStopListenerTest.java
index c6123bb15b4..bb364957608 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartStopListenerTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStartStopListenerTest.java
@@ -45,9 +45,7 @@ public class JmsAsyncStartStopListenerTest extends
AbstractPersistentJMSTest {
}
@Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
+ protected void createConnectionFactory(CamelContext camelContext) {
// use a persistent queue as the consumer is started asynchronously
// so we need a persistent store in case no active consumers when we
send the messages
ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
@@ -55,8 +53,6 @@ public class JmsAsyncStartStopListenerTest extends
AbstractPersistentJMSTest {
jms.getConfiguration().setAsyncStartListener(true);
jms.getConfiguration().setAsyncStopListener(true);
camelContext.addComponent(componentName, jms);
-
- return camelContext;
}
@Override
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
index df70283e5ea..b03bf904df4 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAutoStartupTest.java
@@ -18,17 +18,12 @@ package org.apache.camel.component.jms;
import java.util.concurrent.TimeUnit;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.Service;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
-import static
org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper.createConnectionFactory;
import static org.junit.jupiter.api.Assertions.assertFalse;
public class JmsAutoStartupTest extends AbstractPersistentJMSTest {
@@ -72,15 +67,4 @@ public class JmsAutoStartupTest extends
AbstractPersistentJMSTest {
};
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- // must use persistent so the message is not lost
- ConnectionFactory connectionFactory = createConnectionFactory(service);
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumeTemplateTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumeTemplateTest.java
index f85f114ea0d..25899eb245c 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumeTemplateTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumeTemplateTest.java
@@ -16,12 +16,8 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsConsumeTemplateTest extends AbstractPersistentJMSTest {
@@ -38,18 +34,6 @@ public class JmsConsumeTemplateTest extends
AbstractPersistentJMSTest {
assertEquals("Hello World", out);
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- // must be persistent so the consumer can receive the message as we
receive AFTER the message
- // has been published
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.createPersistentConnectionFactory();
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
public boolean isUseRouteBuilder() {
return false;
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterChannelInOutTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterChannelInOutTest.java
index c7cb6200632..b21c39459b4 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterChannelInOutTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterChannelInOutTest.java
@@ -16,16 +16,11 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -45,18 +40,6 @@ public class JmsDeadLetterChannelInOutTest extends
AbstractPersistentJMSTest {
assertEquals("Hello World", dead);
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- // must be persistent so the consumer can receive the message as we
receive AFTER the message
- // has been published
- ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDurableTopicTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDurableTopicTest.java
index 7d3fa50fbc4..83ff43b5a2b 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDurableTopicTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDurableTopicTest.java
@@ -18,16 +18,11 @@ package org.apache.camel.component.jms;
import java.util.concurrent.TimeUnit;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
-
public class JmsDurableTopicTest extends AbstractPersistentJMSTest {
@Test
@@ -45,14 +40,6 @@ public class JmsDurableTopicTest extends
AbstractPersistentJMSTest {
});
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.createPersistentConnectionFactory();
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerDisableReplyToTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerDisableReplyToTest.java
index 6d62da6e0a6..40efeb871f2 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerDisableReplyToTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerDisableReplyToTest.java
@@ -16,13 +16,8 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsProducerDisableReplyToTest extends AbstractPersistentJMSTest {
@@ -39,18 +34,6 @@ public class JmsProducerDisableReplyToTest extends
AbstractPersistentJMSTest {
assertEquals("Hello World", out);
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- // must be persistent so the consumer can receive the message as we
receive AFTER the message
- // has been published
- ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
public boolean isUseRouteBuilder() {
return false;
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
index d5500fa3348..5416de1251f 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
@@ -18,15 +18,12 @@ package org.apache.camel.component.jms;
import java.util.Map;
-import javax.jms.ConnectionFactory;
import javax.jms.DeliveryMode;
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -170,17 +167,6 @@ public class JmsRouteDeliveryModePreserveQoSTest extends
AbstractPersistentJMSTe
assertMockEndpointsSatisfied();
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.createPersistentConnectionFactory();
-
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSetBodyNullErrorHandlerUseOriginalMessageTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSetBodyNullErrorHandlerUseOriginalMessageTest.java
index c3dc6ca1d74..40f85cc5d38 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSetBodyNullErrorHandlerUseOriginalMessageTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSetBodyNullErrorHandlerUseOriginalMessageTest.java
@@ -16,26 +16,13 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsSetBodyNullErrorHandlerUseOriginalMessageTest extends
AbstractPersistentJMSTest {
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
- return camelContext;
- }
-
@Test
public void testSetNull() throws Exception {
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
index 7f1ab98d2d8..f39ea148d87 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
@@ -18,15 +18,10 @@ package org.apache.camel.component.jms;
import java.util.concurrent.TimeUnit;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
-
public class JmsSuspendResumeTest extends AbstractPersistentJMSTest {
@Test
@@ -58,17 +53,6 @@ public class JmsSuspendResumeTest extends
AbstractPersistentJMSTest {
assertMockEndpointsSatisfied();
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- // must use persistent so the message is not lost
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.createPersistentConnectionFactory();
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsThrottlingInflightRoutePolicyTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsThrottlingInflightRoutePolicyTest.java
index c72c32be904..1bad679d882 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsThrottlingInflightRoutePolicyTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsThrottlingInflightRoutePolicyTest.java
@@ -60,16 +60,11 @@ public class JmsThrottlingInflightRoutePolicyTest extends
AbstractPersistentJMST
}
@Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
+ protected void createConnectionFactory(CamelContext camelContext) {
ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
camelContext.addComponent("activemq",
jmsComponentTransacted(connectionFactory));
// and use another component for sender
camelContext.addComponent("activemq-sender",
jmsComponentTransacted(connectionFactory));
-
- return camelContext;
}
-
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTest.java
index 55b88898a15..df45e36d5e9 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTest.java
@@ -16,13 +16,9 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsToDSendDynamicTest extends AbstractPersistentJMSTest {
@@ -50,16 +46,6 @@ public class JmsToDSendDynamicTest extends
AbstractPersistentJMSTest {
assertEquals("Hello bar", out);
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.createPersistentConnectionFactory();
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTwoDisabledTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTwoDisabledTest.java
index 97dddad6ddb..a6586f702e5 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTwoDisabledTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTwoDisabledTest.java
@@ -16,14 +16,9 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsToDSendDynamicTwoDisabledTest extends
AbstractPersistentJMSTest {
@@ -42,16 +37,6 @@ public class JmsToDSendDynamicTwoDisabledTest extends
AbstractPersistentJMSTest
assertEquals(4, count, "There should be 4 activemq endpoint");
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTwoTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTwoTest.java
index 409cb9f9d82..2a19c59af4a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTwoTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDSendDynamicTwoTest.java
@@ -16,13 +16,9 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsToDSendDynamicTwoTest extends AbstractPersistentJMSTest {
@@ -41,16 +37,6 @@ public class JmsToDSendDynamicTwoTest extends
AbstractPersistentJMSTest {
assertEquals(2, count, "There should only be 2 activemq endpoint");
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.createPersistentConnectionFactory();
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
index e4bd5aabc24..fb7c5aa3a04 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
@@ -18,17 +18,12 @@ package org.apache.camel.component.jms;
import java.util.Set;
-import javax.jms.ConnectionFactory;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -42,16 +37,6 @@ public class ManagedJmsEndpointTest extends
AbstractPersistentJMSTest {
return true;
}
- @Override
- protected CamelContext createCamelContext() {
- CamelContext context = new DefaultCamelContext();
-
- ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
- context.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return context;
- }
-
protected MBeanServer getMBeanServer() {
return
context.getManagementStrategy().getManagementAgent().getMBeanServer();
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
index 58e78d4019e..6975a3ad3a4 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameQueueTest.java
@@ -16,14 +16,10 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertTrue;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
@@ -91,16 +87,6 @@ public class TwoConsumerOnSameQueueTest extends
AbstractPersistentJMSTest {
assertMockEndpointsSatisfied();
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- ConnectionFactory connectionFactory =
CamelJmsTestHelper.createPersistentConnectionFactory();
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
index 6aebeac21ff..70aeeca5f6c 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
@@ -16,15 +16,10 @@
*/
package org.apache.camel.component.jms;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertTrue;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
@@ -108,17 +103,6 @@ public class TwoConsumerOnSameTopicTest extends
AbstractPersistentJMSTest {
assertMockEndpointsSatisfied();
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- // must be persistent to remember the messages
- ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsDirectStartupOrderIssueTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsDirectStartupOrderIssueTest.java
index f64e2c16829..ba3e7653647 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsDirectStartupOrderIssueTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsDirectStartupOrderIssueTest.java
@@ -18,17 +18,12 @@ package org.apache.camel.component.jms.issues;
import java.util.List;
-import javax.jms.ConnectionFactory;
-
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractPersistentJMSTest;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.RouteStartupOrder;
-import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
import static org.junit.jupiter.api.Assertions.assertEquals;
/**
@@ -59,16 +54,6 @@ public class JmsDirectStartupOrderIssueTest extends
AbstractPersistentJMSTest {
assertEquals("amq", order.get(1).getRoute().getId());
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- ConnectionFactory connectionFactory =
ConnectionFactoryHelper.createConnectionFactory(service);
- camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
-
- return camelContext;
- }
-
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
