You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/07/09 20:01:57 UTC
[camel] 06/19: [CAMEL-11807] Upgrade camel-sjms to junit5
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d1b885c7dec049002ecf4881c45dcc76db3a2488
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Jul 9 09:09:41 2020 +0200
[CAMEL-11807] Upgrade camel-sjms to junit5
---
components/camel-sjms/pom.xml | 2 +-
.../component/sjms/AsyncStartStopListenerTest.java | 2 +-
.../component/sjms/JmsSelectorOptionTest.java | 9 +++--
.../camel/component/sjms/JmsSelectorTest.java | 2 +-
.../component/sjms/ReconnectConsumerTest.java | 2 +-
.../component/sjms/ReconnectInOutProducerTest.java | 7 +++-
.../component/sjms/ReconnectProducerTest.java | 7 +++-
.../component/sjms/SimpleJmsComponentTest.java | 6 ++-
.../component/sjms/SjmsComponentRestartTest.java | 4 +-
.../sjms/SjmsDestinationCreationStrategyTest.java | 6 ++-
.../sjms/SjmsEndpointConnectionSettingsTest.java | 8 +++-
.../sjms/SjmsEndpointNameOverrideTest.java | 8 +++-
.../camel/component/sjms/SjmsEndpointTest.java | 29 ++++++++-----
.../sjms/batch/EmbeddedActiveMQBroker.java | 12 ++++--
.../sjms/batch/SjmsBatchConsumerTest.java | 12 ++++--
.../sjms/batch/SjmsBatchEndpointTest.java | 47 +++++++++-------------
.../component/sjms/bugfixes/CAMEL6820Test.java | 4 +-
.../sjms/consumer/AsyncConsumerFalseTest.java | 4 +-
.../sjms/consumer/AsyncConsumerInOutTest.java | 4 +-
.../sjms/consumer/EmptyMessageBodyTest.java | 2 +-
.../consumer/InOnlyConsumerAsyncFalseTest.java | 4 +-
.../sjms/consumer/InOnlyConsumerAsyncTrueTest.java | 2 +-
.../sjms/consumer/InOnlyConsumerDefaultTest.java | 2 +-
.../InOnlyConsumerQueueSynchronousTest.java | 2 +-
.../sjms/consumer/InOnlyConsumerQueueTest.java | 2 +-
.../sjms/consumer/InOnlyConsumerTempQueueTest.java | 2 +-
.../sjms/consumer/InOnlyConsumerTopicTest.java | 2 +-
.../sjms/consumer/InOnlyQueueConsumerTest.java | 4 +-
.../sjms/consumer/InOnlyTopicConsumerTest.java | 4 +-
.../consumer/InOnlyTopicDurableConsumerTest.java | 6 +--
.../sjms/consumer/InOutConcurrentConsumerTest.java | 5 ++-
.../sjms/consumer/InOutConsumerQueueAsyncTest.java | 2 +-
.../sjms/consumer/InOutConsumerQueueTest.java | 2 +-
.../consumer/InOutConsumerTempQueueAsyncTest.java | 2 +-
.../sjms/consumer/InOutConsumerTempQueueTest.java | 2 +-
.../sjms/consumer/InOutConsumerTopicTest.java | 2 +-
.../consumer/InOutSynchronousConsumerTest.java | 7 +++-
.../camel/component/sjms/it/AsyncJmsInOutIT.java | 4 +-
.../component/sjms/it/AsyncJmsInOutTempDestIT.java | 4 +-
.../component/sjms/it/ConnectionResourceIT.java | 7 +++-
.../camel/component/sjms/it/SyncJmsInOutIT.java | 4 +-
.../component/sjms/it/SyncJmsInOutTempDestIT.java | 4 +-
.../sjms/jms/ConnectionFactoryResourceTest.java | 25 +++++++-----
.../DefaultDestinationCreationStrategyTest.java | 5 ++-
.../sjms/jms/DestinationNameParserTest.java | 23 ++++++-----
.../sjms/manual/ManualBatchFromQueueTest.java | 12 ++++--
.../component/sjms/manual/ManualFromQueueTest.java | 12 ++++--
.../sjms/producer/AsyncQueueProducerTest.java | 13 +++---
.../sjms/producer/AsyncTopicProducerTest.java | 13 +++---
.../sjms/producer/InOnlyQueueProducerTest.java | 7 +++-
.../sjms/producer/InOnlyTopicProducerTest.java | 7 +++-
.../producer/InOutQueueProducerAsyncLoadTest.java | 16 +++++---
.../producer/InOutQueueProducerSyncLoadTest.java | 16 +++++---
.../sjms/producer/InOutQueueProducerTest.java | 9 ++++-
.../sjms/producer/InOutTempQueueProducerTest.java | 7 +++-
.../sjms/producer/NoConnectionFactoryTest.java | 26 ++++++------
.../component/sjms/producer/PrefillPoolTest.java | 2 +-
.../sjms/producer/QueueProducerQoSTest.java | 19 +++++----
.../component/sjms/producer/QueueProducerTest.java | 7 +++-
.../component/sjms/support/JmsTestSupport.java | 15 +++++--
.../sjms/support/SjmsConnectionTestSupport.java | 16 ++++----
.../component/sjms/threadpool/ThreadPoolTest.java | 8 ++--
...chTransactedConcurrentMultipleConsumerTest.java | 2 +-
...sactedConcurrentMultipleRouteConsumersTest.java | 2 +-
.../sjms/tx/BatchTransactedQueueConsumerTest.java | 2 +-
...chTransactedTopicConsumerMultipleRouteTest.java | 2 +-
.../sjms/tx/BatchTransactedTopicConsumerTest.java | 2 +-
.../sjms/tx/TransactedAsyncExceptionTest.java | 8 +++-
.../sjms/tx/TransactedConcurrentConsumersTest.java | 2 +-
.../sjms/tx/TransactedConsumerSupport.java | 8 +++-
.../tx/TransactedConsumersMultipleRouteTest.java | 2 +-
.../sjms/tx/TransactedProducerInOutErrorTest.java | 20 +++++----
.../sjms/tx/TransactedQueueConsumerTest.java | 2 +-
.../sjms/tx/TransactedQueueProducerTest.java | 10 +++--
.../sjms/tx/TransactedTopicConsumerTest.java | 2 +-
.../sjms/tx/TransactedTopicProducerTest.java | 10 +++--
76 files changed, 357 insertions(+), 227 deletions(-)
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index df8e378..81e48a6 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-test-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java
index 49ace8d..7463c10 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/AsyncStartStopListenerTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Testing with async start listener
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorOptionTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorOptionTest.java
index 9061534..f8290c4 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorOptionTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorOptionTest.java
@@ -21,7 +21,10 @@ import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JmsSelectorOptionTest extends JmsTestSupport {
@@ -61,8 +64,8 @@ public class JmsSelectorOptionTest extends JmsTestSupport {
if (ex != null) {
Message message = ex.getIn();
int size = message.getHeader("SIZE_NUMBER", int.class);
- assertTrue("The message header SIZE_NUMBER should be less than 1500", size < 1500);
- assertEquals("The message body is wrong", "Message3", message.getBody());
+ assertTrue(size < 1500, "The message header SIZE_NUMBER should be less than 1500");
+ assertEquals("Message3", message.getBody(), "The message body is wrong");
} else {
break;
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java
index 0cd40bd..d390cbc 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/JmsSelectorTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JmsSelectorTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectConsumerTest.java
index e5e4276..4e4e4e5 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectConsumerTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class ReconnectConsumerTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
index 02bb561..2598e74 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectInOutProducerTest.java
@@ -26,7 +26,12 @@ import javax.jms.TextMessage;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class ReconnectInOutProducerTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java
index b88a73d..8d50086 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/ReconnectProducerTest.java
@@ -24,7 +24,10 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ReconnectProducerTest extends JmsTestSupport {
@@ -77,7 +80,7 @@ public class ReconnectProducerTest extends JmsTestSupport {
/**
* @return
* @throws Exception
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*/
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java
index 68a94b9..698c465 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SimpleJmsComponentTest.java
@@ -18,8 +18,10 @@ package org.apache.camel.component.sjms;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class SimpleJmsComponentTest extends CamelTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
index 72dd4ec..45c4302 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsComponentRestartTest.java
@@ -21,8 +21,8 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class SjmsComponentRestartTest extends CamelTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
index 0a7efc2..4abcfc5 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsDestinationCreationStrategyTest.java
@@ -27,7 +27,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.jms.DefaultDestinationCreationStrategy;
import org.apache.camel.component.sjms.support.JmsTestSupport;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SjmsDestinationCreationStrategyTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
index d47c163..6a6c052 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointConnectionSettingsTest.java
@@ -25,8 +25,12 @@ import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
import org.apache.camel.component.sjms.jms.ConnectionResource;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SjmsEndpointConnectionSettingsTest extends CamelTestSupport {
private final ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
index 7e30a16..dc5b5cf 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointNameOverrideTest.java
@@ -20,8 +20,12 @@ import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SjmsEndpointNameOverrideTest extends CamelTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
index ef67bfe..70b72a4 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/SjmsEndpointTest.java
@@ -21,8 +21,15 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ResolveEndpointFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class SjmsEndpointTest extends CamelTestSupport {
@@ -120,9 +127,10 @@ public class SjmsEndpointTest extends CamelTestSupport {
}
}
- @Test(expected = ResolveEndpointFailedException.class)
+ @Test
public void testUnsupportedMessageExchangePattern() throws Exception {
- context.getEndpoint("sjms:queue:test2?messageExchangePattern=OutOnly");
+ assertThrows(ResolveEndpointFailedException.class,
+ () -> context.getEndpoint("sjms:queue:test2?messageExchangePattern=OutOnly"));
}
@Test
@@ -136,9 +144,10 @@ public class SjmsEndpointTest extends CamelTestSupport {
assertEquals(qe.createExchange().getPattern(), ExchangePattern.InOut);
}
- @Test(expected = Exception.class)
+ @Test
public void testNamedReplyToAndMEPMismatch() throws Exception {
- context.getEndpoint("sjms:queue:test?namedReplyTo=reply.to.queue&exchangePattern=" + ExchangePattern.InOnly);
+ assertThrows(Exception.class,
+ () -> context.getEndpoint("sjms:queue:test?namedReplyTo=reply.to.queue&exchangePattern=" + ExchangePattern.InOnly));
}
@Test
@@ -156,7 +165,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint)endpoint;
- assertTrue(qe.getTransactionBatchCount() == -1);
+ assertEquals(-1, qe.getTransactionBatchCount());
}
@Test
@@ -165,7 +174,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint)endpoint;
- assertTrue(qe.getTransactionBatchCount() == 10);
+ assertEquals(10, qe.getTransactionBatchCount());
}
@Test
@@ -174,7 +183,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint)endpoint;
- assertTrue(qe.getTransactionBatchTimeout() == 5000);
+ assertEquals(5000, qe.getTransactionBatchTimeout());
}
@Test
@@ -183,7 +192,7 @@ public class SjmsEndpointTest extends CamelTestSupport {
assertNotNull(endpoint);
assertTrue(endpoint instanceof SjmsEndpoint);
SjmsEndpoint qe = (SjmsEndpoint)endpoint;
- assertTrue(qe.getTransactionBatchTimeout() == 3000);
+ assertEquals(3000, qe.getTransactionBatchTimeout());
}
@Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java
index 9f19f27..b3512e2 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/EmbeddedActiveMQBroker.java
@@ -19,14 +19,18 @@ package org.apache.camel.component.sjms.batch;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.camel.test.AvailablePortFinder;
-import org.junit.rules.ExternalResource;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* JUnit Test aspect that creates an embedded ActiveMQ broker at the beginning of each test and shuts it down after.
*/
-public class EmbeddedActiveMQBroker extends ExternalResource {
+public class EmbeddedActiveMQBroker implements BeforeEachCallback, AfterEachCallback {
private final Logger log = LoggerFactory.getLogger(EmbeddedActiveMQBroker.class);
private final String brokerId;
@@ -53,13 +57,13 @@ public class EmbeddedActiveMQBroker extends ExternalResource {
}
@Override
- protected void before() throws Throwable {
+ public void beforeEach(ExtensionContext context) throws Exception {
log.info("Starting embedded broker[{}] on {}", brokerId, tcpConnectorUri);
brokerService.start();
}
@Override
- protected void after() {
+ public void afterEach(ExtensionContext context) throws Exception {
try {
log.info("Stopping embedded broker[{}]", brokerId);
brokerService.stop();
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java
index a2df865..e744586 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumerTest.java
@@ -34,17 +34,21 @@ import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.component.sjms.support.MockConnectionFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.StopWatch;
-import org.junit.Rule;
-import org.junit.Test;
+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;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class SjmsBatchConsumerTest extends CamelTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(SjmsBatchConsumerTest.class);
- @Rule
+ @RegisterExtension
public EmbeddedActiveMQBroker broker = new EmbeddedActiveMQBroker("localhost");
@Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java
index a1fba4e..fc60195 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java
@@ -25,32 +25,19 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class SjmsBatchEndpointTest extends CamelTestSupport {
// Create one embedded broker instance for the entire test, as we aren't actually
// going to send any messages to it; we just need it so that the ConnectionFactory
// has something local to connect to.
- public static EmbeddedActiveMQBroker broker;
-
- @BeforeClass
- public static void setupBroker() {
- broker = new EmbeddedActiveMQBroker("localhost");
- try {
- broker.before();
- } catch (Throwable t) {
- throw new RuntimeException(t);
- }
- }
-
- @AfterClass
- public static void shutDownBroker() {
- broker.after();
- }
+ @RegisterExtension
+ public static EmbeddedActiveMQBroker broker = new EmbeddedActiveMQBroker("localhost");
@Override
protected CamelContext createCamelContext() throws Exception {
@@ -78,17 +65,18 @@ public class SjmsBatchEndpointTest extends CamelTestSupport {
return true;
}
- @Test(expected = FailedToCreateRouteException.class)
+ @Test
public void testProducerFailure() throws Exception {
context.addRoutes(new RouteBuilder() {
public void configure() throws Exception {
from("direct:in").to("sjms-batch:testQueue?aggregationStrategy=#unknown");
}
});
- context.start();
+ assertThrows(FailedToCreateRouteException.class,
+ () -> context.start());
}
- @Test(expected = FailedToStartRouteException.class)
+ @Test
public void testConsumerNegativePollDuration() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
@@ -97,10 +85,11 @@ public class SjmsBatchEndpointTest extends CamelTestSupport {
.to("mock:out");
}
});
- context.start();
+ assertThrows(FailedToStartRouteException.class,
+ () -> context.start());
}
- @Test(expected = FailedToStartRouteException.class)
+ @Test
public void testConsumerNegativeConsumerCount() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
@@ -109,10 +98,11 @@ public class SjmsBatchEndpointTest extends CamelTestSupport {
.to("mock:out");
}
});
- context.start();
+ assertThrows(FailedToStartRouteException.class,
+ () -> context.start());
}
- @Test(expected = FailedToCreateRouteException.class)
+ @Test
public void testConsumerTopic() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
@@ -121,6 +111,7 @@ public class SjmsBatchEndpointTest extends CamelTestSupport {
.to("mock:out");
}
});
- context.start();
+ assertThrows(FailedToCreateRouteException.class,
+ () -> context.start());
}
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL6820Test.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL6820Test.java
index d1ecbe8..876b55a 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL6820Test.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/bugfixes/CAMEL6820Test.java
@@ -24,7 +24,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.component.sjms.support.JmsTestSupport;
import org.apache.commons.io.FileUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Unit test for CAMEL_6820Test. This test is to verify the ability to
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
index d7e6b5b..8dc9951 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerFalseTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.component.sjms.support.MyAsyncComponent;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
index 1d31ed9..19b81f4 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/AsyncConsumerInOutTest.java
@@ -21,8 +21,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.component.sjms.support.MyAsyncComponent;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/EmptyMessageBodyTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/EmptyMessageBodyTest.java
index fc889d1..74fa8a7 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/EmptyMessageBodyTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/EmptyMessageBodyTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.sjms.consumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class EmptyMessageBodyTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncFalseTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncFalseTest.java
index a6dff07..b51e24c 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncFalseTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncFalseTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
*
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java
index 2c98f05..cc88181 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerAsyncTrueTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerDefaultTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerDefaultTest.java
index dc0926e..02685e8 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerDefaultTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerDefaultTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms.consumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOnlyConsumerDefaultTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
index c8071ed..91f02ac 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms.consumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOnlyConsumerQueueSynchronousTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueTest.java
index 807cfc5..ca13884 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms.consumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOnlyConsumerQueueTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTempQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTempQueueTest.java
index ff30e20..0911f17 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTempQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTempQueueTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms.consumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOnlyConsumerTempQueueTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTopicTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTopicTest.java
index fdb275c..834d138 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTopicTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerTopicTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOnlyConsumerTopicTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java
index 19023dd..b0c2d6f 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyQueueConsumerTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms.consumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOnlyQueueConsumerTest extends JmsTestSupport {
@@ -45,7 +45,7 @@ public class InOnlyQueueConsumerTest extends JmsTestSupport {
}
/**
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java
index 8d0ae2e..a07cfb2 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicConsumerTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms.consumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOnlyTopicConsumerTest extends JmsTestSupport {
@@ -45,7 +45,7 @@ public class InOnlyTopicConsumerTest extends JmsTestSupport {
}
/**
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
index 0c3fa8b..17f2da5 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyTopicDurableConsumerTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
@@ -53,7 +53,7 @@ public class InOnlyTopicDurableConsumerTest extends CamelTestSupport {
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createCamelContext()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
index 4b04641..d6e5b93 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConcurrentConsumerTest.java
@@ -27,7 +27,10 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Concurrent consumer with JMSReply test.
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
index 43bd632..a3adbeb 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueAsyncTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOutConsumerQueueAsyncTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
index 0537bb7..361feb9 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerQueueTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOutConsumerQueueTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
index 6652c90..ab058a3 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueAsyncTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOutConsumerTempQueueAsyncTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java
index d3bfe22..c4eb3ec 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTempQueueTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOutConsumerTempQueueTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java
index 3f4545e..d20bc53 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutConsumerTopicTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class InOutConsumerTopicTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
index ccf1f45..2737a62 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOutSynchronousConsumerTest.java
@@ -18,7 +18,10 @@ package org.apache.camel.component.sjms.consumer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InOutSynchronousConsumerTest extends JmsTestSupport {
@@ -31,7 +34,7 @@ public class InOutSynchronousConsumerTest extends JmsTestSupport {
String reply = template.requestBody("direct:start", "Hello World", String.class);
assertEquals("Bye World", reply);
- assertTrue("Should use same threads", beforeThreadName.equalsIgnoreCase(afterThreadName));
+ assertTrue(beforeThreadName.equalsIgnoreCase(afterThreadName), "Should use same threads");
}
@Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
index 37f4a85..f176b02 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
@@ -22,7 +22,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
/**
* Integration test that verifies the ability of SJMS to correctly process
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
index 10091fa..eb1317d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
@@ -22,7 +22,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
/**
* Integration test that verifies the ability of SJMS to correctly process
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
index 1558adb..3a0bc86 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/ConnectionResourceIT.java
@@ -30,7 +30,10 @@ import org.apache.camel.component.sjms.jms.ConnectionResource;
import org.apache.camel.component.sjms.support.JmsTestSupport;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Integration test that verifies we can replace the internal
@@ -76,7 +79,7 @@ public class ConnectionResourceIT extends JmsTestSupport {
}
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createCamelContext()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
* @return
* @throws Exception
*/
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
index 0edbd2d..c8b280d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
@@ -22,7 +22,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
/**
* Integration test that verifies the ability of SJMS to correctly process
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
index 0cf618f..36e76bc 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
@@ -22,7 +22,9 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
import org.apache.camel.util.StopWatch;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.body;
/**
* Integration test that verifies the ability of SJMS to correctly process
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
index b7f7127..b303027 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/ConnectionFactoryResourceTest.java
@@ -20,23 +20,25 @@ import java.util.NoSuchElementException;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConnectionFactoryResourceTest {
private ActiveMQConnectionFactory connectionFactory;
- @Before
+ @BeforeEach
public void setup() {
connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=false");
}
- @After
+ @AfterEach
public void teardown() {
connectionFactory = null;
}
@@ -61,10 +63,10 @@ public class ConnectionFactoryResourceTest {
assertNotNull(connection);
assertTrue(connection.isStarted());
pool.drainPool();
- assertTrue(pool.size() == 0);
+ assertEquals(0, pool.size());
}
- @Test(expected = NoSuchElementException.class)
+ @Test
public void testBorrowObject() throws Exception {
ConnectionFactoryResource pool = new ConnectionFactoryResource(1, connectionFactory);
pool.fillPool();
@@ -72,7 +74,8 @@ public class ConnectionFactoryResourceTest {
ActiveMQConnection connection = (ActiveMQConnection) pool.borrowConnection();
assertNotNull(connection);
assertTrue(connection.isStarted());
- pool.borrowConnection();
+ assertThrows(NoSuchElementException.class,
+ pool::borrowConnection);
}
@Test
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategyTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategyTest.java
index 72825f2..1c90f01 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategyTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DefaultDestinationCreationStrategyTest.java
@@ -22,7 +22,10 @@ import javax.jms.TemporaryTopic;
import javax.jms.Topic;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class DefaultDestinationCreationStrategyTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java
index abf8ccb..a238b71 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/jms/DestinationNameParserTest.java
@@ -16,11 +16,12 @@
*/
package org.apache.camel.component.sjms.jms;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author jkorab
@@ -35,24 +36,26 @@ public class DestinationNameParserTest {
assertFalse(parser.isTopic("bar"));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testIsTopicNullDestinationName() throws Exception {
DestinationNameParser parser = new DestinationNameParser();
- parser.isTopic(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> parser.isTopic(null));
}
@Test
public void testGetShortName() throws Exception {
DestinationNameParser parser = new DestinationNameParser();
assertEquals("foo", parser.getShortName("topic:foo"));
- assertFalse("bar", parser.isTopic("queue:bar"));
- assertFalse("bar", parser.isTopic("bar"));
+ assertFalse(parser.isTopic("queue:bar"), "bar");
+ assertFalse(parser.isTopic("bar"), "bar");
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testGetShortNameNullDestinationName() throws Exception {
DestinationNameParser parser = new DestinationNameParser();
- parser.getShortName(null);
+ assertThrows(IllegalArgumentException.class,
+ () -> parser.getShortName(null));
}
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualBatchFromQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualBatchFromQueueTest.java
index 8e93b11..7f07be2 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualBatchFromQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualBatchFromQueueTest.java
@@ -26,13 +26,17 @@ import org.apache.camel.component.sjms.batch.ListAggregationStrategy;
import org.apache.camel.component.sjms.batch.SjmsBatchComponent;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-@Ignore("Manual test")
+@Disabled("Manual test")
public class ManualBatchFromQueueTest extends CamelTestSupport {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
// using failover will automatic re-connect with ActiveMQ
// private String url = "failover:tcp://localhost:61616";
private String url = "tcp://localhost:61616";
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueTest.java
index a038ab0..14a3e0d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/manual/ManualFromQueueTest.java
@@ -23,13 +23,17 @@ import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-@Ignore("Manual test")
+@Disabled("Manual test")
public class ManualFromQueueTest extends CamelTestSupport {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
// using failover will automatic re-connect with ActiveMQ
// private String url = "failover:tcp://localhost:61616";
private String url = "tcp://localhost:61616";
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java
index 3033f7c..5d72413 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncQueueProducerTest.java
@@ -23,8 +23,11 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.component.sjms.support.MyAsyncComponent;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class AsyncQueueProducerTest extends CamelTestSupport {
@@ -45,9 +48,9 @@ public class AsyncQueueProducerTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
- assertFalse("Should use different threads", beforeThreadName.equalsIgnoreCase(afterThreadName));
- assertFalse("Should use different threads", beforeThreadName.equalsIgnoreCase(sedaThreadName));
- assertFalse("Should use different threads", afterThreadName.equalsIgnoreCase(sedaThreadName));
+ assertFalse(beforeThreadName.equalsIgnoreCase(afterThreadName), "Should use different threads");
+ assertFalse(beforeThreadName.equalsIgnoreCase(sedaThreadName), "Should use different threads");
+ assertFalse(afterThreadName.equalsIgnoreCase(sedaThreadName), "Should use different threads");
assertEquals("AB", route);
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java
index b6ad08c..19f3d24 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/AsyncTopicProducerTest.java
@@ -23,8 +23,11 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.component.sjms.support.MyAsyncComponent;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class AsyncTopicProducerTest extends CamelTestSupport {
@@ -45,9 +48,9 @@ public class AsyncTopicProducerTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
- assertFalse("Should use different threads", beforeThreadName.equalsIgnoreCase(afterThreadName));
- assertFalse("Should use different threads", beforeThreadName.equalsIgnoreCase(sedaThreadName));
- assertFalse("Should use different threads", afterThreadName.equalsIgnoreCase(sedaThreadName));
+ assertFalse(beforeThreadName.equalsIgnoreCase(afterThreadName), "Should use different threads");
+ assertFalse(beforeThreadName.equalsIgnoreCase(sedaThreadName), "Should use different threads");
+ assertFalse(afterThreadName.equalsIgnoreCase(sedaThreadName), "Should use different threads");
assertEquals("AB", route);
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyQueueProducerTest.java
index b16f718..ed30d43 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyQueueProducerTest.java
@@ -23,7 +23,10 @@ import javax.jms.TextMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InOnlyQueueProducerTest extends JmsTestSupport {
@@ -64,7 +67,7 @@ public class InOnlyQueueProducerTest extends JmsTestSupport {
}
/**
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java
index 9aa8afc..29c4534 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOnlyTopicProducerTest.java
@@ -23,7 +23,10 @@ import javax.jms.TextMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InOnlyTopicProducerTest extends JmsTestSupport {
@@ -64,7 +67,7 @@ public class InOnlyTopicProducerTest extends JmsTestSupport {
}
/**
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
index 3c10843..3c699f1 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerAsyncLoadTest.java
@@ -28,9 +28,13 @@ import javax.jms.TextMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class InOutQueueProducerAsyncLoadTest extends JmsTestSupport {
@@ -47,7 +51,7 @@ public class InOutQueueProducerAsyncLoadTest extends JmsTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
mc1 = createQueueConsumer(TEST_DESTINATION_NAME + ".request");
@@ -57,7 +61,7 @@ public class InOutQueueProducerAsyncLoadTest extends JmsTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
MyMessageListener l1 = (MyMessageListener)mc1.getMessageListener();
l1.close();
@@ -108,7 +112,7 @@ public class InOutQueueProducerAsyncLoadTest extends JmsTestSupport {
}
/**
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
*
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
index da5df51..fa03468 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerSyncLoadTest.java
@@ -28,9 +28,13 @@ import javax.jms.TextMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
@@ -47,7 +51,7 @@ public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
}
@Override
- @Before
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
mc1 = createQueueConsumer(TEST_DESTINATION_NAME + ".request");
@@ -57,7 +61,7 @@ public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
}
@Override
- @After
+ @AfterEach
public void tearDown() throws Exception {
MyMessageListener l1 = (MyMessageListener)mc1.getMessageListener();
l1.close();
@@ -108,7 +112,7 @@ public class InOutQueueProducerSyncLoadTest extends JmsTestSupport {
}
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
*
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
index ed23076..4b12dac 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutQueueProducerTest.java
@@ -28,7 +28,12 @@ import javax.jms.TextMessage;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class InOutQueueProducerTest extends JmsTestSupport {
@@ -78,7 +83,7 @@ public class InOutQueueProducerTest extends JmsTestSupport {
}
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
*
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java
index e01f870..3bbdb88 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/InOutTempQueueProducerTest.java
@@ -27,7 +27,12 @@ import javax.jms.TextMessage;
import org.apache.camel.Exchange;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class InOutTempQueueProducerTest extends JmsTestSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java
index ce291ac..3a31c78 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/NoConnectionFactoryTest.java
@@ -20,11 +20,13 @@ import org.apache.camel.CamelContext;
import org.apache.camel.FailedToStartRouteException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* A unit test to ensure getting a meaningful error message
* when neither of ConnectionResource nor ConnectionFactory is configured.
@@ -40,11 +42,11 @@ public class NoConnectionFactoryTest {
try {
context.start();
} catch (Throwable t) {
- Assert.assertEquals(IllegalArgumentException.class, t.getClass());
+ assertEquals(IllegalArgumentException.class, t.getClass());
LOG.info("Expected exception was thrown", t);
return;
}
- Assert.fail("No exception was thrown");
+ fail("No exception was thrown");
}
@Test
@@ -54,11 +56,11 @@ public class NoConnectionFactoryTest {
try {
context.start();
} catch (Throwable t) {
- Assert.assertEquals(IllegalArgumentException.class, t.getClass());
+ assertEquals(IllegalArgumentException.class, t.getClass());
LOG.info("Expected exception was thrown", t);
return;
}
- Assert.fail("No exception was thrown");
+ fail("No exception was thrown");
}
@Test
@@ -68,12 +70,12 @@ public class NoConnectionFactoryTest {
try {
context.start();
} catch (Throwable t) {
- Assert.assertEquals(FailedToStartRouteException.class, t.getClass());
- Assert.assertEquals(IllegalArgumentException.class, t.getCause().getCause().getClass());
+ assertEquals(FailedToStartRouteException.class, t.getClass());
+ assertEquals(IllegalArgumentException.class, t.getCause().getCause().getClass());
LOG.info("Expected exception was thrown", t);
return;
}
- Assert.fail("No exception was thrown");
+ fail("No exception was thrown");
}
@Test
@@ -83,12 +85,12 @@ public class NoConnectionFactoryTest {
try {
context.start();
} catch (Throwable t) {
- Assert.assertEquals(FailedToStartRouteException.class, t.getClass());
- Assert.assertEquals(IllegalArgumentException.class, t.getCause().getCause().getClass());
+ assertEquals(FailedToStartRouteException.class, t.getClass());
+ assertEquals(IllegalArgumentException.class, t.getCause().getCause().getClass());
LOG.info("Expected exception was thrown", t);
return;
}
- Assert.fail("No exception was thrown");
+ fail("No exception was thrown");
}
protected RouteBuilder createConsumerInOnlyRouteBuilder() throws Exception {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/PrefillPoolTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/PrefillPoolTest.java
index 9ff722f..fd05075 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/PrefillPoolTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/PrefillPoolTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.sjms.producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test Producer prefillPool parameter
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java
index 2c7f824..e3da020 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java
@@ -25,8 +25,11 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
public class QueueProducerQoSTest extends JmsTestSupport {
@@ -41,7 +44,7 @@ public class QueueProducerQoSTest extends JmsTestSupport {
@Test
public void testInOutQueueProducerTTL() throws Exception {
- Assume.assumeFalse(externalAmq);
+ assumeFalse(externalAmq);
mockExpiredAdvisory.expectedMessageCount(1);
String endpoint = String.format("sjms:queue:%s?ttl=1000&exchangePattern=InOut&responseTimeOut=500", TEST_INOUT_DESTINATION_NAME);
@@ -58,13 +61,13 @@ public class QueueProducerQoSTest extends JmsTestSupport {
assertMockEndpointsSatisfied();
DestinationViewMBean queue = getQueueMBean(TEST_INOUT_DESTINATION_NAME);
- assertEquals("There were unexpected messages left in the queue: " + TEST_INOUT_DESTINATION_NAME,
- 0, queue.getQueueSize());
+ assertEquals(0, queue.getQueueSize(),
+ "There were unexpected messages left in the queue: " + TEST_INOUT_DESTINATION_NAME);
}
@Test
public void testInOnlyQueueProducerTTL() throws Exception {
- Assume.assumeFalse(externalAmq);
+ assumeFalse(externalAmq);
mockExpiredAdvisory.expectedMessageCount(1);
String endpoint = String.format("sjms:queue:%s?ttl=1000", TEST_INONLY_DESTINATION_NAME);
@@ -73,8 +76,8 @@ public class QueueProducerQoSTest extends JmsTestSupport {
assertMockEndpointsSatisfied();
DestinationViewMBean queue = getQueueMBean(TEST_INONLY_DESTINATION_NAME);
- assertEquals("There were unexpected messages left in the queue: " + TEST_INONLY_DESTINATION_NAME,
- 0, queue.getQueueSize());
+ assertEquals(0, queue.getQueueSize(),
+ "There were unexpected messages left in the queue: " + TEST_INONLY_DESTINATION_NAME);
}
@Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java
index 13cbff7..8591d61 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerTest.java
@@ -23,7 +23,10 @@ import javax.jms.TextMessage;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class QueueProducerTest extends JmsTestSupport {
@@ -64,7 +67,7 @@ public class QueueProducerTest extends JmsTestSupport {
}
/**
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
*
* @return
* @throws Exception
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
index eb35ab4..a5907cd 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
@@ -38,7 +38,13 @@ import org.apache.camel.component.sjms.jms.DestinationCreationStrategy;
import org.apache.camel.component.sjms.jms.Jms11ObjectFactory;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.TestInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
/**
* A support class that builds up and tears down an ActiveMQ instance to be used
@@ -46,6 +52,8 @@ import org.apache.camel.test.junit4.CamelTestSupport;
*/
public class JmsTestSupport extends CamelTestSupport {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
@Produce
protected ProducerTemplate template;
protected String brokerUri;
@@ -60,7 +68,7 @@ public class JmsTestSupport extends CamelTestSupport {
/**
* Set up the Broker
*
- * @see org.apache.camel.test.junit4.CamelTestSupport#doPreSetup()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#doPreSetup()
*
* @throws Exception
*/
@@ -112,6 +120,7 @@ public class JmsTestSupport extends CamelTestSupport {
}
@Override
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
DefaultCamelContext dcc = (DefaultCamelContext)context;
@@ -136,7 +145,7 @@ public class JmsTestSupport extends CamelTestSupport {
}
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createCamelContext()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
* @return
* @throws Exception
*/
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/SjmsConnectionTestSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/SjmsConnectionTestSupport.java
index 08c68aa..4ca9cbd 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/SjmsConnectionTestSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/SjmsConnectionTestSupport.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.sjms.support;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.camel.util.ObjectHelper;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,15 +42,15 @@ public abstract class SjmsConnectionTestSupport {
public abstract String getConnectionUri();
- @BeforeClass
+ @BeforeAll
public static void setUpBeforeClass() throws Exception {
}
- @AfterClass
+ @AfterAll
public static void tearDownAfterClass() throws Exception {
}
- @Before
+ @BeforeEach
public void setup() throws Exception {
if (ObjectHelper.isEmpty(getConnectionUri())
|| getConnectionUri().startsWith("vm")) {
@@ -61,7 +61,7 @@ public abstract class SjmsConnectionTestSupport {
}
}
- @After
+ @AfterEach
public void teardown() throws Exception {
if (vmTestConnectionFactory != null) {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java
index 8ef3248..cd5b128 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/threadpool/ThreadPoolTest.java
@@ -26,16 +26,18 @@ import javax.management.ObjectName;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.support.JmsTestSupport;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Unit test for CAMEL-7715.
*
*/
-@Ignore("TODO: investigate for Camel 3.0")
+@Disabled("TODO: investigate for Camel 3.0")
public class ThreadPoolTest extends JmsTestSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(ThreadPoolTest.class);
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
index d826df3..43ded25 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Verify the ability to batch transactions to the consumer.
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
index f91db16..8153b77 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Verify that batch transactions are processed correctly when dealing with
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
index 0a37d7a..ce6a885 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedQueueConsumerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Verify the ability to batch transactions to the consumer.
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
index 5d9b43e..fb355ad 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerMultipleRouteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Verify the ability to batch transactions to the consumer.
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
index f291e4a..79abc91 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedTopicConsumerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Verify the ability to batch transactions to the consumer.
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java
index 7be8f1a..12eca69 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedAsyncExceptionTest.java
@@ -29,8 +29,10 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TransactedAsyncExceptionTest extends CamelTestSupport {
@@ -38,6 +40,8 @@ public class TransactedAsyncExceptionTest extends CamelTestSupport {
private static final int TRANSACTION_REDELIVERY_COUNT = 10;
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
@Test
public void testRouteWithThread() throws Exception {
String destination = "sjms:queue:async.exception";
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
index 8ca09b4..be5efec 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test to verify concurrent consumers on a transacted endpoint.
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
index 59caa47..b35c42e 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java
@@ -26,10 +26,14 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class TransactedConsumerSupport extends CamelTestSupport {
-
+
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
public abstract String getBrokerUri();
protected void runTest(String destinationName, int routeCount, int messageCount, int totalRedeliverdFalse, int totalRedeliveredTrue, int batchCount, int consumerCount, int maxAttemptsCount)
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
index e84046a..750cf44 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumersMultipleRouteTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test to verify concurrent consumers on a transacted endpoint.
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
index 4caf0f5..0528d14 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedProducerInOutErrorTest.java
@@ -18,15 +18,18 @@ package org.apache.camel.component.sjms.tx;
import org.apache.camel.CamelContext;
import org.apache.camel.FailedToStartRouteException;
+import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.sjms.CamelJmsTestHelper;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
/**
* A unit test to ensure the error is raised against incompatible configuration, InOut + transacted.
*/
@@ -34,20 +37,15 @@ public class TransactedProducerInOutErrorTest {
private static final Logger LOG = LoggerFactory.getLogger(TransactedProducerInOutErrorTest.class);
- @Test(expected = FailedToStartRouteException.class)
+ @Test
public void test() throws Exception {
CamelContext context = new DefaultCamelContext();
context.addRoutes(createRouteBuilder());
SjmsComponent component = context.getComponent("sjms", SjmsComponent.class);
component.setConnectionFactory(CamelJmsTestHelper.createConnectionFactory());
- try {
- context.start();
- } catch (Throwable t) {
- Assert.assertEquals(FailedToStartRouteException.class, t.getClass());
- Assert.assertEquals(IllegalArgumentException.class, t.getCause().getCause().getClass());
- LOG.info("Exception was thrown as expected", t);
- throw t;
- }
+ FailedToStartRouteException t = assertThrows(FailedToStartRouteException.class, context::start);
+ assertEquals(IllegalArgumentException.class, t.getCause().getCause().getClass());
+ LOG.info("Exception was thrown as expected", t);
}
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
index 3608ab6..f97f680 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueConsumerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TransactedQueueConsumerTest extends TransactedConsumerSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
index a41f689..9cd06ea 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedQueueProducerTest.java
@@ -26,8 +26,10 @@ import org.apache.camel.RollbackExchangeException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.SjmsComponent;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
public class TransactedQueueProducerTest extends CamelTestSupport {
@@ -61,7 +63,7 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createCamelContext()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
* @return
* @throws Exception
*/
@@ -76,7 +78,7 @@ public class TransactedQueueProducerTest extends CamelTestSupport {
}
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
* @return
* @throws Exception
*/
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
index e9bd05e..6a2923d 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicConsumerTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TransactedTopicConsumerTest extends TransactedConsumerSupport {
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
index 2a9934e..d40625b 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedTopicProducerTest.java
@@ -27,8 +27,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.sjms.SjmsComponent;
import org.apache.camel.component.sjms.jms.ConnectionFactoryResource;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
public class TransactedTopicProducerTest extends CamelTestSupport {
@@ -62,7 +64,7 @@ public class TransactedTopicProducerTest extends CamelTestSupport {
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createCamelContext()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createCamelContext()
* @return
* @throws Exception
*/
@@ -81,7 +83,7 @@ public class TransactedTopicProducerTest extends CamelTestSupport {
}
/*
- * @see org.apache.camel.test.junit4.CamelTestSupport#createRouteBuilder()
+ * @see org.apache.camel.test.junit5.CamelTestSupport#createRouteBuilder()
* @return
* @throws Exception
*/