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 bb54fd528b1e2679d96ba88fc1a898a71b3a0fe9
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Jul 20 09:25:05 2020 +0200
[CAMEL-11807] Upgrade camel-rabbitmq to junit5
---
components/camel-rabbitmq/pom.xml | 6 +--
.../component/rabbitmq/RabbitConsumerHangTest.java | 5 ++-
.../component/rabbitmq/RabbitMQComponentTest.java | 8 +++-
.../component/rabbitmq/RabbitMQConsumerTest.java | 2 +-
.../component/rabbitmq/RabbitMQEndpointTest.java | 51 +++++++++++++---------
.../RabbitMQLookupConnectionFactoryTest.java | 7 ++-
.../component/rabbitmq/RabbitMQProducerTest.java | 6 +--
.../RabbitMQSpringExceptionHandlerTest.java | 7 ++-
.../integration/AbstractRabbitMQIntTest.java | 13 +++---
.../rabbitmq/integration/DockerTestUtils.java | 2 +-
.../rabbitmq/integration/RabbitMQBasicIntTest.java | 4 +-
.../integration/RabbitMQConsumerIntTest.java | 2 +-
.../RabbitMQConsumerIntTestReplyTo.java | 9 ++--
.../integration/RabbitMQDeadLetterArgsIntTest.java | 2 +-
.../RabbitMQDeadLetterRoutingKeyIntTest.java | 11 ++---
.../rabbitmq/integration/RabbitMQInOutIntTest.java | 5 ++-
.../rabbitmq/integration/RabbitMQLoadIntTest.java | 2 +-
.../integration/RabbitMQProducerIntTest.java | 23 ++++++----
.../integration/RabbitMQReConnectionIntTest.java | 2 +-
.../RabbitMQRequeueHandledExceptionIntTest.java | 2 +-
.../integration/RabbitMQRequeueIntTest.java | 7 ++-
.../RabbitMQRequeueUnhandledExceptionIntTest.java | 2 +-
.../integration/RabbitMQSupendResumeIntTest.java | 2 +-
.../RabbitMQTemporaryQueueAutoRecoveryIntTest.java | 2 +-
.../spring/AbstractRabbitMQSpringIntTest.java | 11 ++---
.../integration/spring/RabbitMQSpringIntTest.java | 12 ++---
.../rabbitmq/qpid/RabbitMQConsumerQpidTest.java | 8 ++--
.../qpid/RabbitMQConsumerQpidTestReplyTo.java | 12 ++---
.../rabbitmq/qpid/RabbitMQInOutQpidTest.java | 8 ++--
.../rabbitmq/qpid/RabbitMQLoadQpidTest.java | 8 ++--
.../rabbitmq/qpid/RabbitMQProducerQpidTest.java | 14 +++---
.../qpid/RabbitMQReConnectionQpidTest.java | 8 ++--
.../rabbitmq/qpid/RabbitMQRequeueQpidTest.java | 18 ++++----
.../RabbitMQRequeueUnhandledExceptionQpidTest.java | 8 ++--
.../qpid/RabbitMQSupendResumeQpidTest.java | 8 ++--
35 files changed, 171 insertions(+), 126 deletions(-)
diff --git a/components/camel-rabbitmq/pom.xml
b/components/camel-rabbitmq/pom.xml
index a112e1a..c25755b 100644
--- a/components/camel-rabbitmq/pom.xml
+++ b/components/camel-rabbitmq/pom.xml
@@ -53,17 +53,17 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-testcontainers</artifactId>
+ <artifactId>camel-testcontainers-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java
index 1cf2eb3..f6505db 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitConsumerHangTest.java
@@ -18,7 +18,8 @@ package org.apache.camel.component.rabbitmq;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.mockito.Mockito;
import static org.junit.Assert.fail;
@@ -30,7 +31,7 @@ public class RabbitConsumerHangTest {
private Connection conn = Mockito.mock(Connection.class);
private Channel channel = Mockito.mock(Channel.class);
- @Test(timeout = 5000)
+ @Test @Timeout(5)
public void testHandleDeliveryShouldNotHangForeverIfChanelWasClosed()
throws Exception {
Mockito.when(consumer.getEndpoint()).thenReturn(endpoint);
Mockito.when(consumer.getConnection()).thenReturn(conn);
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
index 044167a..88b180d 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQComponentTest.java
@@ -23,10 +23,14 @@ import com.rabbitmq.client.ConnectionFactory;
import org.apache.camel.CamelContext;
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 org.mockito.Mockito;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
public class RabbitMQComponentTest extends CamelTestSupport {
@Override
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
index 4c9d8ca..3bb1757 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerTest.java
@@ -25,7 +25,7 @@ import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.Consumer;
import org.apache.camel.Processor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import static org.junit.Assert.assertFalse;
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
index eacc87a..1d20bef 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointTest.java
@@ -34,14 +34,25 @@ import com.rabbitmq.client.ConnectionFactory;
import com.rabbitmq.client.Envelope;
import com.rabbitmq.client.impl.LongStringHelper;
import org.apache.camel.Exchange;
+import
org.apache.camel.component.rabbitmq.integration.RabbitMQDeadLetterRoutingKeyIntTest;
import org.apache.camel.spi.Registry;
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 org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+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 RabbitMQEndpointTest extends CamelTestSupport {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(RabbitMQDeadLetterRoutingKeyIntTest.class);
+
private Envelope envelope = Mockito.mock(Envelope.class);
private AMQP.BasicProperties properties =
Mockito.mock(AMQP.BasicProperties.class);
@@ -91,10 +102,10 @@ public class RabbitMQEndpointTest extends CamelTestSupport
{
@Test
public void testExchangeNameIsOptional() throws Exception {
RabbitMQEndpoint endpoint1 =
context.getEndpoint("rabbitmq:localhost/", RabbitMQEndpoint.class);
- assertEquals("Get a wrong exchange name", "",
endpoint1.getExchangeName());
+ assertEquals("", endpoint1.getExchangeName(), "Get a wrong exchange
name");
RabbitMQEndpoint endpoint2 =
context.getEndpoint("rabbitmq:localhost/exchange", RabbitMQEndpoint.class);
- assertEquals("Get a wrong exchange name", "exchange",
endpoint2.getExchangeName());
+ assertEquals("exchange", endpoint2.getExchangeName(), "Get a wrong
exchange name");
}
@Test
@@ -119,9 +130,9 @@ public class RabbitMQEndpointTest extends CamelTestSupport {
customHeaders.put("byteArrayHeader", "foo".getBytes());
customHeaders.put("longStringHeader",
LongStringHelper.asLongString("Some really long string"));
customHeaders.put("timestampHeader", new Timestamp(4200));
- customHeaders.put("byteHeader", Byte.valueOf((byte)0));
- customHeaders.put("floatHeader", Float.valueOf((float)42.4242));
- customHeaders.put("longHeader", Long.valueOf(420000000000000000L));
+ customHeaders.put("byteHeader", (byte) 0);
+ customHeaders.put("floatHeader", (float) 42.4242);
+ customHeaders.put("longHeader", 420000000000000000L);
Mockito.when(properties.getHeaders()).thenReturn(customHeaders);
byte[] body = new byte[20];
@@ -138,9 +149,9 @@ public class RabbitMQEndpointTest extends CamelTestSupport {
assertArrayEquals("foo".getBytes(),
(byte[])exchange.getIn().getHeader("byteArrayHeader"));
assertEquals("Some really long string",
exchange.getIn().getHeader("longStringHeader"));
assertEquals(new Timestamp(4200),
exchange.getIn().getHeader("timestampHeader"));
- assertEquals(Byte.valueOf((byte)0),
exchange.getIn().getHeader("byteHeader"));
- assertEquals(Float.valueOf((float)42.4242),
exchange.getIn().getHeader("floatHeader"));
- assertEquals(Long.valueOf(420000000000000000L),
exchange.getIn().getHeader("longHeader"));
+ assertEquals((byte) 0, exchange.getIn().getHeader("byteHeader"));
+ assertEquals((float) 42.4242,
exchange.getIn().getHeader("floatHeader"));
+ assertEquals(420000000000000000L,
exchange.getIn().getHeader("longHeader"));
assertEquals(body, exchange.getIn().getBody());
}
@@ -170,20 +181,20 @@ public class RabbitMQEndpointTest extends
CamelTestSupport {
RabbitMQEndpoint endpoint = context.getEndpoint(
"rabbitmq:localhost/exchange?arg.exchange.e1=v1&arg.exchange.e2=v2&arg.queue.q1=v3&arg.binding.b1=v4&arg.dlq.queue.dq1=v5&arg.dlq.binding.db1=v6",
RabbitMQEndpoint.class);
- assertEquals("Wrong number of args", 6, endpoint.getArgs().size());
- assertEquals("Wrong number of args (binding)", 1,
endpoint.getBindingArgs().size());
- assertEquals("Wrong number of args (exchange)", 2,
endpoint.getExchangeArgs().size());
- assertEquals("Wrong number of args (queue)", 1,
endpoint.getQueueArgs().size());
- assertEquals("Wrong number of args (dlq.queue)", 1,
endpoint.getDlqArgs().size());
- assertEquals("Wrong number of args (dlq.binding)", 1,
endpoint.getDlqBindingArgs().size());
+ assertEquals(6, endpoint.getArgs().size(), "Wrong number of args");
+ assertEquals(1, endpoint.getBindingArgs().size(), "Wrong number of
args (binding)");
+ assertEquals(2, endpoint.getExchangeArgs().size(), "Wrong number of
args (exchange)");
+ assertEquals(1, endpoint.getQueueArgs().size(), "Wrong number of args
(queue)");
+ assertEquals(1, endpoint.getDlqArgs().size(), "Wrong number of args
(dlq.queue)");
+ assertEquals(1, endpoint.getDlqBindingArgs().size(), "Wrong number of
args (dlq.binding)");
}
@Test
public void brokerEndpointAddressesSettings() throws Exception {
RabbitMQEndpoint endpoint =
context.getEndpoint("rabbitmq:localhost/exchange?addresses=server1:12345,server2:12345",
RabbitMQEndpoint.class);
- assertEquals("Wrong size of endpoint addresses.", 2,
endpoint.parseAddresses().length);
- assertEquals("Get a wrong endpoint address.", new Address("server1",
12345), endpoint.parseAddresses()[0]);
- assertEquals("Get a wrong endpoint address.", new Address("server2",
12345), endpoint.parseAddresses()[1]);
+ assertEquals(2, endpoint.parseAddresses().length, "Wrong size of
endpoint addresses.");
+ assertEquals(new Address("server1", 12345),
endpoint.parseAddresses()[0], "Get a wrong endpoint address.");
+ assertEquals(new Address("server2", 12345),
endpoint.parseAddresses()[1], "Get a wrong endpoint address.");
}
private ConnectionFactory createConnectionFactory(String uri) throws
TimeoutException {
@@ -192,7 +203,7 @@ public class RabbitMQEndpointTest extends CamelTestSupport {
endpoint.connect(Executors.newSingleThreadExecutor());
} catch (IOException ioExc) {
// Doesn't matter if RabbitMQ is not available
- log.debug("RabbitMQ not available", ioExc);
+ LOGGER.debug("RabbitMQ not available", ioExc);
}
return endpoint.getConnectionFactory();
}
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQLookupConnectionFactoryTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQLookupConnectionFactoryTest.java
index 52e6162..8068f96 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQLookupConnectionFactoryTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQLookupConnectionFactoryTest.java
@@ -19,8 +19,11 @@ package org.apache.camel.component.rabbitmq;
import com.rabbitmq.client.ConnectionFactory;
import org.apache.camel.spi.Registry;
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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
public class RabbitMQLookupConnectionFactoryTest extends CamelTestSupport {
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
index f90e9be..2335752 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerTest.java
@@ -30,8 +30,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.DefaultMessage;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import static org.junit.Assert.assertArrayEquals;
@@ -46,7 +46,7 @@ public class RabbitMQProducerTest {
private Message message = new DefaultMessage(new DefaultCamelContext());
private Connection conn = Mockito.mock(Connection.class);
- @Before
+ @BeforeEach
public void before() throws IOException, TimeoutException {
RabbitMQMessageConverter converter = new RabbitMQMessageConverter();
converter.setAllowCustomHeaders(true);
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringExceptionHandlerTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringExceptionHandlerTest.java
index 7bea206..f75252c 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringExceptionHandlerTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQSpringExceptionHandlerTest.java
@@ -21,11 +21,14 @@ import org.apache.camel.Component;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import
org.apache.camel.component.rabbitmq.testbeans.CustomRabbitExceptionHandler;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.Test;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
public class RabbitMQSpringExceptionHandlerTest extends CamelSpringTestSupport
{
@EndpointInject("rabbitmq:localhost:5672/foo?username=cameltest&password=cameltest&connectionFactoryExceptionHandler=#customExceptionHandler")
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/AbstractRabbitMQIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/AbstractRabbitMQIntTest.java
index de04164..f0c5577 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/AbstractRabbitMQIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/AbstractRabbitMQIntTest.java
@@ -25,12 +25,17 @@ import java.util.concurrent.TimeoutException;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
-import org.apache.camel.test.testcontainers.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
import org.apache.qpid.server.SystemLauncher;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.SystemConfig;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public abstract class AbstractRabbitMQIntTest extends
ContainerAwareTestSupport {
protected static final String INITIAL_CONFIGURATION =
"qpid-test-initial-config.json";
protected static SystemLauncher systemLauncher = new SystemLauncher();
@@ -38,16 +43,14 @@ public abstract class AbstractRabbitMQIntTest extends
ContainerAwareTestSupport
// Container starts once per test class
private static GenericContainer container;
- @Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
+ protected Logger log = LoggerFactory.getLogger(getClass());
protected boolean isStartDocker() {
return true;
}
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
}
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/DockerTestUtils.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/DockerTestUtils.java
index 229f85c..f960964 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/DockerTestUtils.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/DockerTestUtils.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.rabbitmq.integration;
import java.util.Arrays;
-import org.apache.camel.test.testcontainers.Wait;
+import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
public class DockerTestUtils {
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQBasicIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQBasicIntTest.java
index 949a8bb..1ca03fa 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQBasicIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQBasicIntTest.java
@@ -20,7 +20,9 @@ import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RabbitMQBasicIntTest extends AbstractRabbitMQIntTest {
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTest.java
index 14957ac..6f71edd 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTest.java
@@ -34,7 +34,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
import org.awaitility.Awaitility;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class RabbitMQConsumerIntTest extends AbstractRabbitMQIntTest {
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTestReplyTo.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTestReplyTo.java
index 47602f8..f5850ac 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTestReplyTo.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTestReplyTo.java
@@ -29,8 +29,11 @@ import com.rabbitmq.client.Envelope;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.test.junit5.TestSupport.assertListSize;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Integration test to check if requested direct reply messages are received
@@ -50,7 +53,7 @@ public class RabbitMQConsumerIntTestReplyTo extends
AbstractRabbitMQIntTest {
private Connection connection;
- @Before
+ @BeforeEach
public void setUpRabbitMQ() throws Exception {
connection = connection();
channel = connection.createChannel();
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java
index fb3a052..ccd9044 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
import org.apache.camel.util.json.Jsoner;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class RabbitMQDeadLetterArgsIntTest extends AbstractRabbitMQIntTest {
private static final String LOCAL_RABBITMQ_PARAMS =
"hostname=localhost&portNumber=5672&username=cameltest&password=cameltest";
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java
index 2639fd4..664a470 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java
@@ -31,12 +31,13 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.assertListSize;
import static org.junit.Assert.assertEquals;
public class RabbitMQDeadLetterRoutingKeyIntTest extends
AbstractRabbitMQIntTest {
@@ -74,14 +75,14 @@ public class RabbitMQDeadLetterRoutingKeyIntTest extends
AbstractRabbitMQIntTest
};
}
- @Before
+ @BeforeEach
public void setUpRabbitMQ() throws Exception {
connection = connection();
channel = connection.createChannel();
deadLetterChannel = connection.createChannel();
}
- @After
+ @AfterEach
public void tearDownRabbitMQ() throws Exception {
channel.abort();
deadLetterChannel.abort();
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java
index 0961d48..406a59b 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java
@@ -43,9 +43,12 @@ import
org.apache.camel.component.rabbitmq.testbeans.TestSerializableObject;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.junit.FixMethodOrder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.runners.MethodSorters;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class RabbitMQInOutIntTest extends AbstractRabbitMQIntTest {
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java
index 86d6870..2e43988 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Integration test to check that RabbitMQ Endpoint is able handle heavy load
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIntTest.java
index 627b547..f5dfde2 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIntTest.java
@@ -34,12 +34,18 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
import org.apache.camel.support.ObjectHelper;
-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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.test.junit5.TestSupport.assertListSize;
+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;
+
public class RabbitMQProducerIntTest extends AbstractRabbitMQIntTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(RabbitMQProducerIntTest.class);
@@ -105,7 +111,7 @@ public class RabbitMQProducerIntTest extends
AbstractRabbitMQIntTest {
};
}
- @Before
+ @BeforeEach
public void setUpRabbitMQ() throws Exception {
connection = connection();
channel = connection.createChannel();
@@ -113,7 +119,7 @@ public class RabbitMQProducerIntTest extends
AbstractRabbitMQIntTest {
channel.queueBind("sammyq", EXCHANGE, ROUTE);
}
- @After
+ @AfterEach
public void tearDownRabbitMQ() throws Exception {
channel.abort();
connection.abort();
@@ -221,7 +227,7 @@ public class RabbitMQProducerIntTest extends
AbstractRabbitMQIntTest {
for (Map.Entry<String, Object> headers : expectedHeaders.entrySet()) {
Object receivedValue = receivedHeaders.get(headers.getKey());
Object expectedValue = headers.getValue();
- assertTrue("Header key " + headers.getKey() + " not found",
receivedHeaders.containsKey(headers.getKey()));
+ assertTrue(receivedHeaders.containsKey(headers.getKey()), "Header
key " + headers.getKey() + " not found");
assertEquals(0, ObjectHelper.compare(receivedValue == null ? "" :
receivedValue.toString(), expectedValue == null ? "" :
expectedValue.toString()));
}
@@ -257,9 +263,10 @@ public class RabbitMQProducerIntTest extends
AbstractRabbitMQIntTest {
assertThatBodiesReceivedIn(received, "publisher ack message");
}
- @Test(expected = RuntimeCamelException.class)
+ @Test
public void
shouldFailIfMessageIsMarkedAsMandatoryAndGuaranteedDeliveryIsActiveButNoQueueIsBound()
{
- templateWithGuranteedDeliveryAndBadRoute.sendBody("publish with ack
and return message");
+ assertThrows(RuntimeCamelException.class,
+ () -> templateWithGuranteedDeliveryAndBadRoute.sendBody("publish
with ack and return message"));
}
@Test
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java
index 91f4405..912a73a 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Integration test to check that RabbitMQ Endpoint is able to reconnect to
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
index d29e090..36606e5 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Integration test to confirm REQUEUE header causes message not to be
re-queued
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java
index 3917840..c439c03 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java
@@ -24,10 +24,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
import org.awaitility.Awaitility;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Integration test to confirm REQUEUE header causes message to be re-queued
@@ -55,6 +58,7 @@ public class RabbitMQRequeueIntTest extends
AbstractRabbitMQIntTest {
private com.rabbitmq.client.Channel deadLetterChannel;
@Override
+ @BeforeEach
public void setUp() throws Exception {
super.setUp();
@@ -64,6 +68,7 @@ public class RabbitMQRequeueIntTest extends
AbstractRabbitMQIntTest {
}
@Override
+ @AfterEach
public void tearDown() throws Exception {
super.tearDown();
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java
index 6c2644e..bf04f15 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java
@@ -23,7 +23,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Integration test to confirm REQUEUE header causes message to be re-queued
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIntTest.java
index 5538c0f..4ac9ed9 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIntTest.java
@@ -24,7 +24,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class RabbitMQSupendResumeIntTest extends AbstractRabbitMQIntTest {
private static final String EXCHANGE = "ex6";
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java
index c1ca5b8..c9bad9b 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java
@@ -29,7 +29,7 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/spring/AbstractRabbitMQSpringIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/spring/AbstractRabbitMQSpringIntTest.java
index b1c0cd6..def5794 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/spring/AbstractRabbitMQSpringIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/spring/AbstractRabbitMQSpringIntTest.java
@@ -19,12 +19,14 @@ package
org.apache.camel.component.rabbitmq.integration.spring;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.apache.camel.test.testcontainers.Containers;
+import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
+import org.apache.camel.test.testcontainers.junit5.Containers;
+import org.junit.jupiter.api.TestInstance;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.testcontainers.containers.GenericContainer;
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public abstract class AbstractRabbitMQSpringIntTest extends
CamelSpringTestSupport {
// Container starts once per test class
@@ -35,11 +37,6 @@ public abstract class AbstractRabbitMQSpringIntTest extends
CamelSpringTestSuppo
protected abstract String getConfigLocation();
@Override
- public boolean isCreateCamelContextPerClass() {
- return true;
- }
-
- @Override
protected AbstractApplicationContext createApplicationContext() {
container =
org.apache.camel.component.rabbitmq.integration.DockerTestUtils.rabbitMQContainer();
this.containers.add(container);
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/spring/RabbitMQSpringIntTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/spring/RabbitMQSpringIntTest.java
index eb650e1..6cf2801 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/spring/RabbitMQSpringIntTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/spring/RabbitMQSpringIntTest.java
@@ -28,13 +28,15 @@ import com.rabbitmq.client.Envelope;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.rabbitmq.RabbitMQConstants;
-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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/**
* Test RabbitMQ component with Spring DSL
*/
@@ -86,12 +88,12 @@ public class RabbitMQSpringIntTest extends
AbstractRabbitMQSpringIntTest {
return channel;
}
- @Before
+ @BeforeEach
public void bindQueueExchange() throws IOException, TimeoutException {
openChannel();
}
- @After
+ @AfterEach
public void closeConnection() throws TimeoutException {
if (isChannelOpened()) {
try {
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java
index 75e5d92..1e1dd6e 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.rabbitmq.qpid;
import org.apache.camel.component.rabbitmq.integration.RabbitMQConsumerIntTest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class RabbitMQConsumerQpidTest extends RabbitMQConsumerIntTest {
@Override
@@ -26,12 +26,12 @@ public class RabbitMQConsumerQpidTest extends
RabbitMQConsumerIntTest {
return false;
}
- @BeforeClass
+ @BeforeAll
public static void startBroker() throws Exception {
systemLauncher.startup(createQpidSystemConfig());
}
- @AfterClass
+ @AfterAll
public static void stopBroker() {
systemLauncher.shutdown();
}
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTestReplyTo.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTestReplyTo.java
index 5ce1187..4c61f3f 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTestReplyTo.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTestReplyTo.java
@@ -17,9 +17,9 @@
package org.apache.camel.component.rabbitmq.qpid;
import
org.apache.camel.component.rabbitmq.integration.RabbitMQConsumerIntTestReplyTo;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
public class RabbitMQConsumerQpidTestReplyTo extends
RabbitMQConsumerIntTestReplyTo {
@Override
@@ -27,18 +27,18 @@ public class RabbitMQConsumerQpidTestReplyTo extends
RabbitMQConsumerIntTestRepl
return false;
}
- @BeforeClass
+ @BeforeAll
public static void startBroker() throws Exception {
systemLauncher.startup(createQpidSystemConfig());
}
- @AfterClass
+ @AfterAll
public static void stopBroker() {
systemLauncher.shutdown();
}
@Override
- @Before
+ @BeforeEach
public void setUpRabbitMQ() throws Exception {
super.setUpRabbitMQ();
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java
index 823864e..cbc2df4 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.rabbitmq.qpid;
import org.apache.camel.component.rabbitmq.integration.RabbitMQInOutIntTest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class RabbitMQInOutQpidTest extends RabbitMQInOutIntTest {
@Override
@@ -26,12 +26,12 @@ public class RabbitMQInOutQpidTest extends
RabbitMQInOutIntTest {
return false;
}
- @BeforeClass
+ @BeforeAll
public static void startBroker() throws Exception {
systemLauncher.startup(createQpidSystemConfig());
}
- @AfterClass
+ @AfterAll
public static void stopBroker() {
systemLauncher.shutdown();
}
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java
index 4b2b0e4..0055a18 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.rabbitmq.qpid;
import org.apache.camel.component.rabbitmq.integration.RabbitMQLoadIntTest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class RabbitMQLoadQpidTest extends RabbitMQLoadIntTest {
@Override
@@ -26,12 +26,12 @@ public class RabbitMQLoadQpidTest extends
RabbitMQLoadIntTest {
return false;
}
- @BeforeClass
+ @BeforeAll
public static void startBroker() throws Exception {
systemLauncher.startup(createQpidSystemConfig());
}
- @AfterClass
+ @AfterAll
public static void stopBroker() {
systemLauncher.shutdown();
}
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java
index 5daa149..f6b0aec 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java
@@ -20,9 +20,9 @@ import java.io.IOException;
import java.util.concurrent.TimeoutException;
import org.apache.camel.component.rabbitmq.integration.RabbitMQProducerIntTest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
public class RabbitMQProducerQpidTest extends RabbitMQProducerIntTest {
@Override
@@ -30,22 +30,22 @@ public class RabbitMQProducerQpidTest extends
RabbitMQProducerIntTest {
return false;
}
- @BeforeClass
+ @BeforeAll
public static void startBroker() throws Exception {
systemLauncher.startup(createQpidSystemConfig());
}
- @AfterClass
+ @AfterAll
public static void stopBroker() {
systemLauncher.shutdown();
}
- @Ignore
+ @Disabled
@Override
public void
producedMessageIsReceivedWhenPublisherAcknowledgementsAreEnabledAndBadRoutingKeyIsUsed()
throws InterruptedException, IOException, TimeoutException {
}
- @Ignore
+ @Disabled
@Override
public void
shouldSuccessfullyProduceMessageWhenGuaranteedDeliveryIsActivatedOnABadRouteButMessageIsNotMandatory()
throws InterruptedException, IOException, TimeoutException {
}
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java
index ff55817..a66c80b 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.rabbitmq.qpid;
import
org.apache.camel.component.rabbitmq.integration.RabbitMQReConnectionIntTest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class RabbitMQReConnectionQpidTest extends RabbitMQReConnectionIntTest {
@Override
@@ -26,12 +26,12 @@ public class RabbitMQReConnectionQpidTest extends
RabbitMQReConnectionIntTest {
return false;
}
- @BeforeClass
+ @BeforeAll
public static void startBroker() throws Exception {
systemLauncher.startup(createQpidSystemConfig());
}
- @AfterClass
+ @AfterAll
public static void stopBroker() {
systemLauncher.shutdown();
}
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java
index 1451971..3f7008a 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java
@@ -17,10 +17,10 @@
package org.apache.camel.component.rabbitmq.qpid;
import org.apache.camel.component.rabbitmq.integration.RabbitMQRequeueIntTest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
public class RabbitMQRequeueQpidTest extends RabbitMQRequeueIntTest {
@Override
@@ -28,29 +28,29 @@ public class RabbitMQRequeueQpidTest extends
RabbitMQRequeueIntTest {
return false;
}
- @BeforeClass
+ @BeforeAll
public static void startBroker() throws Exception {
systemLauncher.startup(createQpidSystemConfig());
}
- @AfterClass
+ @AfterAll
public static void stopBroker() {
systemLauncher.shutdown();
}
- @Ignore
+ @Disabled
@Override
@Test
public void testNoRequeueHeaderCausesReject() throws Exception {
}
- @Ignore
+ @Disabled
@Override
@Test
public void testNonBooleanRequeueHeaderCausesReject() throws Exception {
}
- @Ignore
+ @Disabled
@Override
@Test
public void testFalseRequeueHeaderCausesReject() throws Exception {
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java
index 7e7383c..93eb772 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.rabbitmq.qpid;
import
org.apache.camel.component.rabbitmq.integration.RabbitMQRequeueUnhandledExceptionIntTest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class RabbitMQRequeueUnhandledExceptionQpidTest extends
RabbitMQRequeueUnhandledExceptionIntTest {
@Override
@@ -26,12 +26,12 @@ public class RabbitMQRequeueUnhandledExceptionQpidTest
extends RabbitMQRequeueUn
return false;
}
- @BeforeClass
+ @BeforeAll
public static void startBroker() throws Exception {
systemLauncher.startup(createQpidSystemConfig());
}
- @AfterClass
+ @AfterAll
public static void stopBroker() {
systemLauncher.shutdown();
}
diff --git
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java
index bff7965..fd4d5a1 100644
---
a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java
+++
b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.rabbitmq.qpid;
import
org.apache.camel.component.rabbitmq.integration.RabbitMQSupendResumeIntTest;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
public class RabbitMQSupendResumeQpidTest extends RabbitMQSupendResumeIntTest {
@Override
@@ -26,12 +26,12 @@ public class RabbitMQSupendResumeQpidTest extends
RabbitMQSupendResumeIntTest {
return false;
}
- @BeforeClass
+ @BeforeAll
public static void startBroker() throws Exception {
systemLauncher.startup(createQpidSystemConfig());
}
- @AfterClass
+ @AfterAll
public static void stopBroker() {
systemLauncher.shutdown();
}
