This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 8d8ec3a5ffa52632f8c2711e7b010e6945572edf Author: Justin Bertram <[email protected]> AuthorDate: Sat Feb 1 13:01:28 2025 -0600 ARTEMIS-5287 use static for fields annotated by @RegisterExtension --- .../activemq/artemis/junit/ActiveMQConsumerResourceTest.java | 4 ++-- .../artemis/junit/ActiveMQDynamicProducerResourceTest.java | 4 ++-- ...tiveMQDynamicProducerResourceWithoutAddressExceptionTest.java | 4 ++-- .../junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java | 4 ++-- .../activemq/artemis/junit/ActiveMQProducerResourceTest.java | 4 ++-- .../junit/EmbeddedActiveMQResourceCustomConfigurationTest.java | 9 +++++---- .../junit/EmbeddedActiveMQResourceFileConfigurationTest.java | 2 +- .../activemq/artemis/junit/EmbeddedActiveMQResourceTest.java | 2 +- .../artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java | 4 ++-- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResourceTest.java b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResourceTest.java index 8b8aa40d00..cba124ef18 100644 --- a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResourceTest.java +++ b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResourceTest.java @@ -52,11 +52,11 @@ public class ActiveMQConsumerResourceTest { @RegisterExtension @Order(1) - public EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); + public static EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); @RegisterExtension @Order(2) - public ActiveMQConsumerExtension consumer = new ActiveMQConsumerExtension(server.getVmURL(), TEST_QUEUE); + public static ActiveMQConsumerExtension consumer = new ActiveMQConsumerExtension(server.getVmURL(), TEST_QUEUE); @Test public void testSendBytes() { diff --git a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java index e86c8c2b16..a8383ecd17 100644 --- a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java +++ b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceTest.java @@ -53,11 +53,11 @@ public class ActiveMQDynamicProducerResourceTest { @RegisterExtension @Order(1) - public EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); + public static EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); @RegisterExtension @Order(2) - public ActiveMQDynamicProducerExtension producer = new ActiveMQDynamicProducerExtension(server.getVmURL(), TEST_QUEUE_ONE); + public static ActiveMQDynamicProducerExtension producer = new ActiveMQDynamicProducerExtension(server.getVmURL(), TEST_QUEUE_ONE); @Test public void testSendBytes() { diff --git a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java index 443828e394..db7d0105ea 100644 --- a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java +++ b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressExceptionTest.java @@ -44,11 +44,11 @@ public class ActiveMQDynamicProducerResourceWithoutAddressExceptionTest { @RegisterExtension @Order(1) - public EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); + public static EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); @RegisterExtension @Order(2) - public ActiveMQDynamicProducerExtension producer = new ActiveMQDynamicProducerExtension(server.getVmURL()); + public static ActiveMQDynamicProducerExtension producer = new ActiveMQDynamicProducerExtension(server.getVmURL()); @BeforeAll public void setUp() throws Exception { diff --git a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java index a3a1d4a39e..f7fcee6013 100644 --- a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java +++ b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResourceWithoutAddressTest.java @@ -54,11 +54,11 @@ public class ActiveMQDynamicProducerResourceWithoutAddressTest { @RegisterExtension @Order(1) - public EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); + public static EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); @RegisterExtension @Order(2) - public ActiveMQDynamicProducerExtension producer = new ActiveMQDynamicProducerExtension(server.getVmURL()); + public static ActiveMQDynamicProducerExtension producer = new ActiveMQDynamicProducerExtension(server.getVmURL()); @BeforeAll public void setUp() { diff --git a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java index e8eddc2e6e..122845e271 100644 --- a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java +++ b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/ActiveMQProducerResourceTest.java @@ -52,11 +52,11 @@ public class ActiveMQProducerResourceTest { @RegisterExtension @Order(1) - public EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); + public static EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); @RegisterExtension @Order(2) - public ActiveMQDynamicProducerExtension producer = new ActiveMQDynamicProducerExtension(server.getVmURL(), TEST_ADDRESS); + public static ActiveMQDynamicProducerExtension producer = new ActiveMQDynamicProducerExtension(server.getVmURL(), TEST_ADDRESS); @Test public void testSendBytes() { diff --git a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java index b1f42d4b1e..552ad586b2 100644 --- a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java +++ b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceCustomConfigurationTest.java @@ -38,11 +38,12 @@ public class EmbeddedActiveMQResourceCustomConfigurationTest { static final String TEST_QUEUE = "test.queue"; static final String TEST_ADDRESS = "test.address"; - QueueConfiguration queueConfiguration = QueueConfiguration.of(TEST_QUEUE).setAddress(TEST_ADDRESS); - Configuration customConfiguration = new ConfigurationImpl().setPersistenceEnabled(false).setSecurityEnabled(true).addQueueConfiguration(queueConfiguration); - @RegisterExtension - public EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(customConfiguration); + public static EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(new ConfigurationImpl() + .setPersistenceEnabled(false) + .setSecurityEnabled(true) + .addQueueConfiguration(QueueConfiguration.of(TEST_QUEUE) + .setAddress(TEST_ADDRESS))); @Test public void testCustomConfiguration() { diff --git a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java index 018680df10..2d41273fd8 100644 --- a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java +++ b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceFileConfigurationTest.java @@ -35,7 +35,7 @@ public class EmbeddedActiveMQResourceFileConfigurationTest { static final String TEST_ADDRESS = "test.address"; @RegisterExtension - public EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension("embedded-artemis-server.xml"); + public static EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension("embedded-artemis-server.xml"); @Test public void testConfiguredQueue() { diff --git a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java index f51b35568d..f581025b8d 100644 --- a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java +++ b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResourceTest.java @@ -52,7 +52,7 @@ public class EmbeddedActiveMQResourceTest { } @RegisterExtension - public EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); + public static EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension(); @BeforeAll public void setUp() { diff --git a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java index e001b0cdee..ecd0bc9705 100644 --- a/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java +++ b/artemis-junit/artemis-junit-5/src/test/java/org/apache/activemq/artemis/junit/MultipleEmbeddedActiveMQResourcesTest.java @@ -43,11 +43,11 @@ public class MultipleEmbeddedActiveMQResourcesTest { @RegisterExtension @Order(1) - public EmbeddedActiveMQExtension serverOne = new EmbeddedActiveMQExtension(1); + public static EmbeddedActiveMQExtension serverOne = new EmbeddedActiveMQExtension(1); @RegisterExtension @Order(2) - public EmbeddedActiveMQExtension serverTwo = new EmbeddedActiveMQExtension(2); + public static EmbeddedActiveMQExtension serverTwo = new EmbeddedActiveMQExtension(2); @BeforeAll public void setUp() throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
