Use custom @AmqpTestInfrastructure annotation in tests

Author: acogoluegnes

src/test/java/com/rabbitmq/client/amqp/impl/AddressFormatTest.java

@@ -24,9 +24,8 @@
 import com.rabbitmq.client.amqp.*;
 import java.util.concurrent.CountDownLatch;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class AddressFormatTest {
 
   Connection connection;

src/test/java/com/rabbitmq/client/amqp/impl/AffinityTest.java

@@ -24,11 +24,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class AffinityTest {
 
   Environment environment;

src/test/java/com/rabbitmq/client/amqp/impl/AlarmsTest.java

@@ -23,11 +23,10 @@
 import com.rabbitmq.client.amqp.*;
 import java.time.Duration;
 import org.apache.qpid.protonj2.client.exceptions.ClientSendTimedOutException;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 @DisabledIfRabbitMqCtlNotSet
 public class AlarmsTest {
 

src/test/java/com/rabbitmq/client/amqp/impl/AmqpConsumerTest.java

@@ -35,9 +35,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
-import org.junit.jupiter.api.extension.ExtendWith;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class AmqpConsumerTest {
 
   // used by the test extension

src/test/java/com/rabbitmq/client/amqp/impl/AmqpTest.java

@@ -42,12 +42,11 @@
 import java.util.function.Consumer;
 import java.util.stream.IntStream;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class AmqpTest {
 
   Connection connection;

src/test/java/com/rabbitmq/client/amqp/impl/AmqpTestInfrastructureExtension.java

@@ -26,7 +26,7 @@
 import java.lang.reflect.Field;
 import org.junit.jupiter.api.extension.*;
 
-class AmqpTestInfrastructureExtension
+final class AmqpTestInfrastructureExtension
     implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
 
   private static final ExtensionContext.Namespace NAMESPACE =

src/test/java/com/rabbitmq/client/amqp/impl/AuthorizationTest.java

@@ -29,9 +29,8 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.apache.qpid.protonj2.client.exceptions.ClientSessionRemotelyClosedException;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class AuthorizationTest {
 
   private static final String VH = "test_amqp";

src/test/java/com/rabbitmq/client/amqp/impl/ConsumerOutcomeTest.java

@@ -37,9 +37,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
-import org.junit.jupiter.api.extension.ExtendWith;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class ConsumerOutcomeTest {
 
   private static final String ANNOTATION_KEY = "x-opt-foo";

src/test/java/com/rabbitmq/client/amqp/impl/ManagementTest.java

@@ -27,9 +27,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class ManagementTest {
 
   AmqpConnection connection;

src/test/java/com/rabbitmq/client/amqp/impl/ResourceListenerTest.java

@@ -31,11 +31,10 @@
 import org.assertj.core.api.Assertions;
 import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class ResourceListenerTest {
 
   Connection connection;

src/test/java/com/rabbitmq/client/amqp/impl/RpcTest.java

@@ -32,11 +32,10 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.IntStream;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class RpcTest {
 
   private static final RpcServer.Handler HANDLER =

src/test/java/com/rabbitmq/client/amqp/impl/TlsTest.java

@@ -31,10 +31,9 @@
 import java.util.stream.IntStream;
 import javax.net.ssl.*;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 @DisabledIfTlsNotEnabled
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class TlsTest {
 
   static Environment environment;

src/test/java/com/rabbitmq/client/amqp/impl/TopologyRecoveryTest.java

@@ -33,12 +33,11 @@
 import java.util.stream.IntStream;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 @TestUtils.DisabledIfRabbitMqCtlNotSet
-@ExtendWith(AmqpTestInfrastructureExtension.class)
+@AmqpTestInfrastructure
 public class TopologyRecoveryTest {
 
   static final BackOffDelayPolicy BACK_OFF_DELAY_POLICY = BackOffDelayPolicy.fixed(ofMillis(100));