Set up JMS destination in JUnit extension

Author: acogoluegnes

deps/rabbit/test/amqp_jms_SUITE.erl

@@ -122,21 +122,17 @@ jms_temporary_queue(Config) ->
 
 %% Send different message types from JMS client to JMS client.
 message_types_jms_to_jms(Config) ->
-    TestName = QName = atom_to_binary(?FUNCTION_NAME),
-    ok = declare_queue(QName, <<"quorum">>, Config),
-    ok = run_jms_test(TestName, [{"-Dqueue=~ts", [rabbitmq_amqp_address:queue(QName)]}], Config),
-    ok = delete_queue(QName, Config).
+    TestName = atom_to_binary(?FUNCTION_NAME),
+    ok = run_jms_test(TestName, [], Config).
 
 %% Send different message types from JMS client to Erlang AMQP 1.0 client.
 message_types_jms_to_amqp(Config) ->
     TestName = atom_to_binary(?FUNCTION_NAME),
     ok = run_jms_test(TestName, [], Config).
 
 temporary_queue_rpc(Config) ->
-    TestName = QName = atom_to_binary(?FUNCTION_NAME),
-    ok = declare_queue(QName, <<"classic">>, Config),
-    ok = run_jms_test(TestName, [{"-Dqueue=~ts", [rabbitmq_amqp_address:queue(QName)]}], Config),
-    ok = delete_queue(QName, Config).
+    TestName = atom_to_binary(?FUNCTION_NAME),
+    ok = run_jms_test(TestName, [], Config).
 
 temporary_queue_delete(Config) ->
     TestName = atom_to_binary(?FUNCTION_NAME),

deps/rabbit/test/amqp_jms_SUITE_data/pom.xml

@@ -89,6 +89,26 @@
               <style>GOOGLE</style>
             </googleJavaFormat>
           </java>
+          <ratchetFrom>origin/main</ratchetFrom>
+          <licenseHeader>
+            <content>// The contents of this file are subject to the Mozilla Public License
+              // Version 2.0 (the "License"); you may not use this file except in
+              // compliance with the License. You may obtain a copy of the License
+              // at https://www.mozilla.org/en-US/MPL/2.0/
+              //
+              // Software distributed under the License is distributed on an "AS IS"
+              // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+              // the License for the specific language governing rights and
+              // limitations under the License.
+              //
+              // The Original Code is RabbitMQ.
+              //
+              // The Initial Developer of the Original Code is Pivotal Software, Inc.
+              // Copyright (c) $YEAR Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc.
+              // and/or its subsidiaries. All rights reserved.
+              //
+            </content>
+          </licenseHeader>
         </configuration>
       </plugin>
 

deps/rabbit/test/amqp_jms_SUITE_data/src/test/java/com/rabbitmq/amqp/tests/jms/JmsConnectionTest.java

@@ -14,7 +14,6 @@
 // Copyright (c) 2025 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc.
 // and/or its subsidiaries. All rights reserved.
 //
-
 package com.rabbitmq.amqp.tests.jms;
 
 import static com.rabbitmq.amqp.tests.jms.Cli.startBroker;
@@ -41,20 +40,20 @@
 @JmsTestInfrastructure
 public class JmsConnectionTest {
 
-  String destination;
+  ConnectionFactory factory;
 
   @Test
   @Timeout(30)
   public void testCreateConnection() throws Exception {
-    try (Connection connection = connection()) {
+    try (Connection connection = factory.createConnection()) {
       assertNotNull(connection);
     }
   }
 
   @Test
   @Timeout(30)
   public void testCreateConnectionAndStart() throws Exception {
-    try (Connection connection = connection()) {
+    try (Connection connection = factory.createConnection()) {
       assertNotNull(connection);
       connection.start();
     }
@@ -65,7 +64,6 @@ public void testCreateConnectionAndStart() throws Exception {
   // Currently not supported by RabbitMQ.
   @Disabled
   public void testCreateWithDuplicateClientIdFails() throws Exception {
-    JmsConnectionFactory factory = (JmsConnectionFactory) connectionFactory();
     JmsConnection connection1 = (JmsConnection) factory.createConnection();
     connection1.setClientID("Test");
     assertNotNull(connection1);
@@ -89,7 +87,7 @@ public void testSetClientIdAfterStartedFails() {
     assertThrows(
         JMSException.class,
         () -> {
-          try (Connection connection = connection()) {
+          try (Connection connection = factory.createConnection()) {
             connection.setClientID("Test");
             connection.start();
             connection.setClientID("NewTest");
@@ -100,9 +98,10 @@ public void testSetClientIdAfterStartedFails() {
   @Test
   @Timeout(30)
   public void testCreateConnectionAsSystemAdmin() throws Exception {
-    JmsConnectionFactory factory = (JmsConnectionFactory) connectionFactory();
-    factory.setUsername(adminUsername());
-    factory.setPassword(adminPassword());
+    JmsConnectionFactory f = (JmsConnectionFactory) factory;
+
+    f.setUsername(adminUsername());
+    f.setPassword(adminPassword());
     try (Connection connection = factory.createConnection()) {
       assertNotNull(connection);
       connection.start();
@@ -112,22 +111,21 @@ public void testCreateConnectionAsSystemAdmin() throws Exception {
   @Test
   @Timeout(30)
   public void testCreateConnectionCallSystemAdmin() throws Exception {
-    try (Connection connection =
-        connectionFactory().createConnection(adminUsername(), adminPassword())) {
+    try (Connection connection = factory.createConnection(adminUsername(), adminPassword())) {
       assertNotNull(connection);
       connection.start();
     }
   }
 
   @Test
   @Timeout(30)
-  public void testCreateConnectionAsUnknwonUser() {
+  public void testCreateConnectionAsUnknownUser() {
     assertThrows(
         JMSSecurityException.class,
         () -> {
-          JmsConnectionFactory factory = (JmsConnectionFactory) connectionFactory();
-          factory.setUsername("unknown");
-          factory.setPassword("unknown");
+          JmsConnectionFactory f = (JmsConnectionFactory) factory;
+          f.setUsername("unknown");
+          f.setPassword("unknown");
           try (Connection connection = factory.createConnection()) {
             assertNotNull(connection);
             connection.start();
@@ -137,11 +135,11 @@ public void testCreateConnectionAsUnknwonUser() {
 
   @Test
   @Timeout(30)
-  public void testCreateConnectionCallUnknwonUser() {
+  public void testCreateConnectionCallUnknownUser() {
     assertThrows(
         JMSSecurityException.class,
         () -> {
-          try (Connection connection = connectionFactory().createConnection("unknown", "unknown")) {
+          try (Connection connection = factory.createConnection("unknown", "unknown")) {
             assertNotNull(connection);
             connection.start();
           }
@@ -150,11 +148,10 @@ public void testCreateConnectionCallUnknwonUser() {
 
   @Test
   @Timeout(30)
-  public void testBrokerStopWontHangConnectionClose() throws Exception {
-    Connection connection = connection();
+  public void testBrokerStopWontHangConnectionClose(Queue queue) throws Exception {
+    Connection connection = factory.createConnection();
     Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-    Queue queue = queue(destination);
     connection.start();
 
     MessageProducer producer = session.createProducer(queue);
@@ -179,7 +176,7 @@ public void testBrokerStopWontHangConnectionClose() throws Exception {
   @Timeout(60)
   public void testConnectionExceptionBrokerStop() throws Exception {
     final CountDownLatch latch = new CountDownLatch(1);
-    try (Connection connection = connection()) {
+    try (Connection connection = factory.createConnection()) {
       connection.setExceptionListener(exception -> latch.countDown());
       connection.start();
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

deps/rabbit/test/amqp_jms_SUITE_data/src/test/java/com/rabbitmq/amqp/tests/jms/JmsTemporaryQueueTest.java

@@ -14,11 +14,9 @@
 // Copyright (c) 2025 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc.
 // and/or its subsidiaries. All rights reserved.
 //
-
 package com.rabbitmq.amqp.tests.jms;
 
 import static com.rabbitmq.amqp.tests.jms.TestUtils.brokerUri;
-import static com.rabbitmq.amqp.tests.jms.TestUtils.connection;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -35,13 +33,16 @@
  * Based on
  * https://github.com/apache/qpid-jms/tree/main/qpid-jms-interop-tests/qpid-jms-activemq-tests.
  */
+@JmsTestInfrastructure
 public class JmsTemporaryQueueTest {
 
+  ConnectionFactory factory;
+
   Connection connection;
 
   @BeforeEach
   void init() throws JMSException {
-    connection = connection();
+    connection = factory.createConnection();
   }
 
   @AfterEach