You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/04/14 16:06:06 UTC
[camel] branch master updated: CAMEL-16400: split unit and
integration tests for camel-rabbitmq (#5365)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2c107f0 CAMEL-16400: split unit and integration tests for camel-rabbitmq (#5365)
2c107f0 is described below
commit 2c107f00fcd38c298c20148d0b788e434f76cd41
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Wed Apr 14 18:05:34 2021 +0200
CAMEL-16400: split unit and integration tests for camel-rabbitmq (#5365)
---
components/camel-rabbitmq/pom.xml | 107 +++------------------
components/camel-rabbitmq/readme.txt | 4 +-
.../component/rabbitmq/RabbitMQEndpointTest.java | 4 +-
...abbitMQIntTest.java => AbstractRabbitMQIT.java} | 2 +-
...bitMQBasicIntTest.java => RabbitMQBasicIT.java} | 2 +-
...onsumerIntTest.java => RabbitMQConsumerIT.java} | 2 +-
...ReplyTo.java => RabbitMQConsumerReplyToIT.java} | 4 +-
...sIntTest.java => RabbitMQDeadLetterArgsIT.java} | 2 +-
...st.java => RabbitMQDeadLetterRoutingKeyIT.java} | 6 +-
...bitMQInOutIntTest.java => RabbitMQInOutIT.java} | 2 +-
...abbitMQLoadIntTest.java => RabbitMQLoadIT.java} | 3 +-
...roducerIntTest.java => RabbitMQProducerIT.java} | 8 +-
...ionIntTest.java => RabbitMQReConnectionIT.java} | 3 +-
...java => RabbitMQRequeueHandledExceptionIT.java} | 2 +-
...QRequeueIntTest.java => RabbitMQRequeueIT.java} | 2 +-
...va => RabbitMQRequeueUnhandledExceptionIT.java} | 2 +-
...umeIntTest.java => RabbitMQSupendResumeIT.java} | 2 +-
...a => RabbitMQTemporaryQueueAutoRecoveryIT.java} | 2 +-
...{RabbitMQToDIntTest.java => RabbitMQToDIT.java} | 2 +-
...amicTest.java => RabbitMQToDSendDynamicIT.java} | 2 +-
.../qpid/RabbitMQConsumerQpidIT.java} | 8 +-
.../qpid/RabbitMQConsumerQpidTestReplyToIT.java} | 8 +-
.../qpid/RabbitMQInOutQpidIT.java} | 8 +-
.../qpid/RabbitMQLoadQpidIT.java} | 8 +-
.../qpid/RabbitMQProducerQpidIT.java} | 11 +--
.../qpid/RabbitMQReConnectionQpidIT.java} | 8 +-
.../qpid/RabbitMQRequeueQpidIT.java} | 12 +--
.../RabbitMQRequeueUnhandledExceptionQpidIT.java} | 8 +-
.../qpid/RabbitMQSuspendResumeQpidIT.java} | 8 +-
.../test/infra/services/QpidEmbeddedService.java | 4 +-
30 files changed, 87 insertions(+), 159 deletions(-)
diff --git a/components/camel-rabbitmq/pom.xml b/components/camel-rabbitmq/pom.xml
index f747f8d..6c77183 100644
--- a/components/camel-rabbitmq/pom.xml
+++ b/components/camel-rabbitmq/pom.xml
@@ -119,98 +119,17 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>rabbitmq-skip-tests</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- activate test if the docker socket file is accessible -->
- <profile>
- <id>rabbitmq-tests-docker-file</id>
- <activation>
- <file>
- <exists>/var/run/docker.sock</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- <excludes>
- <exclude>**/*QpidTest</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- activate test if the DOCKER_HOST env var is set -->
- <profile>
- <id>rabbitmq-tests-docker-env</id>
- <activation>
- <property>
- <name>env.DOCKER_HOST</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- <excludes>
- <exclude>**/*QpidTest</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>qpid-itest</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <argLine>-Drabbitmq.instance.type=qpid</argLine>
- <excludes>
- <exclude>**/*IntTest</exclude>
- </excludes>
- <includes>
- <include>**/*QpidTest</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/components/camel-rabbitmq/readme.txt b/components/camel-rabbitmq/readme.txt
index 8bc17c8..f656e10 100644
--- a/components/camel-rabbitmq/readme.txt
+++ b/components/camel-rabbitmq/readme.txt
@@ -7,6 +7,6 @@ The integration tests requires docker, so that a RabbitMQ instance can be brough
of such tests is done automatically by checking either the docker socket or the DOCKER_HOST variable.
It is also possible to run the tests using an embedded Qpid broker, for interoperability test. To run such tests,
-execute maven with the -Pqpid-itest profile:
+execute maven with the `-Drabbitmq.instance.type=qpid`
-```mvn -Pqpid-itest verify```
+```mvn Drabbitmq.instance.type=qpid verify```
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 d1dab1d..318844a 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,7 +34,7 @@ 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.component.rabbitmq.integration.RabbitMQDeadLetterRoutingKeyIT;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -52,7 +52,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class RabbitMQEndpointTest extends CamelTestSupport {
- private static final Logger LOGGER = LoggerFactory.getLogger(RabbitMQDeadLetterRoutingKeyIntTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RabbitMQDeadLetterRoutingKeyIT.class);
private Envelope envelope = Mockito.mock(Envelope.class);
private AMQP.BasicProperties properties = Mockito.mock(AMQP.BasicProperties.class);
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/AbstractRabbitMQIT.java
similarity index 97%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/AbstractRabbitMQIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/AbstractRabbitMQIT.java
index ced2c06a..e6bc3cc 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/AbstractRabbitMQIT.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public abstract class AbstractRabbitMQIntTest extends CamelTestSupport {
+public abstract class AbstractRabbitMQIT extends CamelTestSupport {
// Note: this is using the RabbitMQService from this module so that we can also run
// tests using the embedded QPid broker.
@RegisterExtension
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/RabbitMQBasicIT.java
similarity index 97%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQBasicIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQBasicIT.java
index 97df93c..fd77a68 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/RabbitMQBasicIT.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class RabbitMQBasicIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQBasicIT extends AbstractRabbitMQIT {
String foo;
String bar;
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/RabbitMQConsumerIT.java
similarity index 98%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIT.java
index 9eb443f..7163ab5 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/RabbitMQConsumerIT.java
@@ -36,7 +36,7 @@ import org.apache.camel.test.infra.rabbitmq.services.ConnectionProperties;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
-public class RabbitMQConsumerIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQConsumerIT extends AbstractRabbitMQIT {
private static final String EXCHANGE = "ex1";
private static final String HEADERS_EXCHANGE = "ex8";
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/RabbitMQConsumerReplyToIT.java
similarity index 96%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerIntTestReplyTo.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQConsumerReplyToIT.java
index 942db0c..b775006 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/RabbitMQConsumerReplyToIT.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Integration test to check if requested direct reply messages are received
*/
-public class RabbitMQConsumerIntTestReplyTo extends AbstractRabbitMQIntTest {
+public class RabbitMQConsumerReplyToIT extends AbstractRabbitMQIT {
protected static final String QUEUE = "amq.rabbitmq.reply-to";
private static final String EXCHANGE = "ex_reply";
@@ -99,7 +99,7 @@ public class RabbitMQConsumerIntTestReplyTo extends AbstractRabbitMQIntTest {
private final List<String> received;
ArrayPopulatingConsumer(final List<String> received) {
- super(RabbitMQConsumerIntTestReplyTo.this.channel);
+ super(RabbitMQConsumerReplyToIT.this.channel);
this.received = received;
}
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/RabbitMQDeadLetterArgsIT.java
similarity index 98%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterArgsIT.java
index 09b556c..5931cb4 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/RabbitMQDeadLetterArgsIT.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class RabbitMQDeadLetterArgsIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQDeadLetterArgsIT extends AbstractRabbitMQIT {
private static final String QUEUE = "queue";
private static final String DLQ = QUEUE + "_dlq";
private static final String QUEUE_SKIP_DECLARE = "queue_skip_declare";
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/RabbitMQDeadLetterRoutingKeyIT.java
similarity index 96%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQDeadLetterRoutingKeyIT.java
index a3197bf..ffe0f1f 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/RabbitMQDeadLetterRoutingKeyIT.java
@@ -41,9 +41,9 @@ import org.slf4j.LoggerFactory;
import static org.apache.camel.test.junit5.TestSupport.assertListSize;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class RabbitMQDeadLetterRoutingKeyIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQDeadLetterRoutingKeyIT extends AbstractRabbitMQIT {
- private static final Logger LOGGER = LoggerFactory.getLogger(RabbitMQDeadLetterRoutingKeyIntTest.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(RabbitMQDeadLetterRoutingKeyIT.class);
private Connection connection;
private Channel channel;
@@ -145,7 +145,7 @@ public class RabbitMQDeadLetterRoutingKeyIntTest extends AbstractRabbitMQIntTest
private final List<String> received;
DeadLetterRoutingKeyConsumer(final List<String> received, final StringBuilder routingKey) {
- super(RabbitMQDeadLetterRoutingKeyIntTest.this.deadLetterChannel);
+ super(RabbitMQDeadLetterRoutingKeyIT.this.deadLetterChannel);
this.received = received;
this.routingKey = routingKey;
}
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/RabbitMQInOutIT.java
similarity index 99%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQInOutIT.java
index af6b3c7..ed6893a 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/RabbitMQInOutIT.java
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@TestMethodOrder(MethodOrderer.MethodName.class)
-public class RabbitMQInOutIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQInOutIT extends AbstractRabbitMQIT {
public static final String ROUTING_KEY = "rk5";
public static final long TIMEOUT_MS = 2000;
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/RabbitMQLoadIT.java
similarity index 97%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQLoadIT.java
index 0e2d245..549b64f 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/RabbitMQLoadIT.java
@@ -23,7 +23,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Produce;
@@ -37,7 +36,7 @@ import org.junit.jupiter.api.Test;
/**
* Integration test to check that RabbitMQ Endpoint is able handle heavy load using multiple producers and consumers
*/
-public class RabbitMQLoadIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQLoadIT extends AbstractRabbitMQIT {
public static final String ROUTING_KEY = "rk4";
private static final int PRODUCER_COUNT = 10;
private static final int CONSUMER_COUNT = 10;
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/RabbitMQProducerIT.java
similarity index 98%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQProducerIT.java
index b0c39b4..700aa63 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/RabbitMQProducerIT.java
@@ -47,8 +47,8 @@ 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);
+public class RabbitMQProducerIT extends AbstractRabbitMQIT {
+ private static final Logger LOGGER = LoggerFactory.getLogger(RabbitMQProducerIT.class);
private static final String EXCHANGE = "ex1";
private static final String ROUTE = "route1";
@@ -301,13 +301,13 @@ public class RabbitMQProducerIntTest extends AbstractRabbitMQIntTest {
private final Map<String, Object> receivedHeaders;
ArrayPopulatingConsumer(final List<String> received) {
- super(RabbitMQProducerIntTest.this.channel);
+ super(RabbitMQProducerIT.this.channel);
this.received = received;
receivedHeaders = new HashMap<>();
}
ArrayPopulatingConsumer(final List<String> received, Map<String, Object> receivedHeaders) {
- super(RabbitMQProducerIntTest.this.channel);
+ super(RabbitMQProducerIT.this.channel);
this.received = received;
this.receivedHeaders = receivedHeaders;
}
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/RabbitMQReConnectionIT.java
similarity index 97%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQReConnectionIT.java
index ba84aed..9ad7d9a 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/RabbitMQReConnectionIT.java
@@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit;
import com.rabbitmq.client.AlreadyClosedException;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Produce;
@@ -43,7 +42,7 @@ import org.junit.jupiter.api.Test;
* <li>Kill all connections from the broker: the producer sends messages, and the consumer receives messages</li>
* </ul>
*/
-public class RabbitMQReConnectionIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQReConnectionIT extends AbstractRabbitMQIT {
private static final String EXCHANGE = "ex3";
@Produce("direct:rabbitMQ")
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/RabbitMQRequeueHandledExceptionIT.java
similarity index 97%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueHandledExceptionIT.java
index 61dbf08..455ecda 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/RabbitMQRequeueHandledExceptionIT.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
/**
* Integration test to confirm REQUEUE header causes message not to be re-queued when an handled exception occurs.
*/
-public class RabbitMQRequeueHandledExceptionIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQRequeueHandledExceptionIT extends AbstractRabbitMQIT {
public static final String ROUTING_KEY = "rk4";
@Produce("direct:rabbitMQ")
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/RabbitMQRequeueIT.java
similarity index 99%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueIT.java
index 7ce4d49..54d74d1 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/RabbitMQRequeueIT.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Integration test to confirm REQUEUE header causes message to be re-queued instead of sent to DLQ.
*/
-public class RabbitMQRequeueIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQRequeueIT extends AbstractRabbitMQIT {
public static final String ROUTING_KEY = "rk4";
public static final String DEAD_LETTER_QUEUE_NAME = "dlq";
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/RabbitMQRequeueUnhandledExceptionIT.java
similarity index 97%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQRequeueUnhandledExceptionIT.java
index 280eeb8..e0c854d 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/RabbitMQRequeueUnhandledExceptionIT.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
/**
* Integration test to confirm REQUEUE header causes message to be re-queued when an unhandled exception occurs.
*/
-public class RabbitMQRequeueUnhandledExceptionIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQRequeueUnhandledExceptionIT extends AbstractRabbitMQIT {
public static final String ROUTING_KEY = "rk4";
@Produce("direct:rabbitMQ")
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/RabbitMQSupendResumeIT.java
similarity index 97%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQSupendResumeIT.java
index b44fbb6..7985a9a 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/RabbitMQSupendResumeIT.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.rabbitmq.services.ConnectionProperties;
import org.junit.jupiter.api.Test;
-public class RabbitMQSupendResumeIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQSupendResumeIT extends AbstractRabbitMQIT {
private static final String EXCHANGE = "ex6";
@EndpointInject("mock:result")
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/RabbitMQTemporaryQueueAutoRecoveryIT.java
similarity index 99%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQTemporaryQueueAutoRecoveryIT.java
index 1f25bdc..11c52ad 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/RabbitMQTemporaryQueueAutoRecoveryIT.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
* Integration test to check if temporary queue's name change is properly handled after auto recovering caused by
* connection failure. This test takes advantage of RabbitMQ Management HTTP API provided by RabbitMQ Management Plugin.
*/
-public class RabbitMQTemporaryQueueAutoRecoveryIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQTemporaryQueueAutoRecoveryIT extends AbstractRabbitMQIT {
private static final String EXCHANGE = "ex_temp-queue-test";
private static final String QUEUE = "q_temp-queue-test";
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDIT.java
similarity index 97%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDIntTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDIT.java
index c59ac38..b56339e 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDIntTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDIT.java
@@ -20,7 +20,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.rabbitmq.RabbitMQComponent;
import org.junit.jupiter.api.Test;
-public class RabbitMQToDIntTest extends AbstractRabbitMQIntTest {
+public class RabbitMQToDIT extends AbstractRabbitMQIT {
@Test
public void testToD() throws Exception {
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDSendDynamicTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDSendDynamicIT.java
similarity index 97%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDSendDynamicTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDSendDynamicIT.java
index d399bdf..89e0a91 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDSendDynamicTest.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/RabbitMQToDSendDynamicIT.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class RabbitMQToDSendDynamicTest extends AbstractRabbitMQIntTest {
+public class RabbitMQToDSendDynamicIT extends AbstractRabbitMQIT {
@Test
public void testToD() throws Exception {
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/integration/qpid/RabbitMQConsumerQpidIT.java
similarity index 75%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/qpid/RabbitMQConsumerQpidIT.java
index 07cdfcc..05cf222 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/integration/qpid/RabbitMQConsumerQpidIT.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rabbitmq.qpid;
+package org.apache.camel.component.rabbitmq.integration.qpid;
-import org.apache.camel.component.rabbitmq.integration.RabbitMQConsumerIntTest;
+import org.apache.camel.component.rabbitmq.integration.RabbitMQConsumerIT;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class RabbitMQConsumerQpidTest extends RabbitMQConsumerIntTest {
+@EnabledIfSystemProperty(named = "rabbitmq.instance.type", matches = "qpid")
+public class RabbitMQConsumerQpidIT extends RabbitMQConsumerIT {
}
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/integration/qpid/RabbitMQConsumerQpidTestReplyToIT.java
similarity index 78%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQConsumerQpidTestReplyTo.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/qpid/RabbitMQConsumerQpidTestReplyToIT.java
index ef5d92b..ee915bd 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/integration/qpid/RabbitMQConsumerQpidTestReplyToIT.java
@@ -14,12 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rabbitmq.qpid;
+package org.apache.camel.component.rabbitmq.integration.qpid;
-import org.apache.camel.component.rabbitmq.integration.RabbitMQConsumerIntTestReplyTo;
+import org.apache.camel.component.rabbitmq.integration.RabbitMQConsumerReplyToIT;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class RabbitMQConsumerQpidTestReplyTo extends RabbitMQConsumerIntTestReplyTo {
+@EnabledIfSystemProperty(named = "rabbitmq.instance.type", matches = "qpid")
+public class RabbitMQConsumerQpidTestReplyToIT extends RabbitMQConsumerReplyToIT {
@Override
@BeforeEach
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/integration/qpid/RabbitMQInOutQpidIT.java
similarity index 76%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQInOutQpidTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/qpid/RabbitMQInOutQpidIT.java
index b5899f9..87b7474 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/integration/qpid/RabbitMQInOutQpidIT.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rabbitmq.qpid;
+package org.apache.camel.component.rabbitmq.integration.qpid;
-import org.apache.camel.component.rabbitmq.integration.RabbitMQInOutIntTest;
+import org.apache.camel.component.rabbitmq.integration.RabbitMQInOutIT;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class RabbitMQInOutQpidTest extends RabbitMQInOutIntTest {
+@EnabledIfSystemProperty(named = "rabbitmq.instance.type", matches = "qpid")
+public class RabbitMQInOutQpidIT extends RabbitMQInOutIT {
}
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/integration/qpid/RabbitMQLoadQpidIT.java
similarity index 76%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQLoadQpidTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/qpid/RabbitMQLoadQpidIT.java
index 2064722..4fea1950 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/integration/qpid/RabbitMQLoadQpidIT.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rabbitmq.qpid;
+package org.apache.camel.component.rabbitmq.integration.qpid;
-import org.apache.camel.component.rabbitmq.integration.RabbitMQLoadIntTest;
+import org.apache.camel.component.rabbitmq.integration.RabbitMQLoadIT;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class RabbitMQLoadQpidTest extends RabbitMQLoadIntTest {
+@EnabledIfSystemProperty(named = "rabbitmq.instance.type", matches = "qpid")
+public class RabbitMQLoadQpidIT extends RabbitMQLoadIT {
}
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/integration/qpid/RabbitMQProducerQpidIT.java
similarity index 82%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQProducerQpidTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/qpid/RabbitMQProducerQpidIT.java
index 79a98dc..900948f 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/integration/qpid/RabbitMQProducerQpidIT.java
@@ -14,23 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rabbitmq.qpid;
+package org.apache.camel.component.rabbitmq.integration.qpid;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
-import org.apache.camel.component.rabbitmq.integration.RabbitMQProducerIntTest;
-import org.junit.jupiter.api.Disabled;
+import org.apache.camel.component.rabbitmq.integration.RabbitMQProducerIT;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class RabbitMQProducerQpidTest extends RabbitMQProducerIntTest {
+@EnabledIfSystemProperty(named = "rabbitmq.instance.type", matches = "qpid")
+public class RabbitMQProducerQpidIT extends RabbitMQProducerIT {
- @Disabled
@Override
public void producedMessageIsReceivedWhenPublisherAcknowledgementsAreEnabledAndBadRoutingKeyIsUsed()
throws InterruptedException, IOException, TimeoutException {
}
- @Disabled
@Override
public void shouldSuccessfullyProduceMessageWhenGuaranteedDeliveryIsActivatedOnABadRouteButMessageIsNotMandatory()
throws InterruptedException, IOException, TimeoutException {
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/integration/qpid/RabbitMQReConnectionQpidIT.java
similarity index 74%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueUnhandledExceptionQpidTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/qpid/RabbitMQReConnectionQpidIT.java
index cf64af6..60be07f 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/integration/qpid/RabbitMQReConnectionQpidIT.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rabbitmq.qpid;
+package org.apache.camel.component.rabbitmq.integration.qpid;
-import org.apache.camel.component.rabbitmq.integration.RabbitMQRequeueUnhandledExceptionIntTest;
+import org.apache.camel.component.rabbitmq.integration.RabbitMQReConnectionIT;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class RabbitMQRequeueUnhandledExceptionQpidTest extends RabbitMQRequeueUnhandledExceptionIntTest {
+@EnabledIfSystemProperty(named = "rabbitmq.instance.type", matches = "qpid")
+public class RabbitMQReConnectionQpidIT extends RabbitMQReConnectionIT {
}
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/integration/qpid/RabbitMQRequeueQpidIT.java
similarity index 81%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQRequeueQpidTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/qpid/RabbitMQRequeueQpidIT.java
index dcc00cc..928edd6 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/integration/qpid/RabbitMQRequeueQpidIT.java
@@ -14,27 +14,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rabbitmq.qpid;
+package org.apache.camel.component.rabbitmq.integration.qpid;
-import org.apache.camel.component.rabbitmq.integration.RabbitMQRequeueIntTest;
-import org.junit.jupiter.api.Disabled;
+import org.apache.camel.component.rabbitmq.integration.RabbitMQRequeueIT;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class RabbitMQRequeueQpidTest extends RabbitMQRequeueIntTest {
+@EnabledIfSystemProperty(named = "rabbitmq.instance.type", matches = "qpid")
+public class RabbitMQRequeueQpidIT extends RabbitMQRequeueIT {
- @Disabled
@Override
@Test
public void testNoRequeueHeaderCausesReject() throws Exception {
}
- @Disabled
@Override
@Test
public void testNonBooleanRequeueHeaderCausesReject() throws Exception {
}
- @Disabled
@Override
@Test
public void testFalseRequeueHeaderCausesReject() throws Exception {
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/integration/qpid/RabbitMQRequeueUnhandledExceptionQpidIT.java
similarity index 72%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQReConnectionQpidTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/qpid/RabbitMQRequeueUnhandledExceptionQpidIT.java
index 6a583c6..655cd32 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/integration/qpid/RabbitMQRequeueUnhandledExceptionQpidIT.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rabbitmq.qpid;
+package org.apache.camel.component.rabbitmq.integration.qpid;
-import org.apache.camel.component.rabbitmq.integration.RabbitMQReConnectionIntTest;
+import org.apache.camel.component.rabbitmq.integration.RabbitMQRequeueUnhandledExceptionIT;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class RabbitMQReConnectionQpidTest extends RabbitMQReConnectionIntTest {
+@EnabledIfSystemProperty(named = "rabbitmq.instance.type", matches = "qpid")
+public class RabbitMQRequeueUnhandledExceptionQpidIT extends RabbitMQRequeueUnhandledExceptionIT {
}
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/integration/qpid/RabbitMQSuspendResumeQpidIT.java
similarity index 74%
rename from components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/qpid/RabbitMQSupendResumeQpidTest.java
rename to components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/integration/qpid/RabbitMQSuspendResumeQpidIT.java
index 9fc96f5..db68dba 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/integration/qpid/RabbitMQSuspendResumeQpidIT.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.rabbitmq.qpid;
+package org.apache.camel.component.rabbitmq.integration.qpid;
-import org.apache.camel.component.rabbitmq.integration.RabbitMQSupendResumeIntTest;
+import org.apache.camel.component.rabbitmq.integration.RabbitMQSupendResumeIT;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-public class RabbitMQSupendResumeQpidTest extends RabbitMQSupendResumeIntTest {
+@EnabledIfSystemProperty(named = "rabbitmq.instance.type", matches = "qpid")
+public class RabbitMQSuspendResumeQpidIT extends RabbitMQSupendResumeIT {
}
diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/test/infra/services/QpidEmbeddedService.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/test/infra/services/QpidEmbeddedService.java
index 03c0ab6..35ded96 100644
--- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/test/infra/services/QpidEmbeddedService.java
+++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/test/infra/services/QpidEmbeddedService.java
@@ -21,7 +21,7 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.component.rabbitmq.integration.AbstractRabbitMQIntTest;
+import org.apache.camel.component.rabbitmq.integration.AbstractRabbitMQIT;
import org.apache.camel.test.infra.rabbitmq.services.ConnectionProperties;
import org.apache.camel.test.infra.rabbitmq.services.RabbitMQService;
import org.apache.qpid.server.SystemLauncher;
@@ -41,7 +41,7 @@ public class QpidEmbeddedService implements RabbitMQService {
*/
protected static Map<String, Object> createQpidSystemConfig() {
Map<String, Object> attributes = new HashMap<>();
- URL initialConfig = AbstractRabbitMQIntTest.class.getClassLoader().getResource(INITIAL_CONFIGURATION);
+ URL initialConfig = AbstractRabbitMQIT.class.getClassLoader().getResource(INITIAL_CONFIGURATION);
attributes.put(ConfiguredObject.TYPE, "Memory");
attributes.put(SystemConfig.INITIAL_CONFIGURATION_LOCATION, initialConfig.toExternalForm());
attributes.put(SystemConfig.STARTUP_LOGGED_TO_SYSTEM_OUT, false);