MAILBOX-369 Using RabbitMQExtension directly for stabling RabbitMQEventBus concurrent test
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/485dd95e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/485dd95e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/485dd95e Branch: refs/heads/master Commit: 485dd95e27e4ba4323d1a000023243c92b5d8c30 Parents: 61488ef Author: datph <[email protected]> Authored: Fri Jan 18 14:13:34 2019 +0700 Committer: Benoit Tellier <[email protected]> Committed: Tue Jan 22 09:20:12 2019 +0700 ---------------------------------------------------------------------- .../mailbox/events/RabbitMQEventBusTest.java | 47 +++----------------- 1 file changed, 5 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/485dd95e/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java ---------------------------------------------------------------------- diff --git a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java index 6718093..b6f811d 100644 --- a/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java +++ b/mailbox/event/event-rabbitmq/src/test/java/org/apache/james/mailbox/events/RabbitMQEventBusTest.java @@ -56,16 +56,11 @@ import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.model.TestId; import org.apache.james.mailbox.model.TestMessageId; import org.apache.james.util.concurrency.ConcurrentTestRunner; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.AfterEachCallback; -import org.junit.jupiter.api.extension.BeforeEachCallback; -import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.RegisterExtension; import org.mockito.stubbing.Answer; @@ -86,40 +81,8 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, KeyContract.SingleEventBusKeyContract, KeyContract.MultipleEventBusKeyContract, ErrorHandlingContract { - static class RabbitMQEventExtension implements BeforeEachCallback, AfterEachCallback { - static final RabbitMQExtension rabbitMQExtension = new RabbitMQExtension(); - - void startRabbit() { - rabbitMQExtension.beforeAll(null); - } - - void stopRabbit() { - rabbitMQExtension.afterAll(null); - } - - @Override - public void beforeEach(ExtensionContext extensionContext) throws Exception { - rabbitMQExtension.beforeEach(extensionContext); - } - - @Override - public void afterEach(ExtensionContext extensionContext) throws Exception { - rabbitMQExtension.afterEach(extensionContext); - } - } - - @BeforeAll - static void beforeAll() { - testExtension.startRabbit(); - } - - @AfterAll - static void afterAll() { - testExtension.stopRabbit(); - } - @RegisterExtension - static RabbitMQEventExtension testExtension = new RabbitMQEventExtension(); + static RabbitMQExtension rabbitMQExtension = new RabbitMQExtension(); private RabbitMQEventBus eventBus; private RabbitMQEventBus eventBus2; @@ -131,7 +94,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, @BeforeEach void setUp() { - connectionFactory = RabbitMQEventExtension.rabbitMQExtension.getConnectionFactory(); + connectionFactory = rabbitMQExtension.getConnectionFactory(); Mono<Connection> connectionMono = Mono.fromSupplier(connectionFactory::create).cache(); TestId.Factory mailboxIdFactory = new TestId.Factory(); @@ -200,7 +163,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, eventBus.register(listener, registeredGroup); GroupConsumerRetry.RetryExchangeName retryExchangeName = GroupConsumerRetry.RetryExchangeName.of(registeredGroup); - assertThat(testExtension.rabbitMQExtension.managementAPI().listExchanges()) + assertThat(rabbitMQExtension.managementAPI().listExchanges()) .anyMatch(exchange -> exchange.getName().equals(retryExchangeName.asString())); } @@ -281,7 +244,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, } private Event dequeueEvent() { - RabbitMQConnectionFactory connectionFactory = RabbitMQEventExtension.rabbitMQExtension.getConnectionFactory(); + RabbitMQConnectionFactory connectionFactory = rabbitMQExtension.getConnectionFactory(); Receiver receiver = RabbitFlux.createReceiver(new ReceiverOptions().connectionMono(Mono.just(connectionFactory.create()))); byte[] eventInBytes = receiver.consumeAutoAck(MAILBOX_WORK_QUEUE_NAME) @@ -305,7 +268,7 @@ class RabbitMQEventBusTest implements GroupContract.SingleEventBusGroupContract, @BeforeEach void setUp() throws Exception { - rabbitManagementAPI = RabbitMQEventExtension.rabbitMQExtension.managementAPI(); + rabbitManagementAPI = rabbitMQExtension.managementAPI(); } @Nested --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
