Re-enable tests.

spring-projects · Oct 6, 2022 · e0a80e3 · e0a80e3
1 parent 1c59644
commit e0a80e3
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 13 deletions.
diff --git a/...rc/test/java/org/springframework/amqp/rabbit/annotation/EnableRabbitIntegrationTests.java b/...rc/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/...ringframework/amqp/rabbit/connection/LocalizedQueueConnectionFactoryIntegrationTests.java b/...ringframework/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/...it/src/test/java/org/springframework/amqp/rabbit/core/FixedReplyQueueDeadLetterTests.java b/...it/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/...abbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitAdminIntegrationTests.java b/...abbit/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
@@ -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
@@ -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");