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 2023/03/07 22:12:51 UTC
[camel] 03/04: CAMEL-18957: converted camel-jms to camel-test-infra-core
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 1c9ae69d17c13995c94189049f35f2789602260e
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Jan 31 18:12:15 2023 +0100
CAMEL-18957: converted camel-jms to camel-test-infra-core
---
components/camel-jms/pom.xml | 8 +
.../camel/component/jms/AbstractJMSTest.java | 35 +++-
.../jms/ActiveMQOriginalDestinationTest.java | 25 +++
.../component/jms/AggregatedJmsRouteTest.java | 26 +++
.../camel/component/jms/BrowsableQueueTest.java | 26 +++
.../component/jms/ConsumeJmsBytesMessageTest.java | 28 ++-
.../component/jms/ConsumeJmsMapMessageTest.java | 26 ++-
.../component/jms/ConsumeJmsObjectMessageTest.java | 26 ++-
.../component/jms/ConsumeMessageConverterTest.java | 26 +++
.../jms/FileRouteJmsKeepLastModifiedTest.java | 28 ++-
.../component/jms/FileRouteJmsPreMoveTest.java | 27 ++-
.../camel/component/jms/FileRouteToJmsTest.java | 26 +++
.../component/jms/FileRouteToJmsToFileTest.java | 26 +++
.../component/jms/FromTextToBytesMessageTest.java | 27 +++
.../jms/JmsAddAndRemoveRouteManagementTest.java | 35 +++-
.../jms/JmsAllowAdditionalHeadersTest.java | 29 +++-
.../camel/component/jms/JmsAllowNullBodyTest.java | 27 +++
.../component/jms/JmsAsyncStopListenerTest.java | 25 +++
.../jms/JmsBatchResequencerJMSPriorityTest.java | 25 +++
.../camel/component/jms/JmsClientAckTest.java | 26 +++
.../JmsComponentTransactedCacheLevelNameTest.java | 25 +++
...sumerRestartPickupConfigurationChangesTest.java | 32 ++++
.../jms/JmsCustomHeaderFilterStrategyTest.java | 25 +++
.../component/jms/JmsDeadLetterQueueTest.java | 26 +++
...msDeadLetterQueueUsingTransferExchangeTest.java | 26 +++
.../component/jms/JmsDestinationResolverTest.java | 25 +++
.../jms/JmsEagerLoadingPropertiesTest.java | 27 +++
.../jms/JmsEndpointConfigurationTest.java | 31 ++++
.../jms/JmsErrorHandlerLogStackTraceTest.java | 26 +++
.../apache/camel/component/jms/JmsFilterTest.java | 24 +++
.../component/jms/JmsHeaderFilteringTest.java | 25 +++
.../jms/JmsHeaderFilteringWithSpringTest.java | 5 +-
.../jms/JmsInOnlyDisableTimeToLiveTest.java | 24 +++
.../jms/JmsInOnlyIncludeSentJMSMessageIDTest.java | 27 +++
.../jms/JmsInOnlyInvalidDestinationTest.java | 26 +++
.../component/jms/JmsInOnlyPooledExchangeTest.java | 37 +++-
.../jms/JmsInOnlyWithReplyToAsHeaderTest.java | 27 +++
...ToDisabledButJMSReplyToHeaderPreservedTest.java | 27 +++
.../jms/JmsInOnlyWithReplyToDisabledTest.java | 27 +++
.../jms/JmsInOnlyWithReplyToHeaderTest.java | 27 +++
.../jms/JmsInOnlyWithReplyToHeaderTopicTest.java | 29 +++-
.../jms/JmsInOnlyWithReplyToNotPreservedTest.java | 27 +++
.../component/jms/JmsInOnlyWithReplyToTest.java | 27 +++
.../component/jms/JmsInOutBeanReturnNullTest.java | 26 +++
.../jms/JmsInOutDisableTimeToLiveTest.java | 24 +++
.../jms/JmsInOutFixedReplyQueueTimeoutTest.java | 29 +++-
.../jms/JmsInOutIndividualRequestTimeoutTest.java | 25 +++
.../component/jms/JmsInOutNonPersistentTest.java | 27 +++
.../jms/JmsInOutSynchronousFalseTest.java | 24 +++
.../component/jms/JmsInOutSynchronousTest.java | 24 +++
.../jms/JmsInOutTransferExchangeTest.java | 25 +++
.../component/jms/JmsInOutWithNoOutBodyTest.java | 26 +++
.../jms/JmsIncludeAllJMSXPropertiesTest.java | 25 +++
...ailoverWithForceSendOriginalJmsMessageTest.java | 24 +++
...geAsOriginalMessageInDefaultUnitOfWorkTest.java | 55 ++++--
.../component/jms/JmsMessageBodySetNullTest.java | 106 +++++++-----
.../JmsMessageCreatedStrategyComponentTest.java | 25 +++
.../jms/JmsMessageCreatedStrategyEndpointTest.java | 26 +++
.../jms/JmsMessageIDNotOverridenAMQTest.java | 26 +++
.../component/jms/JmsMessageTimestampTest.java | 26 +++
.../camel/component/jms/JmsMessageTypeTest.java | 41 ++++-
.../component/jms/JmsMultipleConsumersTest.java | 34 +++-
.../component/jms/JmsNoRequestTimeoutTest.java | 26 +++
.../JmsNotInOnlyIncludeSentJMSMessageIDTest.java | 27 +++
.../jms/JmsNotIncludeAllJMSXPropertiesTest.java | 25 +++
...OnCompletionAndInterceptAndOnExceptionTest.java | 27 +++
.../camel/component/jms/JmsOnCompletionTest.java | 27 +++
.../component/jms/JmsPollingConsumerTest.java | 191 ---------------------
.../component/jms/JmsPriorityConsumerTest.java | 25 +++
.../component/jms/JmsProducerConcurrentTest.java | 26 +++
.../jms/JmsProducerConcurrentWithReplyTest.java | 25 +++
.../jms/JmsProducerWithJMSHeaderTest.java | 27 +++
.../camel/component/jms/JmsQosRouteTest.java | 26 +++
.../camel/component/jms/JmsRemoveHeaderTest.java | 27 +++
.../jms/JmsRequestReplyCorrelationTest.java | 24 +++
...sRequestReplyExclusiveReplyToComponentTest.java | 26 +++
...RequestReplyExclusiveReplyToConcurrentTest.java | 25 +++
...estReplyExclusiveReplyToRemoveAddRouteTest.java | 27 +++
.../jms/JmsRequestReplyExclusiveReplyToTest.java | 27 +++
.../JmsRequestReplyFixedReplyToInEndpointTest.java | 27 +++
.../jms/JmsRequestReplyManualReplyTest.java | 36 +++-
.../JmsRequestReplyManualWithJMSReplyToTest.java | 37 +++-
...lyProcessRepliesConcurrentUsingThreadsTest.java | 28 ++-
.../jms/JmsRequestReplyReplyToOverrideTest.java | 36 +++-
.../jms/JmsRequestReplySharedReplyToTest.java | 27 +++
.../jms/JmsRequestReplyTemporaryCacheNoneTest.java | 30 +++-
.../apache/camel/component/jms/JmsRouteTest.java | 44 +++--
.../jms/JmsRouteTimeoutCheckerIntervalTest.java | 26 +++
.../camel/component/jms/JmsRouteTimeoutTest.java | 27 +++
.../camel/component/jms/JmsRouteToFileTest.java | 26 +++
.../jms/JmsRouteUsingDifferentHeadersTest.java | 27 +++
.../component/jms/JmsRouteUsingJMSXGroupTest.java | 24 +++
.../jms/JmsRouteUsingSpringAndJmsNameTest.java | 2 -
.../component/jms/JmsRouteUsingSpringTest.java | 9 +-
.../JmsRouteWithCustomListenerContainerTest.java | 26 +++
.../JmsRouteWithDefaultKeyFormatStrategyTest.java | 27 +++
.../jms/JmsRouteWithInOnlyAndMultipleAcksTest.java | 26 +++
.../component/jms/JmsRouteWithInOnlyTest.java | 26 +++
.../component/jms/JmsRoutingSlipInOutTest.java | 26 +++
.../camel/component/jms/JmsRoutingSlipTest.java | 25 +++
.../camel/component/jms/JmsSelectorInTest.java | 28 ++-
.../camel/component/jms/JmsSelectorOptionTest.java | 25 +++
.../camel/component/jms/JmsSelectorTest.java | 27 +++
.../apache/camel/component/jms/JmsSessionTest.java | 26 +++
.../camel/component/jms/JmsSimpleHeaderTest.java | 26 +++
.../component/jms/JmsSimpleInOnlyNoMutateTest.java | 26 +++
.../jms/JmsSimpleRequestCustomReplyToTest.java | 25 +++
.../jms/JmsSimpleRequestLateReplyTest.java | 25 +++
.../component/jms/JmsSimpleRequestReply2Test.java | 26 +++
.../JmsSimpleRequestReplyFixedReplyQueueTest.java | 26 +++
.../component/jms/JmsSimpleRequestReplyTest.java | 26 +++
.../jms/JmsSplitterParallelChainedTest.java | 26 +++
.../component/jms/JmsSplitterParallelTest.java | 26 +++
.../jms/JmsSpringLoadBalanceFailoverJMSTest.java | 2 +
.../JmsStreamMessageTypeNoStreamCachingTest.java | 41 +++--
.../component/jms/JmsStreamMessageTypeTest.java | 31 +++-
.../org/apache/camel/component/jms/JmsToDTest.java | 27 +++
.../org/apache/camel/component/jms/JmsToTest.java | 27 +++
.../component/jms/JmsTransactedRouteTest.java | 27 +++
.../component/jms/JmsTransferExceptionTest.java | 26 ++-
.../jms/JmsTransferExchangeFromSplitterTest.java | 26 +++
.../component/jms/JmsTransferExchangeTest.java | 26 +++
.../component/jms/JmsUseOriginalBodyTest.java | 27 +++
.../camel/component/jms/JmsXMLRouteTest.java | 35 +++-
.../camel/component/jms/JmsXPathHeaderTest.java | 26 +++
.../component/jms/ManagedJmsEndpointTopicTest.java | 30 +++-
.../component/jms/ManagedJmsSelectorTest.java | 55 ++++--
.../camel/component/jms/MapJmsMessageTest.java | 26 +++
.../component/jms/PayloadByteArrayJmsTest.java | 26 +++
.../component/jms/ProduceMessageConverterTest.java | 26 +++
.../jms/ReplyToDestinationSelectorNameTest.java | 27 +++
...RequestReplyCorrelatedWithCustomHeaderTest.java | 26 +++
.../SimpleJmsRequestReplyExclusiveReplyToTest.java | 27 +++
.../SimpleJmsRequestReplySharedReplyToTest.java | 27 +++
.../component/jms/SimpleJmsRequestReplyTest.java | 27 +++
.../ActiveMQConsumeWildcardQueuesTest.java | 26 +++
.../jms/async/AsyncConsumerFalseTest.java | 37 +++-
.../jms/async/AsyncConsumerInOutTest.java | 38 +++-
.../jms/async/AsyncConsumerInOutTwoTest.java | 36 +++-
.../component/jms/async/AsyncConsumerTest.java | 36 +++-
.../component/jms/async/AsyncJmsInOutTest.java | 26 +++
.../component/jms/async/AsyncJmsProducerTest.java | 26 +++
.../component/jms/discovery/JmsDiscoveryTest.java | 36 +++-
.../jms/issues/ActiveMQPropagateHeadersTest.java | 26 +++
.../ActiveMQPropagateSerializableHeadersTest.java | 35 +++-
.../jms/issues/BruceHandlingBeanExceptionTest.java | 27 +++
...cRoutersWithJMSMessageLostHeadersIssueTest.java | 28 ++-
.../jms/issues/JmsAnotherCustomJMSReplyToTest.java | 26 +++
.../jms/issues/JmsBeanMethodHeaderTest.java | 26 +++
.../issues/JmsChainedEndpointDelayTimeoutTest.java | 27 +++
.../jms/issues/JmsConcurrentConsumersTest.java | 26 +++
.../jms/issues/JmsCustomJMSReplyToIssueTest.java | 25 +++
.../jms/issues/JmsFilenameHeaderTest.java | 26 +++
.../jms/issues/JmsGetHeaderKeyFormatIssueTest.java | 26 +++
...derKeyFormatIssueWithContentTypeHeaderTest.java | 26 +++
.../jms/issues/JmsHeaderAsObjectTest.java | 27 +++
.../component/jms/issues/JmsInOnlyIssueTest.java | 26 +++
.../jms/issues/JmsInOnlyParameterTest.java | 26 +++
.../JmsInOutExclusiveTopicRecipientListTest.java | 26 +++
.../jms/issues/JmsInOutExclusiveTopicTest.java | 28 ++-
.../component/jms/issues/JmsInOutIssueTest.java | 26 +++
.../component/jms/issues/JmsInOutParallelTest.java | 26 +++
.../issues/JmsInOutPersistentReplyQueueTest.java | 26 +++
.../jms/issues/JmsInOutPipelineWithBeanTest.java | 26 +++
.../issues/JmsInOutRepeatedInvocationsTest.java | 26 +++
.../jms/issues/JmsInOutRoutingSlipTest.java | 27 +++
...ransferExchangeInflightRepositoryFlushTest.java | 31 +++-
.../JmsInOutUseMessageIDasCorrelationIDTest.java | 28 ++-
...msJMSReplyToConsumerEndpointUsingInOutTest.java | 26 +++
.../JmsJMSReplyToEndpointUsingInOutTest.java | 26 +++
.../jms/issues/JmsLifecycleIssueTest.java | 39 ++++-
.../jms/issues/JmsMQSpecialHeaderTest.java | 26 +++
.../JmsMessageHeaderContentBasedRouterTest.java | 27 +++
.../component/jms/issues/JmsMutateMessageTest.java | 25 +++
.../issues/JmsMutateRemoveHeaderMessageTest.java | 25 +++
...roughtJmsKeyFormatStrategyEndUserIssueTest.java | 25 +++
...ssThroughtJmsKeyFormatStrategyEndpointTest.java | 26 +++
.../JmsPassThroughtJmsKeyFormatStrategyTest.java | 25 +++
...KeyFormatStrategyUsingJmsConfigurationTest.java | 25 +++
.../issues/JmsReplyToComponentEndlessLoopTest.java | 80 +++++++--
.../jms/issues/JmsReplyToLoopIssueTest.java | 26 +++
.../jms/issues/JmsRoutingSlipIssueTest.java | 27 +++
.../jms/issues/JmsToFileMessageIdTest.java | 27 +++
.../jms/issues/JmsTypeConverterIssueTest.java | 27 +++
.../camel/component/jms/issues/LarsIssueTest.java | 26 +++
.../component/jms/issues/MQSeriesHeaderTest.java | 26 +++
.../NoClassDefFoundErrorWrapExceptionTest.java | 27 +++
.../issues/RequestReplyWithProducerIssueTest.java | 27 +++
.../component/jms/issues/TempReplyToIssueTest.java | 26 +++
.../jms/polling/JmsPollingConsumerNoWaitTest.java | 61 +++++++
.../jms/polling/JmsPollingConsumerTest.java | 86 ++++++++++
.../jms/polling/JmsPollingConsumerWaitTest.java | 60 +++++++
.../jms/polling/JmsPollingHighTimeOutTest.java | 53 ++++++
.../jms/polling/JmsPollingLowTimeoutTest.java | 58 +++++++
.../jms/temp/TemporaryQueueRouteTest.java | 25 +++
.../component/jms/tuning/PerformanceRouteTest.java | 26 +++
196 files changed, 5343 insertions(+), 447 deletions(-)
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 204c7ac5702..16d553cdf2a 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -115,6 +115,14 @@
</dependency>
<!-- test infra -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-infra-core</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractJMSTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractJMSTest.java
index 590e1ec0be8..969e91c61e5 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractJMSTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AbstractJMSTest.java
@@ -20,10 +20,16 @@ package org.apache.camel.component.jms;
import jakarta.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
+import org.apache.camel.test.infra.core.annotations.RouteFixture;
+import org.apache.camel.test.infra.core.api.CamelTestSupportHelper;
+import org.apache.camel.test.infra.core.api.ConfigurableContext;
+import org.apache.camel.test.infra.core.api.ConfigurableRoute;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -31,9 +37,11 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
@Tags({ @Tag("jms") })
-public abstract class AbstractJMSTest extends CamelTestSupport {
+public abstract class AbstractJMSTest implements CamelTestSupportHelper, ConfigurableRoute, ConfigurableContext {
+
+ @Order(1)
@RegisterExtension
- public ArtemisService service = ArtemisServiceFactory.createVMService();
+ public static ArtemisService service = ArtemisServiceFactory.createVMService();
public static String queueNameForClass(String desiredName, Class<?> requestingClass) {
return desiredName + "." + requestingClass.getSimpleName();
@@ -56,12 +64,23 @@ public abstract class AbstractJMSTest extends CamelTestSupport {
return setupComponent(camelContext, connectionFactory, componentName);
}
+ protected abstract RouteBuilder createRouteBuilder();
+
+ @ContextFixture
+ @Override
+ public void configureContext(CamelContext context) throws Exception {
+ JmsComponent component = setupComponent(context, service, getComponentName());
+ context.addComponent(getComponentName(), component);
+ }
+
+ @RouteFixture
@Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
+ public void createRouteBuilder(CamelContext context) throws Exception {
+ final RouteBuilder routeBuilder = createRouteBuilder();
- JmsComponent component = setupComponent(camelContext, service, getComponentName());
- camelContext.addComponent(getComponentName(), component);
- return camelContext;
+ if (routeBuilder != null) {
+ context.addRoutes(routeBuilder);
+ }
}
+
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ActiveMQOriginalDestinationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ActiveMQOriginalDestinationTest.java
index 356362b9e4b..a9621a9be2e 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ActiveMQOriginalDestinationTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ActiveMQOriginalDestinationTest.java
@@ -23,12 +23,19 @@ import jakarta.jms.Session;
import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -37,7 +44,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
@Timeout(60)
public class ActiveMQOriginalDestinationTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testActiveMQOriginalDestination() throws Exception {
@@ -87,6 +100,18 @@ public class ActiveMQOriginalDestinationTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
/**
* A strategy to enrich JMS message with their original destination if the Camel route originates from a JMS
* destination.
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregatedJmsRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregatedJmsRouteTest.java
index 7c0ff5b119a..a41dd1bad21 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregatedJmsRouteTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregatedJmsRouteTest.java
@@ -16,12 +16,20 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,7 +37,13 @@ import static org.junit.jupiter.api.Assertions.fail;
public class AggregatedJmsRouteTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(AggregatedJmsRouteTest.class);
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final String timeOutEndpointUri = "jms:queue:AggregatedJmsRouteTestQueueA";
private final String multicastEndpointUri = "jms:queue:multicast";
@@ -102,6 +116,18 @@ public class AggregatedJmsRouteTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private static class MyProcessor implements Processor {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
index 0442ca373fa..7097d7c7ccb 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/BrowsableQueueTest.java
@@ -18,19 +18,33 @@ package org.apache.camel.component.jms;
import java.util.List;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class BrowsableQueueTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(BrowsableQueueTest.class);
protected final String componentName = "activemq";
protected final Object[] expectedBodies = { "body1", "body2", "body3", "body4", "body5", "body6", "body7", "body8" };
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testSendMessagesThenBrowseQueue() {
@@ -128,4 +142,16 @@ public class BrowsableQueueTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java
index 7f3b2994a55..fe70bcdd865 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java
@@ -22,12 +22,18 @@ import jakarta.jms.BytesMessage;
import jakarta.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.ExchangeHelper;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsTemplate;
@@ -38,9 +44,15 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ConsumeJmsBytesMessageTest extends AbstractJMSTest {
- private static final Logger LOG = LoggerFactory.getLogger(ConsumeJmsBytesMessageTest.class);
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ private static final Logger LOG = LoggerFactory.getLogger(ConsumeJmsBytesMessageTest.class);
protected JmsTemplate jmsTemplate;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private MockEndpoint endpoint;
@Test
@@ -89,10 +101,8 @@ public class ConsumeJmsBytesMessageTest extends AbstractJMSTest {
assertEquals(3, bytes.length);
}
- @Override
@BeforeEach
public void setUp() throws Exception {
- super.setUp();
endpoint = getMockEndpoint("mock:result");
}
@@ -118,4 +128,16 @@ public class ConsumeJmsBytesMessageTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java
index fc3b6475a43..d577ac7c045 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java
@@ -23,12 +23,18 @@ import jakarta.jms.ConnectionFactory;
import jakarta.jms.MapMessage;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.ExchangeHelper;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jms.core.JmsTemplate;
@@ -38,10 +44,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ConsumeJmsMapMessageTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(ConsumeJmsMapMessageTest.class);
protected JmsTemplate jmsTemplate;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private MockEndpoint endpoint;
@Test
@@ -92,10 +104,8 @@ public class ConsumeJmsMapMessageTest extends AbstractJMSTest {
assertCorrectMapReceived();
}
- @Override
@BeforeEach
public void setUp() throws Exception {
- super.setUp();
endpoint = getMockEndpoint("mock:result");
}
@@ -121,4 +131,16 @@ public class ConsumeJmsMapMessageTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
index 407defad8f9..839d6536a43 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
@@ -22,12 +22,18 @@ import jakarta.jms.ConnectionFactory;
import jakarta.jms.ObjectMessage;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.ExchangeHelper;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.TransientCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.jms.core.JmsTemplate;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
@@ -35,7 +41,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ConsumeJmsObjectMessageTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new TransientCamelContextExtension();
protected JmsTemplate jmsTemplate;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private MockEndpoint endpoint;
@Test
@@ -81,10 +93,8 @@ public class ConsumeJmsObjectMessageTest extends AbstractJMSTest {
assertEquals("Claus", user.getName());
}
- @Override
@BeforeEach
public void setUp() throws Exception {
- super.setUp();
endpoint = getMockEndpoint("mock:result");
}
@@ -111,6 +121,18 @@ public class ConsumeJmsObjectMessageTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyUser implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
index fe6a6d5653d..887bb957dd5 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeMessageConverterTest.java
@@ -23,14 +23,28 @@ import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.jms.support.converter.MessageConversionException;
import org.springframework.jms.support.converter.MessageConverter;
public class ConsumeMessageConverterTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("myMessageConverter")
private final MyMessageConverter conv = new MyMessageConverter();
@@ -70,6 +84,18 @@ public class ConsumeMessageConverterTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private static class MyMessageConverter implements MessageConverter {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteJmsKeepLastModifiedTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteJmsKeepLastModifiedTest.java
index e67ca688941..6aea0af74be 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteJmsKeepLastModifiedTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteJmsKeepLastModifiedTest.java
@@ -19,29 +19,39 @@ package org.apache.camel.component.jms;
import java.io.File;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class FileRouteJmsKeepLastModifiedTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final File inbox = new File("target/FileRouteJmsKeepLastModifiedTest/inbox/hello.txt");
- @Override
@BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/FileRouteJmsKeepLastModifiedTest/inbox");
deleteDirectory("target/FileRouteJmsKeepLastModifiedTest/outbox");
- super.setUp();
-
getMockEndpoint("mock:result").expectedMessageCount(1);
template.sendBodyAndHeader("file://target/FileRouteJmsKeepLastModifiedTest/inbox", "Hello World", Exchange.FILE_NAME,
"hello.txt");
@@ -76,4 +86,16 @@ public class FileRouteJmsKeepLastModifiedTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteJmsPreMoveTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteJmsPreMoveTest.java
index 52d543f6eaa..de9519e12af 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteJmsPreMoveTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteJmsPreMoveTest.java
@@ -16,11 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
@@ -29,14 +36,18 @@ import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
*/
public class FileRouteJmsPreMoveTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
- @Override
@BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/FileRouteJmsPreMoveTest/inbox");
deleteDirectory("target/FileRouteJmsPreMoveTest/outbox");
- super.setUp();
}
@Test
@@ -69,4 +80,16 @@ public class FileRouteJmsPreMoveTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
index 20f6cfa9f29..c02d5458318 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
@@ -16,10 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
@@ -28,7 +36,13 @@ import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
*/
public class FileRouteToJmsTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testRouteToFile() throws Exception {
@@ -58,4 +72,16 @@ public class FileRouteToJmsTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
index ba5cb737438..c70dcb185ec 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsToFileTest.java
@@ -18,11 +18,19 @@ package org.apache.camel.component.jms;
import java.io.File;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -32,7 +40,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class FileRouteToJmsToFileTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testRouteFileToFile() throws Exception {
@@ -67,4 +81,16 @@ public class FileRouteToJmsToFileTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
index f955d1b5e36..4feb45f412b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
@@ -16,9 +16,17 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -28,6 +36,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
*/
public class FromTextToBytesMessageTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testTextToBytes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:bar");
@@ -95,4 +110,16 @@ public class FromTextToBytesMessageTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAddAndRemoveRouteManagementTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAddAndRemoveRouteManagementTest.java
index e8e9b15bf13..778e9bb9b18 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAddAndRemoveRouteManagementTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAddAndRemoveRouteManagementTest.java
@@ -21,12 +21,22 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,9 +48,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@Timeout(60)
public class JmsAddAndRemoveRouteManagementTest extends AbstractJMSTest {
- @Override
- protected boolean useJmx() {
- return true;
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
+ @ContextFixture
+ public void enableJmx(CamelContext context) {
+ DefaultCamelContext.setDisableJmx(false);
}
protected MBeanServer getMBeanServer() {
@@ -92,4 +109,16 @@ public class JmsAddAndRemoveRouteManagementTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowAdditionalHeadersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowAdditionalHeadersTest.java
index 46edab4c110..3a7a11224d9 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowAdditionalHeadersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowAdditionalHeadersTest.java
@@ -17,13 +17,27 @@
package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsAllowAdditionalHeadersTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testAllowAdditionalHeaders() throws Exception {
// byte[] data = "Camel Rocks".getBytes();
@@ -34,7 +48,8 @@ public class JmsAllowAdditionalHeadersTest extends AbstractJMSTest {
// ActiveMQ will not accept byte[] value
// getMockEndpoint("mock:bar").expectedHeaderReceived("JMS_IBM_MQMD_USER", data);
- fluentTemplate.withBody("Hello World").withHeader("foo", "bar").withHeader("JMS_IBM_MQMD_USER", data)
+ context.createFluentProducerTemplate()
+ .withBody("Hello World").withHeader("foo", "bar").withHeader("JMS_IBM_MQMD_USER", data)
.to("direct:start").send();
MockEndpoint.assertIsSatisfied(context);
@@ -66,4 +81,16 @@ public class JmsAllowAdditionalHeadersTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowNullBodyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowNullBodyTest.java
index 2f320144482..d79ee9e78d2 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowNullBodyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAllowNullBodyTest.java
@@ -18,10 +18,18 @@ package org.apache.camel.component.jms;
import jakarta.jms.JMSException;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,6 +40,13 @@ import static org.junit.jupiter.api.Assertions.fail;
*/
public class JmsAllowNullBodyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testAllowNullBodyDefault() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
@@ -92,4 +107,16 @@ public class JmsAllowNullBodyTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStopListenerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStopListenerTest.java
index 32c312d3dbd..057ed480fa1 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStopListenerTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsAsyncStopListenerTest.java
@@ -17,12 +17,19 @@
package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Testing with async stop listener
@@ -31,7 +38,13 @@ import org.junit.jupiter.api.Timeout;
@Timeout(60)
public class JmsAsyncStopListenerTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testAsyncStopListener() throws Exception {
@@ -64,4 +77,16 @@ public class JmsAsyncStopListenerTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
index 8c70e167ee5..fa54228e2c9 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
@@ -18,10 +18,17 @@ package org.apache.camel.component.jms;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
/**
@@ -30,6 +37,13 @@ import org.junit.jupiter.api.parallel.Isolated;
@Isolated
public class JmsBatchResequencerJMSPriorityTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@BeforeEach
void sendMessages() {
// must use preserveMessageQos=true to be able to specify the JMSPriority to be used
@@ -81,4 +95,15 @@ public class JmsBatchResequencerJMSPriorityTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsClientAckTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsClientAckTest.java
index 9300acb6fe1..5955f596d49 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsClientAckTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsClientAckTest.java
@@ -19,16 +19,30 @@ package org.apache.camel.component.jms;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Session;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JmsClientAckTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testJmsClientAck() throws Exception {
@@ -69,4 +83,16 @@ public class JmsClientAckTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTransactedCacheLevelNameTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTransactedCacheLevelNameTest.java
index 33fdc1258c6..92bf8066ea0 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTransactedCacheLevelNameTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTransactedCacheLevelNameTest.java
@@ -23,16 +23,29 @@ import jakarta.jms.ConnectionFactory;
import jakarta.jms.Session;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JmsComponentTransactedCacheLevelNameTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final List<Session> sessions = new ArrayList<>();
@@ -83,4 +96,16 @@ public class JmsComponentTransactedCacheLevelNameTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
index afca79fa7df..cbb366dfde2 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsConsumerRestartPickupConfigurationChangesTest.java
@@ -16,11 +16,27 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsConsumerRestartPickupConfigurationChangesTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testRestartJmsConsumerPickupChanges() throws Exception {
JmsEndpoint endpoint = context.getEndpoint("activemq:queue:JmsConsumerRestartPickupConfigurationChangesTest.Request",
@@ -56,4 +72,20 @@ public class JmsConsumerRestartPickupConfigurationChangesTest extends AbstractJM
return "activemq";
}
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return null;
+ }
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsCustomHeaderFilterStrategyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsCustomHeaderFilterStrategyTest.java
index fb42eaddfc0..40d8f150141 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsCustomHeaderFilterStrategyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsCustomHeaderFilterStrategyTest.java
@@ -20,16 +20,29 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsCustomHeaderFilterStrategyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testCustomHeaderFilterStrategy() throws Exception {
@@ -71,6 +84,18 @@ public class JmsCustomHeaderFilterStrategyTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private static class MyHeaderFilterStrategy implements HeaderFilterStrategy {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
index 615d7caf400..403141c5056 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueTest.java
@@ -16,10 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -28,6 +36,13 @@ import static org.junit.jupiter.api.Assertions.assertNull;
*/
public class JmsDeadLetterQueueTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
protected String getUri() {
return "activemq:queue:JmsDeadLetterQueueTest";
}
@@ -81,4 +96,15 @@ public class JmsDeadLetterQueueTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
index 7d14b2f8a16..3be8392c091 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDeadLetterQueueUsingTransferExchangeTest.java
@@ -16,15 +16,30 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Unit test for using JMS as DLQ and to preserve the Exchange using transferExchange=true option
*/
public class JmsDeadLetterQueueUsingTransferExchangeTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
protected String getUri() {
return "activemq:queue:JmsDeadLetterQueueUsingTransferExchangeTest?transferExchange=true";
}
@@ -73,4 +88,15 @@ public class JmsDeadLetterQueueUsingTransferExchangeTest extends AbstractJMSTest
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
index 92780130ace..3378a3bc1e5 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
@@ -17,14 +17,27 @@
package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsDestinationResolverTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testSendAndReceiveMessage() throws Exception {
@@ -61,4 +74,16 @@ public class JmsDestinationResolverTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEagerLoadingPropertiesTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEagerLoadingPropertiesTest.java
index 7224bab1f56..753ef2e8769 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEagerLoadingPropertiesTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEagerLoadingPropertiesTest.java
@@ -16,14 +16,29 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsEagerLoadingPropertiesTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsEagerLoadingPropertiesTest() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -52,4 +67,16 @@ public class JmsEagerLoadingPropertiesTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
index 430bf9f540c..632ed369714 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
@@ -21,13 +21,21 @@ import jakarta.jms.DeliveryMode;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.ServiceStatus;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
@@ -51,10 +59,16 @@ import static org.junit.jupiter.api.Assertions.fail;
public class JmsEndpointConfigurationTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(ConsumeJmsMapMessageTest.class);
@RegisterExtension
public ArtemisService service = ArtemisServiceFactory.createVMService();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("myConnectionFactory")
private final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(service.serviceAddress());
@@ -581,4 +595,21 @@ public class JmsEndpointConfigurationTest extends AbstractJMSTest {
assertEquals("ABC", listenerContainer.getClientId(), "getClientId()");
assertTrue(listenerContainer.isSubscriptionDurable(), "isSubscriptionDurable()");
}
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return null;
+ }
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsErrorHandlerLogStackTraceTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsErrorHandlerLogStackTraceTest.java
index 0faa6be7257..c781d0f678a 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsErrorHandlerLogStackTraceTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsErrorHandlerLogStackTraceTest.java
@@ -17,11 +17,18 @@
package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.LoggingLevel;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -31,6 +38,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class JmsErrorHandlerLogStackTraceTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testErrorHandlerLogStackTrace() {
JmsComponent jms = context.getComponent("jms", JmsComponent.class);
@@ -72,4 +86,16 @@ public class JmsErrorHandlerLogStackTraceTest extends AbstractJMSTest {
return jms;
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
index 6ae130e79c8..f758711bf2d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
@@ -16,12 +16,19 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
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.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Tests filtering using Camel Test
@@ -29,11 +36,17 @@ import org.junit.jupiter.api.Test;
// START SNIPPET: example
public class JmsFilterTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+
@EndpointInject("mock:result")
protected MockEndpoint resultEndpoint;
@Produce("direct:start")
protected ProducerTemplate template;
+ protected CamelContext context;
+ protected ConsumerTemplate consumer;
@Test
public void testSendMatchingMessage() throws Exception {
@@ -69,5 +82,16 @@ public class JmsFilterTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
// END SNIPPET: example
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringTest.java
index cf8290abb3b..16cb37a344e 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringTest.java
@@ -20,13 +20,20 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -34,7 +41,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class JmsHeaderFilteringTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final String IN_FILTER_PATTERN = "(org_apache_camel)[_|a-z|A-Z|0-9]*(test)[_|a-z|A-Z|0-9]*";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final String componentName = "jms";
private final String testQueueEndpointA = componentName + ":queue:JmsHeaderFilteringTest.test..a";
@@ -94,6 +107,18 @@ public class JmsHeaderFilteringTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
class OutHeaderChecker implements Processor {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringWithSpringTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringWithSpringTest.java
index 11e193ec29d..a4e42fd7997 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringWithSpringTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringWithSpringTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.test.infra.core.annotations.ContextProvider;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.AfterEach;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -26,7 +27,7 @@ public class JmsHeaderFilteringWithSpringTest extends JmsHeaderFilteringTest {
private ClassPathXmlApplicationContext applicationContext;
- @Override
+ @ContextProvider
protected CamelContext createCamelContext() throws Exception {
applicationContext = createApplicationContext();
return SpringCamelContext.springCamelContext(applicationContext, true);
@@ -36,11 +37,9 @@ public class JmsHeaderFilteringWithSpringTest extends JmsHeaderFilteringTest {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/jmsHeaderFilteringWithSpring.xml");
}
- @Override
@AfterEach
public void tearDown() throws Exception {
IOHelper.close(applicationContext);
- super.tearDown();
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
index 789ce39a83f..5fd0e8348d7 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
@@ -16,14 +16,26 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsInOnlyDisableTimeToLiveTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final String urlTimeout = "activemq:JmsInOnlyDisableTimeToLiveTest.in?timeToLive=2000";
private final String urlTimeToLiveDisabled
= "activemq:JmsInOnlyDisableTimeToLiveTest.in?timeToLive=2000&disableTimeToLive=true";
@@ -103,6 +115,18 @@ public class JmsInOnlyDisableTimeToLiveTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyCoolBean {
private int count;
private ConsumerTemplate consumer;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyIncludeSentJMSMessageIDTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyIncludeSentJMSMessageIDTest.java
index 77355aceab2..572eaa3fc7c 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyIncludeSentJMSMessageIDTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyIncludeSentJMSMessageIDTest.java
@@ -16,10 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -29,6 +37,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
*/
public class JmsInOnlyIncludeSentJMSMessageIDTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsInOnlyIncludeSentJMSMessageID() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:done");
@@ -64,4 +79,16 @@ public class JmsInOnlyIncludeSentJMSMessageIDTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
index 248319ef287..65f618088a7 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyInvalidDestinationTest.java
@@ -21,9 +21,17 @@ import jakarta.jms.JMSException;
import jakarta.jms.Session;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.jms.support.destination.DestinationResolutionException;
import org.springframework.jms.support.destination.DestinationResolver;
@@ -32,6 +40,12 @@ import org.springframework.jms.support.destination.DestinationResolver;
*/
public class JmsInOnlyInvalidDestinationTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("myResolver")
private final MyDestinationResolver resolver = new MyDestinationResolver();
@@ -62,6 +76,18 @@ public class JmsInOnlyInvalidDestinationTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private static class MyDestinationResolver implements DestinationResolver {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyPooledExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyPooledExchangeTest.java
index 76afbdbf15c..88b5474aeed 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyPooledExchangeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyPooledExchangeTest.java
@@ -19,24 +19,39 @@ package org.apache.camel.component.jms;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.engine.PooledExchangeFactory;
import org.apache.camel.impl.engine.PooledProcessorExchangeFactory;
import org.apache.camel.spi.PooledObjectFactory;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.TransientCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsInOnlyPooledExchangeTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new TransientCamelContextExtension();
private static final String JMS_QUEUE_NAME = "activemq:queue:JmsInOnlyPooledExchangeTest";
private static final String MOCK_RESULT = "mock:result";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSynchronous() throws Exception {
final String expectedBody = "Hello World";
@@ -78,22 +93,18 @@ public class JmsInOnlyPooledExchangeTest extends AbstractJMSTest {
});
}
- @Override
protected String getComponentName() {
return "activemq";
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
- ExtendedCamelContext ecc = camelContext.getCamelContextExtension();
+ @ContextFixture
+ public void configurePooling(CamelContext context) {
+ ExtendedCamelContext ecc = context.getCamelContextExtension();
ecc.setExchangeFactory(new PooledExchangeFactory());
ecc.setProcessorExchangeFactory(new PooledProcessorExchangeFactory());
ecc.getExchangeFactory().setStatisticsEnabled(true);
ecc.getProcessorExchangeFactory().setStatisticsEnabled(true);
-
- return camelContext;
}
@Override
@@ -106,4 +117,16 @@ public class JmsInOnlyPooledExchangeTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java
index ec09e3953bd..e269bedd90c 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java
@@ -16,12 +16,27 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsInOnlyWithReplyToAsHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSendInOnlyWithReplyTo() throws Exception {
getMockEndpoint("mock:foo").expectedBodiesReceived("World");
@@ -59,4 +74,16 @@ public class JmsInOnlyWithReplyToAsHeaderTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToDisabledButJMSReplyToHeaderPreservedTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToDisabledButJMSReplyToHeaderPreservedTest.java
index 085079bae27..fde28fa13cd 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToDisabledButJMSReplyToHeaderPreservedTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToDisabledButJMSReplyToHeaderPreservedTest.java
@@ -16,12 +16,27 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsInOnlyWithReplyToDisabledButJMSReplyToHeaderPreservedTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJMSReplyToHeaderPreserved() throws Exception {
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
@@ -55,4 +70,16 @@ public class JmsInOnlyWithReplyToDisabledButJMSReplyToHeaderPreservedTest extend
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToDisabledTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToDisabledTest.java
index d952bd4d5a3..77b706c33b4 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToDisabledTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToDisabledTest.java
@@ -16,12 +16,27 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsInOnlyWithReplyToDisabledTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSendInOnlyWithReplyTo() throws Exception {
getMockEndpoint("mock:foo").expectedMessageCount(1);
@@ -56,4 +71,16 @@ public class JmsInOnlyWithReplyToDisabledTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTest.java
index 712aca88773..1669effcfbd 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTest.java
@@ -16,14 +16,29 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOnlyWithReplyToHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsInOnlyWithReplyToHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -58,4 +73,16 @@ public class JmsInOnlyWithReplyToHeaderTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java
index 3042776db52..f2c09174926 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToHeaderTopicTest.java
@@ -18,15 +18,28 @@ package org.apache.camel.component.jms;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsInOnlyWithReplyToHeaderTopicTest extends AbstractJMSTest {
- @BeforeEach
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
void waitForConnections() {
Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 100);
Awaitility.await().until(() -> context.getRoute("route-2").getUptimeMillis() > 100);
@@ -73,4 +86,18 @@ public class JmsInOnlyWithReplyToHeaderTopicTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+
+ waitForConnections();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToNotPreservedTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToNotPreservedTest.java
index 624e54c1697..ef34802bf93 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToNotPreservedTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToNotPreservedTest.java
@@ -16,14 +16,29 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertNull;
public class JmsInOnlyWithReplyToNotPreservedTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSendInOnlyWithReplyTo() throws Exception {
getMockEndpoint("mock:JmsInOnlyWithReplyToNotPreservedTest.Request").expectedBodiesReceived("World");
@@ -59,4 +74,16 @@ public class JmsInOnlyWithReplyToNotPreservedTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToTest.java
index 4e03e4c8c6d..a5dcc86d364 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToTest.java
@@ -16,12 +16,27 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsInOnlyWithReplyToTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSendInOnlyWithReplyTo() throws Exception {
getMockEndpoint("mock:JmsInOnlyWithReplyToTest.foo").expectedBodiesReceived("World");
@@ -58,4 +73,16 @@ public class JmsInOnlyWithReplyToTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutBeanReturnNullTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutBeanReturnNullTest.java
index 16a46ca993d..70a48f6440c 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutBeanReturnNullTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutBeanReturnNullTest.java
@@ -19,12 +19,19 @@ package org.apache.camel.component.jms;
import java.io.Serializable;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -33,6 +40,13 @@ import static org.junit.jupiter.api.Assertions.assertNull;
@Timeout(30)
public class JmsInOutBeanReturnNullTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testReturnBean() {
MyBean out = template.requestBody("activemq:queue:JmsInOutBeanReturnNullTest", "Camel", MyBean.class);
@@ -98,6 +112,18 @@ public class JmsInOutBeanReturnNullTest extends AbstractJMSTest {
}
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static final class MyBean implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutDisableTimeToLiveTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutDisableTimeToLiveTest.java
index 72fe2945276..702ca170c5d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutDisableTimeToLiveTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutDisableTimeToLiveTest.java
@@ -16,17 +16,29 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.fail;
public class JmsInOutDisableTimeToLiveTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final String urlTimeout = "activemq:JmsInOutDisableTimeToLiveTest.in?requestTimeout=2000";
private final String urlTimeToLiveDisabled
= "activemq:JmsInOutDisableTimeToLiveTest.in?requestTimeout=2000&disableTimeToLive=true";
@@ -98,6 +110,18 @@ public class JmsInOutDisableTimeToLiveTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyCoolBean {
private int count;
private ConsumerTemplate consumer;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
index 2e78ed4d006..2368c633ef6 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
@@ -19,24 +19,38 @@ package org.apache.camel.component.jms;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangeTimedOutException;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.TransientCamelContextExtension;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
+@Isolated
public class JmsInOutFixedReplyQueueTimeoutTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new TransientCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
- @BeforeEach
void waitForConnections() {
Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 200);
Awaitility.await().until(() -> context.getRoute("route-2").getUptimeMillis() > 200);
@@ -91,4 +105,17 @@ public class JmsInOutFixedReplyQueueTimeoutTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+
+ waitForConnections();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java
index 98ed22f1fc5..b8355b7418d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutIndividualRequestTimeoutTest.java
@@ -19,12 +19,20 @@ package org.apache.camel.component.jms;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangeTimedOutException;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,7 +40,13 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
public class JmsInOutIndividualRequestTimeoutTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testOk() throws Exception {
@@ -95,4 +109,15 @@ public class JmsInOutIndividualRequestTimeoutTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutNonPersistentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutNonPersistentTest.java
index d594e24bcf1..738a0856f22 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutNonPersistentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutNonPersistentTest.java
@@ -18,14 +18,29 @@ package org.apache.camel.component.jms;
import jakarta.jms.DeliveryMode;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOutNonPersistentTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testInOutNonPersistent() throws Exception {
getMockEndpoint("mock:JmsInOutNonPersistentTest.foo").expectedBodiesReceived("World");
@@ -60,4 +75,16 @@ public class JmsInOutNonPersistentTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutSynchronousFalseTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutSynchronousFalseTest.java
index 5669d72f88f..b82c86ebbee 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutSynchronousFalseTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutSynchronousFalseTest.java
@@ -16,11 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -29,8 +36,14 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsInOutSynchronousFalseTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static String beforeThreadName;
private static String afterThreadName;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final String url = "activemq:queue:JmsInOutSynchronousFalseTest?synchronous=false";
@@ -71,4 +84,15 @@ public class JmsInOutSynchronousFalseTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutSynchronousTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutSynchronousTest.java
index 845a3f0d2a6..bfa784e02b8 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutSynchronousTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutSynchronousTest.java
@@ -16,11 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -29,8 +36,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsInOutSynchronousTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static String beforeThreadName;
private static String afterThreadName;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private String reply;
private final String url = "activemq:queue:JmsInOutSynchronousTest?synchronous=true";
@@ -68,4 +81,15 @@ public class JmsInOutSynchronousTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
index 265b7d47de1..fc66d8d6577 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
@@ -20,14 +20,22 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.activemq.artemis.jms.client.ActiveMQObjectMessage;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchangeHolder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,6 +45,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Timeout(60)
public class JmsInOutTransferExchangeTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(JmsInOutTransferExchangeTest.class);
@EndpointInject("mock:transfer")
@@ -44,6 +55,9 @@ public class JmsInOutTransferExchangeTest extends AbstractJMSTest {
@EndpointInject("mock:result")
protected MockEndpoint result;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Override
protected String getComponentName() {
@@ -129,4 +143,15 @@ public class JmsInOutTransferExchangeTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutWithNoOutBodyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutWithNoOutBodyTest.java
index 7f589416571..cbc4193f0fa 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutWithNoOutBodyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutWithNoOutBodyTest.java
@@ -16,10 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,6 +35,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsInOutWithNoOutBodyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testWithNoOutBodySet() {
String reply = template.requestBody("direct:start", "Foo", String.class);
@@ -54,4 +69,15 @@ public class JmsInOutWithNoOutBodyTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java
index 1dc0bfefb75..983baa62998 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java
@@ -20,13 +20,27 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsIncludeAllJMSXPropertiesTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testIncludeAll() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
@@ -66,4 +80,15 @@ public class JmsIncludeAllJMSXPropertiesTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.java
index 241c4dc3204..61d50cf1688 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.java
@@ -18,11 +18,18 @@ package org.apache.camel.component.jms;
import org.apache.activemq.artemis.jms.client.ActiveMQTextMessage;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,6 +38,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
@Timeout(10)
public class JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final boolean forceSendOriginalMessage = true;
@Test
@@ -131,4 +144,15 @@ public class JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest extends A
return jms;
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest.java
index db3411a692e..b7972d933c2 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest.java
@@ -16,31 +16,33 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.EndpointInject;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.RouteFixture;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@EndpointInject("mock:result")
private MockEndpoint mockResult;
@Test
public void testUseOriginalMessage() throws Exception {
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() {
- onException(Exception.class)
- .useOriginalMessage()
- .to(mockResult);
-
- from("jms:queue:JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest")
- .throwException(new Exception("forced exception for test"));
- }
- });
- context.start();
-
mockResult.expectedBodiesReceived("Hello World");
mockResult.expectedHeaderReceived("header-key", "header-value");
@@ -55,8 +57,31 @@ public class JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest extends Abstract
return "jms";
}
+ @RouteFixture
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ onException(Exception.class)
+ .useOriginalMessage()
+ .to(mockResult);
+
+ from("jms:queue:JmsMessageAsOriginalMessageInDefaultUnitOfWorkTest")
+ .throwException(new Exception("forced exception for test"));
+ }
+ };
+ }
+
@Override
- public boolean isUseRouteBuilder() {
- return false;
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java
index 83373d77ce8..33295a5e0ae 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java
@@ -16,27 +16,33 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Unit test setting null body
*/
public class JmsMessageBodySetNullTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSetNullBodyUsingProcessor() throws Exception {
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() {
- from("jms:queue:JmsMessageBodySetNullTest")
- .to("mock:foo")
- .process(exchange -> exchange.getIn().setBody(null))
- .to("mock:bar");
- }
- });
- context.start();
+ context.getRouteController().startRoute("testSetNullBodyUsingProcessor");
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:bar").expectedMessageCount(1);
@@ -49,16 +55,7 @@ public class JmsMessageBodySetNullTest extends AbstractJMSTest {
@Test
public void testSetNullBodyUsingProcessorPreserveHeaders() throws Exception {
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() {
- from("jms:queue:JmsMessageBodySetNullTest")
- .to("mock:foo")
- .process(exchange -> exchange.getIn().setBody(null))
- .to("mock:bar");
- }
- });
- context.start();
+ context.getRouteController().startRoute("testSetNullBodyUsingProcessorPreserveHeaders");
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:foo").expectedHeaderReceived("code", 123);
@@ -73,16 +70,7 @@ public class JmsMessageBodySetNullTest extends AbstractJMSTest {
@Test
public void testSetNullBodyUsingSetBody() throws Exception {
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() {
- from("jms:queue:JmsMessageBodySetNullTest")
- .to("mock:foo")
- .setBody(simple("${null}"))
- .to("mock:bar");
- }
- });
- context.start();
+ context.getRouteController().startRoute("testSetNullBodyUsingSetBody");
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:bar").expectedMessageCount(1);
@@ -95,16 +83,7 @@ public class JmsMessageBodySetNullTest extends AbstractJMSTest {
@Test
public void testSetNullBodyUsingSetBodyPreserveHeaders() throws Exception {
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() {
- from("jms:queue:JmsMessageBodySetNullTest")
- .to("mock:foo")
- .setBody(simple("${null}"))
- .to("mock:bar");
- }
- });
- context.start();
+ context.getRouteController().startRoute("testSetNullBodyUsingSetBodyPreserveHeaders");
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
getMockEndpoint("mock:foo").expectedHeaderReceived("code", 123);
@@ -123,7 +102,50 @@ public class JmsMessageBodySetNullTest extends AbstractJMSTest {
}
@Override
- public boolean isUseRouteBuilder() {
- return false;
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("jms:queue:JmsMessageBodySetNullTest")
+ .routeId("testSetNullBodyUsingProcessor")
+ .autoStartup(false)
+ .to("mock:foo")
+ .process(exchange -> exchange.getIn().setBody(null))
+ .to("mock:bar");
+
+ from("jms:queue:JmsMessageBodySetNullTest")
+ .routeId("testSetNullBodyUsingProcessorPreserveHeaders")
+ .autoStartup(false)
+ .to("mock:foo")
+ .process(exchange -> exchange.getIn().setBody(null))
+ .to("mock:bar");
+
+ from("jms:queue:JmsMessageBodySetNullTest")
+ .routeId("testSetNullBodyUsingSetBody")
+ .autoStartup(false)
+ .to("mock:foo")
+ .setBody(simple("${null}"))
+ .to("mock:bar");
+
+ from("jms:queue:JmsMessageBodySetNullTest")
+ .routeId("testSetNullBodyUsingSetBodyPreserveHeaders")
+ .autoStartup(false)
+ .to("mock:foo")
+ .setBody(simple("${null}"))
+ .to("mock:bar");
+ }
+ };
+ }
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyComponentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyComponentTest.java
index c2cdc9ae2d9..1a53cb098b7 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyComponentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyComponentTest.java
@@ -21,15 +21,28 @@ import jakarta.jms.Message;
import jakarta.jms.Session;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsMessageCreatedStrategyComponentTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testMessageCreatedStrategy() throws Exception {
@@ -65,6 +78,18 @@ public class JmsMessageCreatedStrategyComponentTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private static class MyMessageCreatedStrategy implements MessageCreatedStrategy {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyEndpointTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyEndpointTest.java
index 4b8effdf86d..9bb7764ff9c 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyEndpointTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageCreatedStrategyEndpointTest.java
@@ -21,14 +21,28 @@ import jakarta.jms.Message;
import jakarta.jms.Session;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsMessageCreatedStrategyEndpointTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("myStrategy")
private final MyMessageCreatedStrategy strategy = new MyMessageCreatedStrategy();
@@ -62,6 +76,18 @@ public class JmsMessageCreatedStrategyEndpointTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private static class MyMessageCreatedStrategy implements MessageCreatedStrategy {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageIDNotOverridenAMQTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageIDNotOverridenAMQTest.java
index ecf6b6962e6..b9c06808d55 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageIDNotOverridenAMQTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageIDNotOverridenAMQTest.java
@@ -21,11 +21,18 @@ import jakarta.jms.Message;
import jakarta.jms.Session;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -36,6 +43,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
*/
public class JmsMessageIDNotOverridenAMQTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsInOnlyIncludeSentJMSMessageID() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:done");
@@ -79,6 +93,18 @@ public class JmsMessageIDNotOverridenAMQTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private static class MyMessageCreatedStrategy implements MessageCreatedStrategy {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTimestampTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTimestampTest.java
index 8bb014a87cd..74d24f2b0ed 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTimestampTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTimestampTest.java
@@ -16,14 +16,28 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsMessageTimestampTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testMessageTimestamp() throws Exception {
@@ -49,4 +63,16 @@ public class JmsMessageTimestampTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java
index 298a62353ae..efd91baf728 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageTypeTest.java
@@ -21,32 +21,43 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.TypeConversionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.TypeConverterSupport;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.jms.JmsConstants.JMS_MESSAGE_TYPE;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsMessageTypeTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Override
protected String getComponentName() {
return "jms";
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- camelContext.getTypeConverterRegistry().addTypeConverter(byte[].class, MyFooBean.class, new MyFooBean());
- camelContext.getTypeConverterRegistry().addTypeConverter(String.class, MyFooBean.class, new MyFooBean());
- camelContext.getTypeConverterRegistry().addTypeConverter(Map.class, MyFooBean.class, new MyFooBean());
-
- return camelContext;
+ @ContextFixture
+ public void configureConverters(CamelContext context) {
+ context.getTypeConverterRegistry().addTypeConverter(byte[].class, MyFooBean.class, new MyFooBean());
+ context.getTypeConverterRegistry().addTypeConverter(String.class, MyFooBean.class, new MyFooBean());
+ context.getTypeConverterRegistry().addTypeConverter(Map.class, MyFooBean.class, new MyFooBean());
}
@Test
@@ -216,6 +227,18 @@ public class JmsMessageTypeTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static final class MyFooBean extends TypeConverterSupport implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
index 49e1f6b56e7..6aaf1441187 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
@@ -16,16 +16,31 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.TransientCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.extension.RegisterExtension;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
@DisabledIfSystemProperty(named = "ci.env.name", matches = "github.com", disabledReason = "Flaky on Github CI")
public class JmsMultipleConsumersTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new TransientCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testMultipleConsumersTopic() throws Exception {
context.addRoutes(new RouteBuilder() {
@@ -38,7 +53,6 @@ public class JmsMultipleConsumersTest extends AbstractJMSTest {
from("jms:topic:JmsMultipleConsumersTest").to("mock:bar");
}
});
- context.start();
getMockEndpoint("mock:foo").expectedMessageCount(1);
getMockEndpoint("mock:bar").expectedMessageCount(1);
@@ -62,8 +76,6 @@ public class JmsMultipleConsumersTest extends AbstractJMSTest {
}
});
- context.start();
-
getMockEndpoint("mock:result").expectedMessageCount(2);
template.sendBody("jms:queue:JmsMultipleConsumersTest", "Hello World");
@@ -78,7 +90,19 @@ public class JmsMultipleConsumersTest extends AbstractJMSTest {
}
@Override
- public boolean isUseRouteBuilder() {
- return false;
+ protected RouteBuilder createRouteBuilder() {
+ return null;
+ }
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNoRequestTimeoutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNoRequestTimeoutTest.java
index 9f3d2b05892..4e71830d759 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNoRequestTimeoutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNoRequestTimeoutTest.java
@@ -16,10 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,7 +35,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsNoRequestTimeoutTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testNoRequestTimeout() {
@@ -49,4 +63,16 @@ public class JmsNoRequestTimeoutTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotInOnlyIncludeSentJMSMessageIDTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotInOnlyIncludeSentJMSMessageIDTest.java
index 5d72d7b7608..3bdd9dc5ab8 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotInOnlyIncludeSentJMSMessageIDTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotInOnlyIncludeSentJMSMessageIDTest.java
@@ -16,10 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -30,6 +38,13 @@ import static org.junit.jupiter.api.Assertions.assertNull;
*/
public class JmsNotInOnlyIncludeSentJMSMessageIDTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsNotInOnlyIncludeSentJMSMessageID() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:done");
@@ -65,4 +80,16 @@ public class JmsNotInOnlyIncludeSentJMSMessageIDTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java
index 20a1a8ab4e7..adc7d15699e 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java
@@ -20,13 +20,27 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsNotIncludeAllJMSXPropertiesTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testNotIncludeAll() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
@@ -66,4 +80,15 @@ public class JmsNotIncludeAllJMSXPropertiesTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionAndInterceptAndOnExceptionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionAndInterceptAndOnExceptionTest.java
index a765ac333f4..9dbc499eea1 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionAndInterceptAndOnExceptionTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionAndInterceptAndOnExceptionTest.java
@@ -16,14 +16,29 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsOnCompletionAndInterceptAndOnExceptionTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSynchronizeComplete() throws Exception {
getMockEndpoint("mock:exception").expectedMessageCount(0);
@@ -79,6 +94,18 @@ public class JmsOnCompletionAndInterceptAndOnExceptionTest extends AbstractJMSTe
return "activemq";
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyProcessor implements Processor {
public MyProcessor() {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionTest.java
index 0fa86818d12..8d25563e900 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionTest.java
@@ -16,17 +16,32 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Unit test for useOriginalBody unit test
*/
public class JmsOnCompletionTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSynchronizeComplete() throws Exception {
getMockEndpoint("mock:sync").expectedBodiesReceived("Bye World");
@@ -75,6 +90,18 @@ public class JmsOnCompletionTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyProcessor implements Processor {
public MyProcessor() {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPollingConsumerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPollingConsumerTest.java
deleted file mode 100644
index 07c55e46ba8..00000000000
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPollingConsumerTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.jms;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.awaitility.Awaitility;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.parallel.Isolated;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@Isolated
-public class JmsPollingConsumerTest extends AbstractJMSTest {
-
- @Nested
- class ConsumerWaitTest {
-
- private final CountDownLatch latch = new CountDownLatch(1);
-
- @BeforeEach
- void setupConsumer() {
- // use another thread for polling consumer to demonstrate that we can wait before
- // the message is sent to the queue
- Executors.newSingleThreadExecutor().execute(() -> {
- String body = consumer.receiveBody("activemq:queue.JmsPollingConsumerTest.start.wait", String.class);
- template.sendBody("activemq:queue.JmsPollingConsumerTest.foo", body + " Claus");
- latch.countDown();
- });
- }
-
- @Test
- void testJmsPollingConsumerWait() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedBodiesReceived("Hello Claus");
-
- /* Wait a little to demonstrate we can start poll before we have a msg on the queue. Also,
- because expect no message to be received, the latch should timeout. That is why we test for
- false.
- */
- assertFalse(latch.await(1, TimeUnit.SECONDS));
-
- template.sendBody("direct:start.wait", "Hello");
-
- MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
- }
- }
-
- @Nested
- class ConsumerNoWaitTest {
- private final CountDownLatch latch = new CountDownLatch(1);
- private volatile String body;
-
- @BeforeEach
- void setupConsumer() {
- // use another thread for polling consumer to demonstrate that we can wait before
- // the message is sent to the queue
- Executors.newSingleThreadExecutor().execute(() -> {
- try {
- body = consumer.receiveBodyNoWait("activemq:queue.JmsPollingConsumerTest.start", String.class);
- template.sendBody("activemq:queue.JmsPollingConsumerTest.foo", "Hello Claus");
- } finally {
- latch.countDown();
- }
- });
- }
-
- @Test
- public void testJmsPollingConsumerNoWait() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedBodiesReceived("Hello Claus");
-
- assertTrue(latch.await(1, TimeUnit.SECONDS));
- assertNull(body, "Message body should be null because there was no message and the polling consumer is 'no wait'");
-
- template.sendBody("direct:start", "Hello");
-
- MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
- }
- }
-
- @Nested
- class LowTimeoutTest {
- private final CountDownLatch latch = new CountDownLatch(1);
- private volatile String body;
-
- @BeforeEach
- void setupConsumer() {
- // use another thread for polling consumer to demonstrate that we can wait before
- // the message is sent to the queue
- Executors.newSingleThreadExecutor().execute(() -> {
- body = consumer.receiveBody("activemq:queue.JmsPollingConsumerTest.start", 100, String.class);
- template.sendBody("activemq:queue.JmsPollingConsumerTest.foo", "Hello Claus");
- latch.countDown();
- });
- }
-
- @Test
- public void testJmsPollingConsumerLowTimeout() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedBodiesReceived("Hello Claus");
-
- assertTrue(latch.await(1, TimeUnit.SECONDS));
- assertNull(body, "Message body should be null because the receive timed out");
-
- template.sendBody("direct:start", "Hello");
-
- MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
- }
- }
-
- @Nested
- class HighTimeOutTest {
- private volatile String body;
-
- @BeforeEach
- void setupConsumer() {
- Executors.newSingleThreadExecutor().execute(() -> {
- body = consumer.receiveBody("activemq:queue.JmsPollingConsumerTest.start", 3000, String.class);
- template.sendBody("activemq:queue.JmsPollingConsumerTest.foo", body + " Claus");
- });
- }
-
- @Test
- public void testJmsPollingConsumerHighTimeout() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedBodiesReceived("Hello Claus");
-
- assertNull(body, "No message should have been received because the test has not sent any");
- template.sendBody("direct:start", "Hello");
- Awaitility.await().atMost(5, TimeUnit.SECONDS)
- .until(() -> body != null);
-
- MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
- }
- }
-
- @AfterEach
- void cleanupConsumer() {
- // We must ensure there's nothing on the queue between test executions
- Executors.newSingleThreadExecutor().execute(() -> {
- try {
- consumer.receiveBody("activemq:queue.JmsPollingConsumerTest.start", 200, String.class);
- } catch (Exception e) {
- // This is usually safe to ignore (ie.: if not connected, not started, etc after the test was run)
- }
- });
- }
-
- @Override
- protected String getComponentName() {
- return "activemq";
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() {
- return new RouteBuilder() {
- @Override
- public void configure() {
- from("direct:start").to("activemq:queue.JmsPollingConsumerTest.start");
-
- from("direct:start.wait").to("activemq:queue.JmsPollingConsumerTest.start.wait");
-
- from("activemq:queue.JmsPollingConsumerTest.foo").to("mock:result");
- }
- };
- }
-}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPriorityConsumerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPriorityConsumerTest.java
index f10bfb79490..215aead8207 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPriorityConsumerTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsPriorityConsumerTest.java
@@ -20,18 +20,37 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsPriorityConsumerTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+
+ protected ProducerTemplate template;
+ private CamelContext context;
+
@Override
protected String getComponentName() {
return "jms";
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
@Test
public void testPriority() throws Exception {
int messages = 100;
@@ -74,4 +93,10 @@ public class JmsPriorityConsumerTest extends AbstractJMSTest {
}
};
}
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java
index 0dd0c3dd339..b6d38da15e4 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentTest.java
@@ -20,14 +20,29 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.body;
public class JmsProducerConcurrentTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testNoConcurrentProducers() throws Exception {
doSendMessages(1, 1);
@@ -74,4 +89,15 @@ public class JmsProducerConcurrentTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java
index d8365c57648..637ba0d6b87 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerConcurrentWithReplyTest.java
@@ -23,11 +23,19 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.body;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,6 +43,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@Timeout(60)
public class JmsProducerConcurrentWithReplyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private ExecutorService executor;
@AfterEach
@@ -91,4 +105,15 @@ public class JmsProducerConcurrentWithReplyTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
index 285e9443a32..c7142e36786 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
@@ -23,13 +23,21 @@ import java.util.concurrent.TimeUnit;
import jakarta.jms.Destination;
import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.jms.JmsConstants.JMS_X_GROUP_ID;
import static org.assertj.core.api.Assertions.assertThat;
@@ -41,6 +49,13 @@ import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
@Timeout(60)
public class JmsProducerWithJMSHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testInOnlyJMSPrioritory() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -322,4 +337,16 @@ public class JmsProducerWithJMSHeaderTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java
index 53d44999428..56df0576445 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsQosRouteTest.java
@@ -16,12 +16,26 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsQosRouteTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testJmsRoutePreserveQos() throws Exception {
@@ -82,4 +96,16 @@ public class JmsQosRouteTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
index b44472b605d..36a7495dc43 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
@@ -19,12 +19,27 @@ package org.apache.camel.component.jms;
import java.util.HashMap;
import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsRemoveHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testRemoveHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -59,4 +74,16 @@ public class JmsRemoveHeaderTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyCorrelationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyCorrelationTest.java
index 88c95638bd3..3c6cf97fbfb 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyCorrelationTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyCorrelationTest.java
@@ -21,13 +21,20 @@ import java.util.concurrent.TimeUnit;
import jakarta.jms.ConnectionFactory;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -38,7 +45,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* Tests how the correlation between request and reply is done
*/
public class JmsRequestReplyCorrelationTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final String REPLY_BODY = "Bye World";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
/**
* When the setting useMessageIdAsCorrelationid is false and a correlation id is set on the message then we expect
@@ -263,4 +276,15 @@ public class JmsRequestReplyCorrelationTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToComponentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToComponentTest.java
index c69930033fe..a8af1175560 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToComponentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToComponentTest.java
@@ -17,10 +17,17 @@
package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.util.StopWatch;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -30,6 +37,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class JmsRequestReplyExclusiveReplyToComponentTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsRequestReplyExclusiveFixedReplyTo() {
StopWatch watch = new StopWatch();
@@ -77,4 +91,16 @@ public class JmsRequestReplyExclusiveReplyToComponentTest extends AbstractJMSTes
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToConcurrentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToConcurrentTest.java
index a9edc400070..d55940c602f 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToConcurrentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToConcurrentTest.java
@@ -21,11 +21,18 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.util.StopWatch;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +44,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Isolated
public class JmsRequestReplyExclusiveReplyToConcurrentTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(JmsRequestReplyExclusiveReplyToConcurrentTest.class);
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final int size = 100;
private final CountDownLatch latch = new CountDownLatch(size);
@@ -105,4 +118,16 @@ public class JmsRequestReplyExclusiveReplyToConcurrentTest extends AbstractJMSTe
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToRemoveAddRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToRemoveAddRouteTest.java
index 2c8c198d649..42fdfcbbe47 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToRemoveAddRouteTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToRemoveAddRouteTest.java
@@ -16,13 +16,28 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsRequestReplyExclusiveReplyToRemoveAddRouteTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsRequestReplyExclusiveFixedReplyTo() throws Exception {
assertEquals("Hello A", template.requestBody("direct:start", "A"));
@@ -67,4 +82,16 @@ public class JmsRequestReplyExclusiveReplyToRemoveAddRouteTest extends AbstractJ
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToTest.java
index ec7bc5abd15..8d345d475ca 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToTest.java
@@ -16,11 +16,19 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.FailedToCreateProducerException;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.util.StopWatch;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
@@ -34,6 +42,13 @@ import static org.junit.jupiter.api.Assertions.fail;
@Isolated
public class JmsRequestReplyExclusiveReplyToTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsRequestReplyExclusiveFixedReplyTo() {
StopWatch watch = new StopWatch();
@@ -89,4 +104,16 @@ public class JmsRequestReplyExclusiveReplyToTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyFixedReplyToInEndpointTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyFixedReplyToInEndpointTest.java
index 51e1cb20509..89e8c15cbda 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyFixedReplyToInEndpointTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyFixedReplyToInEndpointTest.java
@@ -16,11 +16,19 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -29,6 +37,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsRequestReplyFixedReplyToInEndpointTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsRequestReplyTempReplyTo() {
Exchange reply = template.request("activemq:queue:JmsRequestReplyFixedReplyToInEndpointTest",
@@ -85,4 +100,16 @@ public class JmsRequestReplyFixedReplyToInEndpointTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualReplyTest.java
index 2b3e22fdb57..32822fb19a7 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualReplyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualReplyTest.java
@@ -27,8 +27,16 @@ import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
import org.apache.camel.Body;
import org.apache.camel.CamelContext;
import org.apache.camel.Consume;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Header;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.jms.core.JmsTemplate;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,15 +44,16 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class JmsRequestReplyManualReplyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static volatile String tempName;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final CountDownLatch latch = new CountDownLatch(1);
private JmsTemplate jms;
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
-
@Consume("activemq:queue:JmsRequestReplyManualReplyTest")
public void doSomething(@Header("JMSReplyTo") Destination jmsReplyTo, @Body String body) {
assertEquals("Hello World", body);
@@ -87,4 +96,21 @@ public class JmsRequestReplyManualReplyTest extends AbstractJMSTest {
jms = new JmsTemplate(connectionFactory);
return component;
}
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return null;
+ }
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualWithJMSReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualWithJMSReplyToTest.java
index b2f3953e870..45d956db08e 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualWithJMSReplyToTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyManualWithJMSReplyToTest.java
@@ -20,18 +20,29 @@ import jakarta.jms.JMSException;
import jakarta.jms.Queue;
import org.apache.camel.Body;
+import org.apache.camel.CamelContext;
import org.apache.camel.Consume;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Header;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsRequestReplyManualWithJMSReplyToTest extends AbstractJMSTest {
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Consume("activemq:queue:fooJmsRequestReplyManualWithJMSReplyToTest")
public void doSomething(@Header("JMSReplyTo") Queue jmsReplyTo, @Body String body) throws JMSException {
@@ -43,8 +54,6 @@ public class JmsRequestReplyManualWithJMSReplyToTest extends AbstractJMSTest {
@Test
public void testManualRequestReply() {
- context.start();
-
// send an InOnly but force Camel to pass JMSReplyTo
template.send("activemq:queue:fooJmsRequestReplyManualWithJMSReplyToTest?preserveMessageQos=true", exchange -> {
exchange.getIn().setBody("Hello World");
@@ -60,4 +69,20 @@ public class JmsRequestReplyManualWithJMSReplyToTest extends AbstractJMSTest {
return "activemq";
}
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return null;
+ }
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
index 118c7562870..ce653409795 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
@@ -16,22 +16,34 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.class);
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
- @BeforeEach
void waitForConnections() {
Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 200);
Awaitility.await().until(() -> context.getRoute("route-2").getUptimeMillis() > 200);
@@ -81,4 +93,18 @@ public class JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest extends Abs
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+
+ waitForConnections();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyReplyToOverrideTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyReplyToOverrideTest.java
index a1860b9d300..88713859eeb 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyReplyToOverrideTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyReplyToOverrideTest.java
@@ -19,28 +19,37 @@ package org.apache.camel.component.jms;
import jakarta.jms.Destination;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsRequestReplyReplyToOverrideTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(JmsRequestReplyReplyToOverrideTest.class);
private static final String REQUEST_BODY = "Something";
private static final String EXPECTED_REPLY_BODY = "Re: " + REQUEST_BODY;
private static final String EXPECTED_REPLY_HEADER = "ActiveMQQueue[JmsRequestReplyReplyToOverrideTest.reply]";
-
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testJmsRequestReplyReplyToAndReplyToHeader() {
@@ -71,6 +80,23 @@ public class JmsRequestReplyReplyToOverrideTest extends AbstractJMSTest {
return jmsComponent;
}
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return null;
+ }
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private class Responder implements Runnable {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java
index 529d0ef20c9..e2e9b71d9d2 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java
@@ -16,15 +16,30 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.util.StopWatch;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class JmsRequestReplySharedReplyToTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsRequestReplySharedReplyTo() {
StopWatch watch = new StopWatch();
@@ -67,4 +82,16 @@ public class JmsRequestReplySharedReplyToTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTemporaryCacheNoneTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTemporaryCacheNoneTest.java
index cbeda5423ac..6dbe5692c65 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTemporaryCacheNoneTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTemporaryCacheNoneTest.java
@@ -16,9 +16,17 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,7 +35,13 @@ import static org.junit.jupiter.api.Assertions.fail;
public class JmsRequestReplyTemporaryCacheNoneTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Override
public String getComponentName() {
@@ -35,8 +49,8 @@ public class JmsRequestReplyTemporaryCacheNoneTest extends AbstractJMSTest {
}
@Override
- public boolean isUseRouteBuilder() {
- return false;
+ protected RouteBuilder createRouteBuilder() {
+ return null;
}
@Test
@@ -65,4 +79,16 @@ public class JmsRequestReplyTemporaryCacheNoneTest extends AbstractJMSTest {
iae.getMessage());
}
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
index 8a00334de80..b93be1ba8db 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTest.java
@@ -18,16 +18,30 @@ package org.apache.camel.component.jms;
import java.util.concurrent.ThreadLocalRandom;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.TransientCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public abstract class JmsRouteTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new TransientCamelContextExtension();
-public class JmsRouteTest extends AbstractJMSTest {
protected MockEndpoint resultEndpoint;
protected String componentName = "activemq";
protected String startEndpointUri;
protected String endEndpointUri;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final int endpointNum = ThreadLocalRandom.current().nextInt(10000);
@@ -59,17 +73,6 @@ public class JmsRouteTest extends AbstractJMSTest {
template.sendBodyAndHeader(startEndpointUri, expectedBody, "cheese", 123);
}
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- startEndpointUri = componentName + ":queue:test.a.JmsRouteTest" + endpointNum;
- endEndpointUri = componentName + ":queue:test.b.JmsRouteTest" + endpointNum;
-
- super.setUp();
-
- resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
- }
-
@Override
public String getComponentName() {
return componentName;
@@ -77,6 +80,9 @@ public class JmsRouteTest extends AbstractJMSTest {
@Override
protected RouteBuilder createRouteBuilder() {
+ startEndpointUri = componentName + ":queue:test.a.JmsRouteTest" + endpointNum;
+ endEndpointUri = componentName + ":queue:test.b.JmsRouteTest" + endpointNum;
+
return new RouteBuilder() {
public void configure() {
from(startEndpointUri).to(endEndpointUri);
@@ -84,4 +90,18 @@ public class JmsRouteTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+
+ resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutCheckerIntervalTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutCheckerIntervalTest.java
index b17576af422..d5cd7ba6101 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutCheckerIntervalTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutCheckerIntervalTest.java
@@ -17,12 +17,19 @@
package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangeTimedOutException;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -34,6 +41,13 @@ import static org.junit.jupiter.api.Assertions.fail;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsRouteTimeoutCheckerIntervalTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testTimeout() {
try {
@@ -77,4 +91,16 @@ public class JmsRouteTimeoutCheckerIntervalTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
index 72c4150536f..903443666cd 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteTimeoutTest.java
@@ -16,11 +16,19 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangeTimedOutException;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -32,6 +40,13 @@ import static org.junit.jupiter.api.Assertions.fail;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsRouteTimeoutTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testTimeout() {
try {
@@ -65,4 +80,16 @@ public class JmsRouteTimeoutTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java
index 5b3f9212263..f547c395bbe 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java
@@ -18,10 +18,18 @@ package org.apache.camel.component.jms;
import java.io.File;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,7 +40,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class JmsRouteToFileTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testRouteToFile() throws Exception {
@@ -70,4 +84,16 @@ public class JmsRouteToFileTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingDifferentHeadersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingDifferentHeadersTest.java
index bfd763bedac..80d1ee30866 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingDifferentHeadersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingDifferentHeadersTest.java
@@ -19,12 +19,27 @@ package org.apache.camel.component.jms;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsRouteUsingDifferentHeadersTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testUsingDifferentHeaderTypes() throws Exception {
Map<String, Object> headers = new LinkedHashMap<>();
@@ -67,4 +82,16 @@ public class JmsRouteUsingDifferentHeadersTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java
index 1ed2e9d6327..70b1da49da1 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java
@@ -20,12 +20,19 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +42,13 @@ import static org.apache.camel.test.junit5.TestSupport.body;
@Timeout(20)
public class JmsRouteUsingJMSXGroupTest extends AbstractJMSTest {
public static final int POOL_SIZE = 1;
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(JmsRouteUsingJMSXGroupTest.class);
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private ExecutorService executor;
@@ -102,4 +115,15 @@ public class JmsRouteUsingJMSXGroupTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringAndJmsNameTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringAndJmsNameTest.java
index 235278fe347..4418260e9c6 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringAndJmsNameTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringAndJmsNameTest.java
@@ -28,10 +28,8 @@ public class JmsRouteUsingSpringAndJmsNameTest extends JmsRouteUsingSpringTest {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/jmsRouteUsingSpringAndJmsName.xml");
}
- @Override
@BeforeEach
public void setUp() throws Exception {
componentName = "jms";
- super.setUp();
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringTest.java
index f8efcfdacd7..c7899c199df 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringTest.java
@@ -18,16 +18,19 @@ package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.test.infra.core.annotations.ContextProvider;
import org.apache.camel.util.IOHelper;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+@Isolated
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsRouteUsingSpringTest extends JmsRouteTest {
private ClassPathXmlApplicationContext applicationContext;
- @Override
+ @ContextProvider
protected CamelContext createCamelContext() throws Exception {
applicationContext = createApplicationContext();
return SpringCamelContext.springCamelContext(applicationContext, true);
@@ -37,10 +40,8 @@ public class JmsRouteUsingSpringTest extends JmsRouteTest {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/jmsRouteUsingSpring.xml");
}
- @Override
@AfterEach
- public void tearDown() throws Exception {
- super.tearDown();
+ public void tearDown() {
IOHelper.close(applicationContext);
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
index 35b9882610f..8888976ae18 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithCustomListenerContainerTest.java
@@ -17,11 +17,19 @@
package org.apache.camel.component.jms;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.jms.listener.AbstractMessageListenerContainer;
import org.springframework.jms.listener.DefaultMessageListenerContainer;
@@ -34,7 +42,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsRouteWithCustomListenerContainerTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("orderService")
private final MyOrderServiceBean serviceBean = new MyOrderServiceBean();
@@ -87,6 +101,18 @@ public class JmsRouteWithCustomListenerContainerTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyListenerContainerFactory implements MessageListenerContainerFactory {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java
index fd57200c53a..4366ed4e941 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithDefaultKeyFormatStrategyTest.java
@@ -19,15 +19,30 @@ package org.apache.camel.component.jms;
import java.util.HashMap;
import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.fail;
public class JmsRouteWithDefaultKeyFormatStrategyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
protected String getUri() {
return "activemq:queue:JmsRouteWithDefaultKeyFormatStrategyTest?jmsKeyFormatStrategy=default";
}
@@ -97,4 +112,16 @@ public class JmsRouteWithDefaultKeyFormatStrategyTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
index 54b89b37af1..17bd37feb85 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyAndMultipleAcksTest.java
@@ -19,12 +19,20 @@ package org.apache.camel.component.jms;
import java.util.concurrent.TimeUnit;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,7 +40,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsRouteWithInOnlyAndMultipleAcksTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "amq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("orderService")
private final MyOrderServiceBean serviceBean = new MyOrderServiceBean();
@@ -101,6 +115,18 @@ public class JmsRouteWithInOnlyAndMultipleAcksTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyOrderServiceBean {
public String handleOrder(String body) {
return "OK: " + body;
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
index 896250caa00..dbcdb93ee77 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteWithInOnlyTest.java
@@ -19,12 +19,20 @@ package org.apache.camel.component.jms;
import java.util.concurrent.TimeUnit;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,7 +43,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@Timeout(10)
public class JmsRouteWithInOnlyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("orderService")
private final MyOrderServiceBean serviceBean = new MyOrderServiceBean();
@@ -78,6 +92,18 @@ public class JmsRouteWithInOnlyTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyOrderServiceBean {
public String handleOrder(String body) {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
index da20b7d30dc..b736330a5ba 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
@@ -20,16 +20,30 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Headers;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
@Timeout(10)
public class JmsRoutingSlipInOutTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("myBean")
private final MyBean bean = new MyBean();
@@ -66,6 +80,18 @@ public class JmsRoutingSlipInOutTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static final class MyBean {
public void createSlip(@Headers Map<String, Object> headers) {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipTest.java
index c376bca50ce..4232b6d2485 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipTest.java
@@ -16,16 +16,30 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Unit test from JMS -> routing slip
*/
public class JmsRoutingSlipTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testJmsRoutingSlip() throws Exception {
@@ -51,4 +65,15 @@ public class JmsRoutingSlipTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
index 15895e25e89..49ba8cac404 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorInTest.java
@@ -16,14 +16,21 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,6 +40,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class JmsSelectorInTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
@Order(1)
public void testJmsSelectorIn() throws Exception {
@@ -64,11 +78,23 @@ public class JmsSelectorInTest extends AbstractJMSTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- JmsEndpoint endpoint = context.getEndpoint("activemq:queue:JmsSelectorInTest", JmsEndpoint.class);
+ JmsEndpoint endpoint = getContext().getEndpoint("activemq:queue:JmsSelectorInTest", JmsEndpoint.class);
endpoint.setSelector("drink IN ('beer', 'wine')");
from(endpoint).to("log:drink").to("mock:result2");
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorOptionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorOptionTest.java
index da1bbccd8f0..cf9d924a873 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorOptionTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorOptionTest.java
@@ -16,18 +16,32 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class JmsSelectorOptionTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testJmsMessageWithSelector() throws Exception {
@@ -89,4 +103,15 @@ public class JmsSelectorOptionTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorTest.java
index c8a2cfe9a9b..84fcb8d388a 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSelectorTest.java
@@ -18,14 +18,29 @@ package org.apache.camel.component.jms;
import jakarta.jms.ConnectionFactory;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentTransacted;
public class JmsSelectorTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsSelector() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -60,4 +75,16 @@ public class JmsSelectorTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSessionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSessionTest.java
index c4e02750561..e9f4c741feb 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSessionTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSessionTest.java
@@ -18,15 +18,29 @@ package org.apache.camel.component.jms;
import jakarta.jms.Session;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JmsSessionTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testJmsSession() throws Exception {
@@ -59,4 +73,16 @@ public class JmsSessionTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleHeaderTest.java
index da1340abc42..b469ac0f718 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleHeaderTest.java
@@ -16,13 +16,27 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsSimpleHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testByteJMSHeaders() throws Exception {
@@ -73,4 +87,16 @@ public class JmsSimpleHeaderTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleInOnlyNoMutateTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleInOnlyNoMutateTest.java
index b155a7f4fcd..af04f1ce4d0 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleInOnlyNoMutateTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleInOnlyNoMutateTest.java
@@ -16,16 +16,30 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* A simple in only test that does not mutate the message
*/
public class JmsSimpleInOnlyNoMutateTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testRequestReplyNoMutate() throws Exception {
@@ -55,4 +69,16 @@ public class JmsSimpleInOnlyNoMutateTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java
index 43203c228da..59294114204 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestCustomReplyToTest.java
@@ -20,13 +20,20 @@ import java.util.concurrent.CountDownLatch;
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,9 +45,15 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
*/
public class JmsSimpleRequestCustomReplyToTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(JmsSimpleRequestCustomReplyToTest.class);
private static String myReplyTo;
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private CountDownLatch latch = new CountDownLatch(1);
@Test
@@ -82,6 +95,18 @@ public class JmsSimpleRequestCustomReplyToTest extends AbstractJMSTest {
consumer.stop();
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private class SendLateReply implements Runnable {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestLateReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestLateReplyTest.java
index 83b3b54aaf3..000c41bd842 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestLateReplyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestLateReplyTest.java
@@ -24,12 +24,19 @@ import java.util.concurrent.TimeUnit;
import jakarta.jms.Destination;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,11 +47,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class JmsSimpleRequestLateReplyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(JmsSimpleRequestLateReplyTest.class);
private static Destination replyDestination;
private static String cid;
protected final String expectedBody = "Late Reply";
protected JmsComponent activeMQComponent;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final CountDownLatch latch = new CountDownLatch(1);
@Test
@@ -66,6 +79,18 @@ public class JmsSimpleRequestLateReplyTest extends AbstractJMSTest {
assertEquals(expectedBody, body);
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private class SendLateReply implements Runnable {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReply2Test.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReply2Test.java
index 6c18fbdecee..26fd9d024c4 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReply2Test.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReply2Test.java
@@ -16,10 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -28,7 +36,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class JmsSimpleRequestReply2Test extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testWithInOnly() throws Exception {
@@ -69,4 +83,16 @@ public class JmsSimpleRequestReply2Test extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyFixedReplyQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyFixedReplyQueueTest.java
index 54d939fb99f..dea4f6513af 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyFixedReplyQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyFixedReplyQueueTest.java
@@ -16,10 +16,18 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -28,7 +36,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class JmsSimpleRequestReplyFixedReplyQueueTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testWithInOnly() throws Exception {
@@ -70,4 +84,16 @@ public class JmsSimpleRequestReplyFixedReplyQueueTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyTest.java
index a8d2ed297d7..8fb95d7a7ef 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyTest.java
@@ -16,13 +16,21 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -34,7 +42,13 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
@TestInstance(TestInstance.Lifecycle.PER_METHOD)
public class JmsSimpleRequestReplyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testRequestReply() throws Exception {
@@ -81,4 +95,16 @@ public class JmsSimpleRequestReplyTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSplitterParallelChainedTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSplitterParallelChainedTest.java
index c9101ef52e9..532d2a8994a 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSplitterParallelChainedTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSplitterParallelChainedTest.java
@@ -16,16 +16,31 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Test that chained request/reply over JMS works in parallel mode with the splitter EIP.
*/
public class JmsSplitterParallelChainedTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
protected String getUri() {
return "activemq:queue:fooJmsSplitterParallelChainedTest";
}
@@ -79,4 +94,15 @@ public class JmsSplitterParallelChainedTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSplitterParallelTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSplitterParallelTest.java
index dfacd8cb551..d2c1e9ff035 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSplitterParallelTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSplitterParallelTest.java
@@ -16,13 +16,28 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsSplitterParallelTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
protected String getUri() {
return "activemq:queue:JmsSplitterParallelTest?useMessageIDAsCorrelationID=true";
}
@@ -64,4 +79,15 @@ public class JmsSplitterParallelTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSpringLoadBalanceFailoverJMSTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSpringLoadBalanceFailoverJMSTest.java
index dd774c1722a..b9be9746c5f 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSpringLoadBalanceFailoverJMSTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSpringLoadBalanceFailoverJMSTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jms;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -26,6 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Unit test for Camel loadbalancer failover with JMS
*/
+@Isolated
public class JmsSpringLoadBalanceFailoverJMSTest extends AbstractSpringJMSTestSupport {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeNoStreamCachingTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeNoStreamCachingTest.java
index fdb82a29d66..70f29f21f2a 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeNoStreamCachingTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeNoStreamCachingTest.java
@@ -19,12 +19,20 @@ package org.apache.camel.component.jms;
import java.io.File;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.TransientCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
import org.apache.camel.util.FileUtil;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.ResourceLock;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -33,14 +41,19 @@ import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
import static org.junit.jupiter.api.Assertions.assertEquals;
-@ResourceLock("target/stream/JmsStreamMessageTypeNoStreamCachingTest")
+@ResourceLock("src/test/data")
public class JmsStreamMessageTypeNoStreamCachingTest extends AbstractJMSTest {
- @Override
- @BeforeEach
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new TransientCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
+ @AfterEach
public void setUp() throws Exception {
deleteDirectory("target/stream/JmsStreamMessageTypeNoStreamCachingTest");
- super.setUp();
}
@Override
@@ -56,12 +69,9 @@ public class JmsStreamMessageTypeNoStreamCachingTest extends AbstractJMSTest {
return component;
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
- camelContext.setStreamCaching(false);
-
- return camelContext;
+ @ContextFixture
+ public void setupStreamCaching(CamelContext context) {
+ context.setStreamCaching(false);
}
@ParameterizedTest
@@ -108,4 +118,15 @@ public class JmsStreamMessageTypeNoStreamCachingTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
index 91a49d2e71f..cd0cab83610 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsStreamMessageTypeTest.java
@@ -20,12 +20,19 @@ import java.io.File;
import java.io.InputStream;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+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.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.TransientCamelContextExtension;
import org.apache.camel.util.FileUtil;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.ResourceLock;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -37,14 +44,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* This test cannot run in parallel: it reuses the same path for different test iterations
*/
-@ResourceLock("target/stream/JmsStreamMessageTypeTest")
+@ResourceLock("src/test/data")
public class JmsStreamMessageTypeTest extends AbstractJMSTest {
- @Override
- @BeforeEach
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new TransientCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
+ @AfterEach
public void setUp() throws Exception {
deleteDirectory("target/stream/JmsStreamMessageTypeTest");
- super.setUp();
}
@Override
@@ -98,4 +110,15 @@ public class JmsStreamMessageTypeTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDTest.java
index e2d251d740f..24dfe3fed4e 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToDTest.java
@@ -16,12 +16,27 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsToDTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testToD() throws Exception {
getMockEndpoint("mock:JmsToDTest.bar").expectedBodiesReceived("Hello bar");
@@ -51,4 +66,16 @@ public class JmsToDTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToTest.java
index 47614754f98..96a1f38c031 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsToTest.java
@@ -16,12 +16,27 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsToTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testTo() throws Exception {
getMockEndpoint("mock:JmsToTest.bar").expectedMessageCount(0);
@@ -55,4 +70,16 @@ public class JmsToTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransactedRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransactedRouteTest.java
index 0338ea244a9..f99837710dc 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransactedRouteTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransactedRouteTest.java
@@ -18,14 +18,29 @@ package org.apache.camel.component.jms;
import jakarta.jms.ConnectionFactory;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.component.jms.JmsComponent.jmsComponentTransacted;
public class JmsTransactedRouteTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsRouteWithTextMessage() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
@@ -60,4 +75,16 @@ public class JmsTransactedRouteTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java
index 4eab9f6488f..67741692086 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExceptionTest.java
@@ -16,10 +16,17 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -27,17 +34,21 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
public class JmsTransferExceptionTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static int counter;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
protected String getUri() {
return "activemq:queue:JmsTransferExceptionTest?transferException=true";
}
- @Override
@BeforeEach
public void setUp() throws Exception {
counter = 0;
- super.setUp();
}
@Test
@@ -90,4 +101,15 @@ public class JmsTransferExceptionTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeFromSplitterTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeFromSplitterTest.java
index 20bf8aebd4e..284bc915cdf 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeFromSplitterTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeFromSplitterTest.java
@@ -16,12 +16,27 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsTransferExchangeFromSplitterTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
protected String getUri() {
return "activemq:queue:JmsTransferExchangeFromSplitterTest?transferExchange=true";
}
@@ -60,4 +75,15 @@ public class JmsTransferExchangeFromSplitterTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java
index 6abd73e1b60..9e18176f33f 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsTransferExchangeTest.java
@@ -18,12 +18,27 @@ package org.apache.camel.component.jms;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsTransferExchangeTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
protected String getUri() {
return "activemq:queue:JmsTransferExchangeTest?transferExchange=true";
}
@@ -84,4 +99,15 @@ public class JmsTransferExchangeTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java
index 4387f64671d..dbff8111478 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsUseOriginalBodyTest.java
@@ -16,11 +16,19 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,6 +37,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class JmsUseOriginalBodyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testUseOriginalBody() throws Exception {
MockEndpoint dead = getMockEndpoint("mock:a");
@@ -77,6 +92,18 @@ public class JmsUseOriginalBodyTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyThrowProcessor implements Processor {
public MyThrowProcessor() {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
index 754ae6c354f..a09b8b7d3f0 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
@@ -21,10 +21,19 @@ import java.io.FileInputStream;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
import org.apache.camel.util.xml.StringSource;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -33,9 +42,15 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
* For unit testing with XML streams that can be troublesome with the StreamCache
*/
public class JmsXMLRouteTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final String TEST_LONDON = "src/test/data/message1.xml";
private static final String TEST_TAMPA = "src/test/data/message2.xml";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testLondonWithFileStreamAsObject() throws Exception {
@@ -186,14 +201,17 @@ public class JmsXMLRouteTest extends AbstractJMSTest {
return "activemq";
}
+ @ContextFixture
+ public void configureStreamCaching(CamelContext context) {
+ // enable stream caching
+ context.setStreamCaching(true);
+ }
+
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
public void configure() {
- // enable stream caching
- context.setStreamCaching(true);
-
errorHandler(deadLetterChannel("mock:error").redeliveryDelay(0));
// no need to convert to String as JMS producer can handle XML streams now
@@ -232,4 +250,15 @@ public class JmsXMLRouteTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXPathHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXPathHeaderTest.java
index 57fa2baeeab..1827d546559 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXPathHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXPathHeaderTest.java
@@ -16,15 +16,30 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* JMS with XPath
*/
public class JmsXPathHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testTrue() throws Exception {
getMockEndpoint("mock:true").expectedMessageCount(1);
@@ -79,4 +94,15 @@ public class JmsXPathHeaderTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
index a10dcf26c13..5a65825b514 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTopicTest.java
@@ -21,10 +21,18 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -34,10 +42,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class ManagedJmsEndpointTopicTest extends AbstractJMSTest {
- @Override
- protected boolean useJmx() {
- return true;
- }
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Override
protected String getComponentName() {
@@ -87,4 +97,16 @@ public class ManagedJmsEndpointTopicTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java
index f3f607327b0..6dc9013f98d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java
@@ -25,50 +25,70 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
import org.apache.camel.test.infra.artemis.services.ArtemisServiceFactory;
-import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.TransientCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
+import org.apache.camel.test.infra.core.annotations.RouteFixture;
+import org.apache.camel.test.infra.core.api.CamelTestSupportHelper;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.api.parallel.Isolated;
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;
-@Isolated
-public class ManagedJmsSelectorTest extends CamelTestSupport {
+@Tags({ @Tag("not-parallel") })
+public class ManagedJmsSelectorTest implements CamelTestSupportHelper {
+ @Order(1)
@RegisterExtension
- public ArtemisService service = ArtemisServiceFactory.createVMService();
+ public static ArtemisService service = ArtemisServiceFactory.createVMService();
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() {
- CamelContext context = new DefaultCamelContext();
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new TransientCamelContextExtension();
+ @ContextFixture
+ public void setupContext(CamelContext context) {
final ConnectionFactory connectionFactory
= ConnectionFactoryHelper.createConnectionFactory(service.serviceAddress(), null);
context.addComponent("activemq", jmsComponentAutoAcknowledge(connectionFactory));
- return context;
+ DefaultCamelContext.setDisableJmx(false);
+ }
+
+ @RouteFixture
+ public void createRouteBuilder(CamelContext context) throws Exception {
+ final RouteBuilder routeBuilder = createRouteBuilder();
+
+ if (routeBuilder != null) {
+ context.addRoutes(routeBuilder);
+ }
+ }
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
}
protected MBeanServer getMBeanServer() {
- return context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ return camelContextExtension.getContext().getManagementStrategy().getManagementAgent().getMBeanServer();
}
@Test
public void testJmsSelectorChangeViaJmx() throws Exception {
+ ProducerTemplate template = camelContextExtension.getProducerTemplate();
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=consumers,*"), null);
@@ -87,11 +107,11 @@ public class ManagedJmsSelectorTest extends CamelTestSupport {
template.sendBodyAndHeader("activemq:queue:startManagedJmsSelectorTest", "Pepsi", "brand", "softdrink");
template.sendBodyAndHeader("activemq:queue:startManagedJmsSelectorTest", "Carlsberg", "brand", "beer");
- MockEndpoint.assertIsSatisfied(context);
+ MockEndpoint.assertIsSatisfied(camelContextExtension.getContext());
// change the selector at runtime
- MockEndpoint.resetMocks(context);
+ MockEndpoint.resetMocks(camelContextExtension.getContext());
mock.reset();
mbeanServer.setAttribute(on, new Attribute("MessageSelector", "brand='softdrink'"));
@@ -111,7 +131,6 @@ public class ManagedJmsSelectorTest extends CamelTestSupport {
assertEquals("brand='softdrink'", selector);
}
- @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java
index 2618e65d20d..199377d8d1d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/MapJmsMessageTest.java
@@ -19,12 +19,27 @@ package org.apache.camel.component.jms;
import jakarta.jms.BytesMessage;
import jakarta.jms.TextMessage;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class MapJmsMessageTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Override
protected String getComponentName() {
return "activemq";
@@ -61,4 +76,15 @@ public class MapJmsMessageTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java
index 0442ec37686..760c5162b24 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java
@@ -22,16 +22,30 @@ import java.io.Reader;
import java.io.StringReader;
import java.nio.ByteBuffer;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Unit test that we send payload as byte[] for certain types
*/
public class PayloadByteArrayJmsTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final String componentName = "activemq";
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testReaderShouldBeByteArray() throws Exception {
@@ -88,4 +102,16 @@ public class PayloadByteArrayJmsTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ProduceMessageConverterTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ProduceMessageConverterTest.java
index a70a33dd8a1..9ef90b1c1b1 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ProduceMessageConverterTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ProduceMessageConverterTest.java
@@ -22,14 +22,28 @@ import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.jms.support.converter.MessageConversionException;
import org.springframework.jms.support.converter.MessageConverter;
public class ProduceMessageConverterTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("myMessageConverter")
private final MyMessageConverter conv = new MyMessageConverter();
@@ -57,6 +71,18 @@ public class ProduceMessageConverterTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
private static class MyMessageConverter implements MessageConverter {
@Override
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ReplyToDestinationSelectorNameTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ReplyToDestinationSelectorNameTest.java
index 93cbee97629..d62c9922cb1 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ReplyToDestinationSelectorNameTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ReplyToDestinationSelectorNameTest.java
@@ -16,9 +16,17 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,6 +35,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class ReplyToDestinationSelectorNameTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testReplyToDestinationSelectorName() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -61,4 +76,16 @@ public class ReplyToDestinationSelectorNameTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/RequestReplyCorrelatedWithCustomHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/RequestReplyCorrelatedWithCustomHeaderTest.java
index 7bb28515013..e9ba5478bf0 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/RequestReplyCorrelatedWithCustomHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/RequestReplyCorrelatedWithCustomHeaderTest.java
@@ -18,11 +18,18 @@ package org.apache.camel.component.jms;
import org.apache.camel.Body;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Header;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.infra.artemis.services.ArtemisService;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -31,6 +38,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class RequestReplyCorrelatedWithCustomHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
public static void processRequest(
@Body final String body,
@Header("CustomCorrelation") final String customCorrelation,
@@ -78,4 +92,16 @@ public class RequestReplyCorrelatedWithCustomHeaderTest extends AbstractJMSTest
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyExclusiveReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyExclusiveReplyToTest.java
index 23148b787d6..69cebd99213 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyExclusiveReplyToTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyExclusiveReplyToTest.java
@@ -16,8 +16,16 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -26,6 +34,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class SimpleJmsRequestReplyExclusiveReplyToTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsRequestReplyExclusiveFixedReplyTo() {
assertEquals("Hello A",
@@ -65,4 +80,16 @@ public class SimpleJmsRequestReplyExclusiveReplyToTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplySharedReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplySharedReplyToTest.java
index 8814f4d7961..fc69d0a0c74 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplySharedReplyToTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplySharedReplyToTest.java
@@ -16,13 +16,28 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class SimpleJmsRequestReplySharedReplyToTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsRequestReplySharedReplyTo() {
assertEquals("Hello A", template.requestBody(
@@ -57,4 +72,16 @@ public class SimpleJmsRequestReplySharedReplyToTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyTest.java
index d23b95bff20..686138fe4d2 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyTest.java
@@ -16,13 +16,28 @@
*/
package org.apache.camel.component.jms;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class SimpleJmsRequestReplyTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsRequestReply() {
assertEquals("Hello A",
@@ -52,4 +67,16 @@ public class SimpleJmsRequestReplyTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/ActiveMQConsumeWildcardQueuesTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/ActiveMQConsumeWildcardQueuesTest.java
index 9e26523fd64..fdbb198a1f8 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/ActiveMQConsumeWildcardQueuesTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/ActiveMQConsumeWildcardQueuesTest.java
@@ -16,16 +16,31 @@
*/
package org.apache.camel.component.jms.activemq;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* ActiveMQ specific unit test
*/
public class ActiveMQConsumeWildcardQueuesTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testWildcard() throws Exception {
MockEndpoint chelsea = getMockEndpoint("mock:chelsea");
@@ -71,4 +86,15 @@ public class ActiveMQConsumeWildcardQueuesTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerFalseTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerFalseTest.java
index e219153cb97..7490ca4ec43 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerFalseTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerFalseTest.java
@@ -17,16 +17,31 @@
package org.apache.camel.component.jms.async;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
*
*/
public class AsyncConsumerFalseTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testAsyncJmsConsumer() throws Exception {
// async is disabled (so we should receive in same order)
@@ -43,13 +58,9 @@ public class AsyncConsumerFalseTest extends AbstractJMSTest {
return "activemq";
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
- camelContext.addComponent("async", new MyAsyncComponent());
-
- return camelContext;
+ @ContextFixture
+ public void configureComponent(CamelContext context) {
+ context.addComponent("async", new MyAsyncComponent());
}
@Override
@@ -68,4 +79,16 @@ public class AsyncConsumerFalseTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
index ad4ad340b5f..8a6c90e2dd6 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTest.java
@@ -19,19 +19,32 @@ package org.apache.camel.component.jms.async;
import java.util.concurrent.TimeUnit;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
@Timeout(30)
public class AsyncConsumerInOutTest extends AbstractJMSTest {
- @BeforeEach
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
void waitForConnections() {
Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 200);
Awaitility.await().until(() -> context.getRoute("route-2").getUptimeMillis() > 200);
@@ -56,12 +69,9 @@ public class AsyncConsumerInOutTest extends AbstractJMSTest {
return "activemq";
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("async", new MyAsyncComponent());
-
- return camelContext;
+ @ContextFixture
+ public void configureComponent(CamelContext context) {
+ context.addComponent("async", new MyAsyncComponent());
}
@Override
@@ -88,4 +98,18 @@ public class AsyncConsumerInOutTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+
+ waitForConnections();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTwoTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTwoTest.java
index d1ed937ed46..70aade6e3f0 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTwoTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTwoTest.java
@@ -17,16 +17,31 @@
package org.apache.camel.component.jms.async;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@Timeout(10)
public class AsyncConsumerInOutTwoTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testAsyncJmsConsumer() {
String out = template.requestBody(
@@ -40,12 +55,9 @@ public class AsyncConsumerInOutTwoTest extends AbstractJMSTest {
return "activemq";
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("async", new MyAsyncComponent());
-
- return camelContext;
+ @ContextFixture
+ public void configureComponent(CamelContext context) {
+ context.addComponent("async", new MyAsyncComponent());
}
@Override
@@ -60,4 +72,16 @@ public class AsyncConsumerInOutTwoTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerTest.java
index 8d4b63a6042..3e43cb5c712 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerTest.java
@@ -17,16 +17,31 @@
package org.apache.camel.component.jms.async;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
*
*/
public class AsyncConsumerTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testAsyncJmsConsumer() throws Exception {
// Hello World is received first despite its send last
@@ -46,12 +61,9 @@ public class AsyncConsumerTest extends AbstractJMSTest {
return "activemq";
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
- camelContext.addComponent("async", new MyAsyncComponent());
-
- return camelContext;
+ @ContextFixture
+ public void configureComponent(CamelContext context) {
+ context.addComponent("async", new MyAsyncComponent());
}
@Override
@@ -70,4 +82,16 @@ public class AsyncConsumerTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
index 5e4649dcadf..2f3a00d728d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsInOutTest.java
@@ -18,12 +18,20 @@ package org.apache.camel.component.jms.async;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.util.StopWatch;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +39,13 @@ import static org.apache.camel.test.junit5.TestSupport.body;
public class AsyncJmsInOutTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static final Logger LOG = LoggerFactory.getLogger(AsyncJmsInOutTest.class);
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Override
protected String getComponentName() {
@@ -82,4 +96,16 @@ public class AsyncJmsInOutTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsProducerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsProducerTest.java
index 120ac008c49..7ff9c58d824 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsProducerTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncJmsProducerTest.java
@@ -16,18 +16,32 @@
*/
package org.apache.camel.component.jms.async;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
public class AsyncJmsProducerTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
private static String beforeThreadName;
private static String afterThreadName;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testAsyncEndpoint() throws Exception {
@@ -68,4 +82,16 @@ public class AsyncJmsProducerTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
index c5f5ec2a014..8759664a0eb 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
@@ -18,18 +18,32 @@ package org.apache.camel.component.jms.discovery;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.ShutdownRoute;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spi.Registry;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.assertj.core.api.Assertions.assertThat;
public class JmsDiscoveryTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final MyRegistry myRegistry = new MyRegistry();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testDiscovery() throws Exception {
@@ -51,10 +65,10 @@ public class JmsDiscoveryTest extends AbstractJMSTest {
return "activemq";
}
- @Override
- protected void bindToRegistry(Registry registry) {
- registry.bind("service1", new MyService("service1"));
- registry.bind("registry", myRegistry);
+ @ContextFixture
+ public void configureComponent(CamelContext context) {
+ context.getRegistry().bind("service1", new MyService("service1"));
+ context.getRegistry().bind("registry", myRegistry);
}
@Override
@@ -74,4 +88,16 @@ public class JmsDiscoveryTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java
index 2e2ab4fb9de..903f34fb78b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java
@@ -20,22 +20,36 @@ import java.util.Date;
import java.util.List;
import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class ActiveMQPropagateHeadersTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final Object expectedBody = "<time>" + new Date() + "</time>";
protected final ActiveMQQueue replyQueue = new ActiveMQQueue("test.reply.queue.ActiveMQPropagateHeadersTest");
protected final String correlationID = "ABC-123";
protected final String messageType = getClass().getName();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void testForwardingAMessageAcrossJMSKeepingCustomJMSHeaders() throws Exception {
@@ -82,4 +96,16 @@ public class ActiveMQPropagateHeadersTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
index bc06e52ae0a..0f0c8e1690b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
@@ -24,23 +24,36 @@ import java.util.Map;
import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.AssertionClause;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.apache.camel.test.infra.core.annotations.ContextFixture;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class ActiveMQPropagateSerializableHeadersTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
protected final Object expectedBody = "<time>" + new Date() + "</time>";
protected ActiveMQQueue replyQueue = new ActiveMQQueue("ActiveMQPropagateSerializableHeadersTest.reply.queue");
protected String correlationID = "ABC-123";
protected String messageType = getClass().getName();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private Calendar calValue;
private Map<String, Object> mapValue;
@@ -87,14 +100,10 @@ public class ActiveMQPropagateSerializableHeadersTest extends AbstractJMSTest {
return "activemq";
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext camelContext = super.createCamelContext();
-
+ @ContextFixture
+ public void configureComponent(CamelContext context) {
// prevent java.io.NotSerializableException: org.apache.camel.support.DefaultMessageHistory
- camelContext.setMessageHistory(false);
-
- return camelContext;
+ context.setMessageHistory(false);
}
@Override
@@ -113,4 +122,16 @@ public class ActiveMQPropagateSerializableHeadersTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BruceHandlingBeanExceptionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BruceHandlingBeanExceptionTest.java
index 81e8dedcf97..7c78a1162e9 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BruceHandlingBeanExceptionTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/BruceHandlingBeanExceptionTest.java
@@ -16,9 +16,17 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -28,6 +36,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class BruceHandlingBeanExceptionTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSendOK() {
Object out = template.requestBody("activemq:queue:BruceHandlingBeanExceptionTest.ok", "Hello World");
@@ -57,6 +72,18 @@ public class BruceHandlingBeanExceptionTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyExceptionBean {
public String doSomething(String input) {
throw new IllegalArgumentException("Forced exception by unit test");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
index 11524677d40..122b9b40678 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/DynamicRoutersWithJMSMessageLostHeadersIssueTest.java
@@ -16,13 +16,20 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.Header;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
@@ -31,12 +38,17 @@ import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
*/
public class DynamicRoutersWithJMSMessageLostHeadersIssueTest extends AbstractJMSTest {
- @Override
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@BeforeEach
public void setUp() throws Exception {
deleteDirectory("target/inbox");
deleteDirectory("target/outbox");
- super.setUp();
}
@Override
@@ -82,6 +94,18 @@ public class DynamicRoutersWithJMSMessageLostHeadersIssueTest extends AbstractJM
MockEndpoint.assertIsSatisfied(context);
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class DynamicRouter {
public String dynamicRoute(Exchange exchange, @Header(Exchange.SLIP_ENDPOINT) String previous) {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
index 033fb970ab5..b7d904aabad 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsAnotherCustomJMSReplyToTest.java
@@ -22,18 +22,32 @@ import jakarta.jms.ConnectionFactory;
import jakarta.jms.Queue;
import jakarta.jms.TextMessage;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.awaitility.Awaitility;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.jms.core.JmsTemplate;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsAnotherCustomJMSReplyToTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private JmsComponent amq;
@Test
@@ -87,4 +101,16 @@ public class JmsAnotherCustomJMSReplyToTest extends AbstractJMSTest {
return amq;
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
index 12e8c0f9609..19e62242015 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsBeanMethodHeaderTest.java
@@ -18,18 +18,32 @@ package org.apache.camel.component.jms.issues;
import org.apache.camel.BindToRegistry;
import org.apache.camel.Body;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Unit test for sending the bean method name as a key over the JMS wire, that we now support this.
*/
public class JmsBeanMethodHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("approveService")
private final ApproveService service = new ApproveService();
@@ -112,6 +126,18 @@ public class JmsBeanMethodHeaderTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class ApproveService {
public void doSomeStuff(String input) {
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsChainedEndpointDelayTimeoutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsChainedEndpointDelayTimeoutTest.java
index 345a2fcc2a6..e1dabdb26eb 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsChainedEndpointDelayTimeoutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsChainedEndpointDelayTimeoutTest.java
@@ -16,12 +16,20 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ExchangeTimedOutException;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Unit test to assert that timeouts don't trigger twice when JMS InOut endpoints are chained, and the second endpoint
@@ -29,6 +37,13 @@ import org.junit.jupiter.api.Test;
*/
public class JmsChainedEndpointDelayTimeoutTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testTimeoutNotTriggeredTempQueue() throws Exception {
getMockEndpoint("mock:exception").expectedMessageCount(0);
@@ -76,4 +91,16 @@ public class JmsChainedEndpointDelayTimeoutTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
index 9e8cc8324a4..fb52866814b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
@@ -20,9 +20,17 @@ import java.time.Duration;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Isolated;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -35,6 +43,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@Isolated
public class JmsConcurrentConsumersTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testConcurrentConsumersWithReply() throws Exception {
// latch for the 5 exchanges we expect
@@ -83,4 +98,15 @@ public class JmsConcurrentConsumersTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java
index 998041cb6fe..097d8cce986 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsCustomJMSReplyToIssueTest.java
@@ -20,12 +20,20 @@ import jakarta.jms.ConnectionFactory;
import jakarta.jms.Queue;
import jakarta.jms.TextMessage;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.jms.core.JmsTemplate;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,6 +41,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
@Timeout(15)
public class JmsCustomJMSReplyToIssueTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private JmsComponent amq;
@Test
@@ -85,4 +99,15 @@ public class JmsCustomJMSReplyToIssueTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java
index 95d1ac2f544..1885cee459d 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsFilenameHeaderTest.java
@@ -18,11 +18,19 @@ package org.apache.camel.component.jms.issues;
import java.io.File;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -31,6 +39,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*/
public class JmsFilenameHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testFileNameOverJMS() throws Exception {
String filename = "jmsfilenameheadertest.txt";
@@ -62,4 +77,15 @@ public class JmsFilenameHeaderTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java
index 54e5a8e73bf..090b7bb0d1e 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueTest.java
@@ -18,15 +18,29 @@ package org.apache.camel.component.jms.issues;
import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsGetHeaderKeyFormatIssueTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final String uri = "activemq:queue:JmsGetHeaderKeyFormatIssueTest?jmsKeyFormatStrategy=default";
@Test
@@ -67,4 +81,16 @@ public class JmsGetHeaderKeyFormatIssueTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java
index 399a5e17c36..c05cf40c1de 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest.java
@@ -16,11 +16,19 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.jms.JmsMessage;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -32,6 +40,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
*/
public class JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private final String uri
= "activemq:queue:JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest?jmsKeyFormatStrategy=default";
@@ -76,4 +90,16 @@ public class JmsGetHeaderKeyFormatIssueWithContentTypeHeaderTest extends Abstrac
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
index 14e25e86f04..0992a5370dc 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsHeaderAsObjectTest.java
@@ -19,13 +19,28 @@ package org.apache.camel.component.jms.issues;
import java.util.HashMap;
import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsHeaderAsObjectTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testSendHeaderAsPrimitiveOnly() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -74,4 +89,16 @@ public class JmsHeaderAsObjectTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java
index 47697ab659e..854edf868b7 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyIssueTest.java
@@ -19,18 +19,33 @@ package org.apache.camel.component.jms.issues;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOnlyIssueTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testInOnlyWithSendBody() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -103,4 +118,15 @@ public class JmsInOnlyIssueTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyParameterTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyParameterTest.java
index 362e3adbfc2..ff86c413bd9 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyParameterTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOnlyParameterTest.java
@@ -16,18 +16,33 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@Timeout(30)
public class JmsInOnlyParameterTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
@@ -80,4 +95,15 @@ public class JmsInOnlyParameterTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicRecipientListTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicRecipientListTest.java
index 0eb949eee6e..5656213ed85 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicRecipientListTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicRecipientListTest.java
@@ -16,15 +16,30 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOutExclusiveTopicRecipientListTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsInOutExclusiveTopicTest() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye Camel");
@@ -72,4 +87,15 @@ public class JmsInOutExclusiveTopicRecipientListTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicTest.java
index fc32c0c1098..01601aa6058 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutExclusiveTopicTest.java
@@ -16,19 +16,32 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.util.StringHelper;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOutExclusiveTopicTest extends AbstractJMSTest {
- @BeforeEach
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
void waitForConnections() {
Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 200);
Awaitility.await().until(() -> context.getRoute("route-2").getUptimeMillis() > 200);
@@ -80,4 +93,17 @@ public class JmsInOutExclusiveTopicTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+
+ waitForConnections();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutIssueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutIssueTest.java
index 10b45785483..0864bcebd71 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutIssueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutIssueTest.java
@@ -18,16 +18,31 @@ package org.apache.camel.component.jms.issues;
import java.util.concurrent.Future;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOutIssueTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testInOutWithRequestBody() {
String reply = template.requestBody("activemq:queue:inJmsInOutIssueTest", "Hello World", String.class);
@@ -81,4 +96,15 @@ public class JmsInOutIssueTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutParallelTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutParallelTest.java
index 144e3f67006..8399f30ecf7 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutParallelTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutParallelTest.java
@@ -16,16 +16,31 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOutParallelTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testInOutParallel() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:received");
@@ -68,4 +83,15 @@ public class JmsInOutParallelTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPersistentReplyQueueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPersistentReplyQueueTest.java
index 6bebf9ddbe5..1c137405697 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPersistentReplyQueueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPersistentReplyQueueTest.java
@@ -16,18 +16,33 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
// Not parallel due to processing some part of the route concurrently (may be delayed when running on the test threads)
@Tags({ @Tag("not-parallel") })
public class JmsInOutPersistentReplyQueueTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testInOutPersistentReplyQueue() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("Bye A", "Bye B", "Bye C", "Bye D");
@@ -66,4 +81,15 @@ public class JmsInOutPersistentReplyQueueTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java
index 07419a390ea..5e9394621d2 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutPipelineWithBeanTest.java
@@ -17,10 +17,18 @@
package org.apache.camel.component.jms.issues;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -29,6 +37,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class JmsInOutPipelineWithBeanTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@BindToRegistry("dummyBean")
private final MyDummyBean bean = new MyDummyBean();
@@ -79,6 +93,18 @@ public class JmsInOutPipelineWithBeanTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
+
public static class MyDummyBean {
public void doSomething(Exchange exchange) {
String body = exchange.getIn().getBody(String.class);
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRepeatedInvocationsTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRepeatedInvocationsTest.java
index 7e28a81b2eb..489bf2a37fb 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRepeatedInvocationsTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRepeatedInvocationsTest.java
@@ -16,16 +16,31 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOutRepeatedInvocationsTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testInOutRepeatSequentialInvocations() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:finished");
@@ -60,4 +75,15 @@ public class JmsInOutRepeatedInvocationsTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
index d74ffd5a90a..73506578075 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
@@ -16,14 +16,29 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class JmsInOutRoutingSlipTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testJmsInOutRoutingSlip() throws Exception {
getMockEndpoint("mock:JmsInOutRoutingSlipTest.foo").expectedBodiesReceived("World");
@@ -63,4 +78,16 @@ public class JmsInOutRoutingSlipTest extends AbstractJMSTest {
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutTransferExchangeInflightRepositoryFlushTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutTransferExchangeInflightRepositoryFlushTest.java
index caa042cef5d..1390eaba961 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutTransferExchangeInflightRepositoryFlushTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutTransferExchangeInflightRepositoryFlushTest.java
@@ -16,18 +16,33 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.jms.SerializableRequestDto;
import org.apache.camel.component.jms.SerializableResponseDto;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class JmsInOutTransferExchangeInflightRepositoryFlushTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Override
protected String getComponentName() {
return "activemq";
@@ -35,7 +50,7 @@ public class JmsInOutTransferExchangeInflightRepositoryFlushTest extends Abstrac
@Test
public void testTransferExchangeInOut() throws Exception {
- assertEquals(0, context().getInflightRepository().size());
+ assertEquals(0, context.getInflightRepository().size());
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedMessageCount(1);
@@ -44,7 +59,7 @@ public class JmsInOutTransferExchangeInflightRepositoryFlushTest extends Abstrac
MockEndpoint.assertIsSatisfied(context);
- assertEquals(0, context().getInflightRepository().size());
+ assertEquals(0, context.getInflightRepository().size());
}
@Override
@@ -65,4 +80,16 @@ public class JmsInOutTransferExchangeInflightRepositoryFlushTest extends Abstrac
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutUseMessageIDasCorrelationIDTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutUseMessageIDasCorrelationIDTest.java
index ab8f5f0e367..4d9532bfdbe 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutUseMessageIDasCorrelationIDTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutUseMessageIDasCorrelationIDTest.java
@@ -16,18 +16,31 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
public class JmsInOutUseMessageIDasCorrelationIDTest extends AbstractJMSTest {
- @BeforeEach
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
void waitForConnections() {
Awaitility.await().until(() -> context.getRoute("route-1").getUptimeMillis() > 100);
}
@@ -70,4 +83,17 @@ public class JmsInOutUseMessageIDasCorrelationIDTest extends AbstractJMSTest {
};
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+
+ waitForConnections();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java
index 3f54584f7e8..ae26c5d05f9 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToConsumerEndpointUsingInOutTest.java
@@ -16,9 +16,17 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -27,6 +35,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
public class JmsJMSReplyToConsumerEndpointUsingInOutTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
+
@Test
public void testCustomJMSReplyToInOut() {
template.sendBody("activemq:queue:JmsJMSReplyToConsumerEndpointUsingInOutTest", "What is your name?");
@@ -52,4 +67,15 @@ public class JmsJMSReplyToConsumerEndpointUsingInOutTest extends AbstractJMSTest
return "activemq";
}
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java
index b6b7fab033e..b7ac8c42897 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java
@@ -23,13 +23,21 @@ import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import jakarta.jms.TextMessage;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.jms.core.JmsTemplate;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -39,6 +47,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*/
@Timeout(30)
public class JmsJMSReplyToEndpointUsingInOutTest extends AbstractJMSTest {
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new DefaultCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
private JmsComponent amq;
@Test
@@ -111,4 +125,16 @@ public class JmsJMSReplyToEndpointUsingInOutTest extends AbstractJMSTest {
return amq;
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsLifecycleIssueTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsLifecycleIssueTest.java
index dbfe1e06e8d..3e05eb49c42 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsLifecycleIssueTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsLifecycleIssueTest.java
@@ -16,12 +16,20 @@
*/
package org.apache.camel.component.jms.issues;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.ProducerTemplate;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.AbstractJMSTest;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.TransientCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.apache.camel.ServiceStatus.Started;
import static org.apache.camel.ServiceStatus.Stopped;
@@ -32,6 +40,12 @@ public class JmsLifecycleIssueTest extends AbstractJMSTest {
public static final String ROUTE_ID = "JmsLifecycleIssueTestRoute";
public static final String ENDPOINT_URI = "activemq:JmsLifecycleIssueTest.processOrder";
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new TransientCamelContextExtension();
+ protected CamelContext context;
+ protected ProducerTemplate template;
+ protected ConsumerTemplate consumer;
@Test
public void routeThatIsStoppedAndThenResumedAcceptsMessage() throws Exception {
@@ -75,16 +89,23 @@ public class JmsLifecycleIssueTest extends AbstractJMSTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
- context.addRoutes(new RouteBuilder() {
- @Override
- public void configure() {
- from(ENDPOINT_URI).routeId(ROUTE_ID).autoStartup(false)
- .to("log:input")
- .to("mock:result");
- }
- });
+ public void configure() {
+ from(ENDPOINT_URI).routeId(ROUTE_ID).autoStartup(false)
+ .to("log:input")
+ .to("mock:result");
}
};
}
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ consumer = camelContextExtension.getConsumerTemplate();
+ }
}
... 1471 lines suppressed ...