From e0a80e372fe0e5954ddc734e2fbbf5aabe457fc9 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 6 Oct 2022 11:45:11 -0400 Subject: [PATCH] Re-enable tests. --- .../amqp/rabbit/annotation/EnableRabbitIntegrationTests.java | 2 -- .../LocalizedQueueConnectionFactoryIntegrationTests.java | 3 --- .../amqp/rabbit/core/FixedReplyQueueDeadLetterTests.java | 2 -- .../amqp/rabbit/core/RabbitAdminIntegrationTests.java | 2 -- .../org/springframework/amqp/rabbit/core/RabbitAdminTests.java | 2 -- .../springframework/amqp/rabbit/core/RabbitRestApiTests.java | 2 -- 6 files changed, 13 deletions(-) diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java index 45505f86be..84196b3697 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java @@ -47,7 +47,6 @@ import org.aopalliance.intercept.MethodInvocation; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -833,7 +832,6 @@ public void testHeadersExchange() throws Exception { } @Test - @Disabled("Temporary until SF uses Micrometer snaps") public void deadLetterOnDefaultExchange() { this.rabbitTemplate.convertAndSend("amqp656", "foo"); assertThat(this.rabbitTemplate.receiveAndConvert("amqp656dlq", 10000)).isEqualTo("foo"); diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/LocalizedQueueConnectionFactoryIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/LocalizedQueueConnectionFactoryIntegrationTests.java index 24f1deb319..833ca51101 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/LocalizedQueueConnectionFactoryIntegrationTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/connection/LocalizedQueueConnectionFactoryIntegrationTests.java @@ -22,7 +22,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.amqp.core.Queue; @@ -36,7 +35,6 @@ * @author Gary Russell */ @RabbitAvailable(management = true) -@Disabled("Temporary until SF uses Micrometer snaps") public class LocalizedQueueConnectionFactoryIntegrationTests { private LocalizedQueueConnectionFactory lqcf; @@ -63,7 +61,6 @@ public void tearDown() { } @Test - @Disabled("Temporary until SF uses Micrometer snaps") public void testConnect() throws Exception { RabbitAdmin admin = new RabbitAdmin(this.lqcf); Queue queue = new Queue(UUID.randomUUID().toString(), false, false, true); diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/FixedReplyQueueDeadLetterTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/FixedReplyQueueDeadLetterTests.java index f7e862321d..3f35ba7cd6 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/FixedReplyQueueDeadLetterTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/FixedReplyQueueDeadLetterTests.java @@ -27,7 +27,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.amqp.core.Binding; @@ -64,7 +63,6 @@ @SpringJUnitConfig @DirtiesContext @RabbitAvailable(management = true) -@Disabled("Temporary until SF uses Micrometer snaps") public class FixedReplyQueueDeadLetterTests { private static BrokerRunningSupport brokerRunning; diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminIntegrationTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminIntegrationTests.java index 85cdc2b05c..8d07737aa1 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminIntegrationTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminIntegrationTests.java @@ -26,7 +26,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.amqp.AmqpIOException; @@ -63,7 +62,6 @@ * @author Artem Bilan */ @RabbitAvailable(management = true) -@Disabled("Temporary until SF uses Micrometer snaps") public class RabbitAdminIntegrationTests { private final CachingConnectionFactory connectionFactory = new CachingConnectionFactory(); diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminTests.java index d617d52773..23dad0c9e1 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminTests.java @@ -46,7 +46,6 @@ import java.util.concurrent.TimeoutException; import org.apache.commons.logging.Log; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -100,7 +99,6 @@ * */ @RabbitAvailable(management = true) -@Disabled("Temporary until SF uses Micrometer snaps") public class RabbitAdminTests { @Test diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitRestApiTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitRestApiTests.java index a4e5178f8e..c70718f512 100644 --- a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitRestApiTests.java +++ b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitRestApiTests.java @@ -29,7 +29,6 @@ import java.util.UUID; import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.amqp.AmqpException; @@ -57,7 +56,6 @@ * */ @RabbitAvailable(management = true) -@Disabled("Temporary until SF uses Micrometer snaps") public class RabbitRestApiTests { private final CachingConnectionFactory connectionFactory = new CachingConnectionFactory("localhost");