You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/02/04 05:02:41 UTC
[james-project] 15/18: JAMES-3498 Isolation for dead-letter queues
in RabbitMQEventBusTest
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit d2dfb311a7a3584cdf914357aef57bc8735968fb
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Tue Jan 26 08:15:40 2021 +0700
JAMES-3498 Isolation for dead-letter queues in RabbitMQEventBusTest
---
.../events/RabbitMQEventBusDeadLetterQueueUpgradeTest.java | 13 +++++++------
.../java/org/apache/james/events/RabbitMQEventBusTest.java | 3 +++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueUpgradeTest.java b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueUpgradeTest.java
index 9e9f284..137e59c 100644
--- a/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueUpgradeTest.java
+++ b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusDeadLetterQueueUpgradeTest.java
@@ -39,9 +39,12 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import reactor.rabbitmq.QueueSpecification;
class RabbitMQEventBusDeadLetterQueueUpgradeTest {
+ private static final GroupA REGISTERED_GROUP = new GroupA();
+ private static final WorkQueueName WORK_QUEUE_NAME = WorkQueueName.of(REGISTERED_GROUP);
+
@RegisterExtension
static RabbitMQExtension rabbitMQExtension = RabbitMQExtension.singletonRabbitMQ()
- .isolationPolicy(RabbitMQExtension.IsolationPolicy.WEAK);
+ .isolationPolicy(RabbitMQExtension.IsolationPolicy.STRONG);
private RabbitMQEventBus eventBus;
@@ -67,18 +70,16 @@ class RabbitMQEventBusDeadLetterQueueUpgradeTest {
@Test
void eventBusShouldStartWhenDeadLetterUpgradeWasNotPerformed() {
- GroupA registeredGroup = new GroupA();
- WorkQueueName workQueueName = WorkQueueName.of(registeredGroup);
-
+ rabbitMQExtension.getSender().delete(QueueSpecification.queue().name(WORK_QUEUE_NAME.asString())).block();
rabbitMQExtension.getSender()
- .declareQueue(QueueSpecification.queue(workQueueName.asString())
+ .declareQueue(QueueSpecification.queue(WORK_QUEUE_NAME.asString())
.durable(DURABLE)
.exclusive(!EXCLUSIVE)
.autoDelete(!AUTO_DELETE))
.block();
assertThatCode(eventBus::start).doesNotThrowAnyException();
- assertThatCode(() -> eventBus.register(new EventCollector(), registeredGroup)).doesNotThrowAnyException();
+ assertThatCode(() -> eventBus.register(new EventCollector(), REGISTERED_GROUP)).doesNotThrowAnyException();
}
}
diff --git a/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java
index 5641089..b191547 100644
--- a/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java
+++ b/event-bus/distributed/src/test/java/org/apache/james/events/RabbitMQEventBusTest.java
@@ -143,6 +143,9 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract,
rabbitMQExtension.getSender()
.delete(ExchangeSpecification.exchange(MAILBOX_EVENT_EXCHANGE_NAME))
.block();
+ rabbitMQExtension.getSender()
+ .delete(QueueSpecification.queue().name(MAILBOX_EVENT_DEAD_LETTER_QUEUE))
+ .block();
}
private RabbitMQEventBus newEventBus() {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org