cshannon commented on code in PR #1740: URL: https://github.com/apache/activemq/pull/1740#discussion_r2912311886
########## activemq-unit-tests/src/test/java/org/apache/activemq/SyncSendPacketTimeoutTest.java: ########## @@ -0,0 +1,156 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; +import jakarta.jms.Session; + +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.transport.RequestTimedOutIOException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests that {@link ActiveMQConnection#syncSendPacket(org.apache.activemq.command.Command)} + * applies the configured {@code requestTimeout}. + */ +public class SyncSendPacketTimeoutTest { + + private BrokerService broker; + private String brokerUrl; + + @Before + public void setUp() throws Exception { + broker = new BrokerService(); + broker.setPersistent(false); + broker.setUseJmx(false); + broker.addConnector("tcp://localhost:0"); + broker.start(); + broker.waitUntilStarted(); + brokerUrl = broker.getTransportConnectors().get(0).getPublishableConnectString(); + } + + @After + public void tearDown() throws Exception { + if (broker != null) { + broker.stop(); + broker.waitUntilStopped(); + } + } + + @Test + public void testRequestTimeoutDefaultIsZero() throws Exception { + ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(brokerUrl); + try (ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection()) { + assertEquals("Default requestTimeout should be 0", 0, connection.getRequestTimeout()); + } + } + + @Test + public void testRequestTimeoutConfiguredViaFactory() throws Exception { + ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(brokerUrl); + factory.setRequestTimeout(5000); + try (ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection()) { + assertEquals("requestTimeout should be propagated from factory", 5000, connection.getRequestTimeout()); + } + } + + @Test + public void testSyncSendPacketSucceedsWithRequestTimeout() throws Exception { + ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(brokerUrl); + factory.setRequestTimeout(5000); + try (ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection()) { + connection.start(); + // Creating a session triggers syncSendPacket internally — should succeed within timeout + try (Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + // Creating a consumer triggers syncSendPacket internally — should succeed within timeout + MessageConsumer consumer = session.createConsumer(session.createQueue("TEST.QUEUE"))) { + assertNotNull("Session should be created successfully", session); + assertNotNull("Consumer should be created successfully", consumer); + } + } + } + + @Test + public void testSyncSendPacketSucceedsWithoutRequestTimeout() throws Exception { + ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(brokerUrl); + // requestTimeout=0 means no timeout (default) + try (ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection()) { + connection.start(); + try (Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE)) { Review Comment: You need to create a new consumer here as well to test the sync ########## activemq-unit-tests/src/test/java/org/apache/activemq/SyncSendPacketTimeoutTest.java: ########## @@ -0,0 +1,156 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.activemq; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; +import jakarta.jms.Session; + +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ConsumerInfo; +import org.apache.activemq.transport.RequestTimedOutIOException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests that {@link ActiveMQConnection#syncSendPacket(org.apache.activemq.command.Command)} + * applies the configured {@code requestTimeout}. + */ +public class SyncSendPacketTimeoutTest { + + private BrokerService broker; + private String brokerUrl; + + @Before + public void setUp() throws Exception { + broker = new BrokerService(); + broker.setPersistent(false); + broker.setUseJmx(false); + broker.addConnector("tcp://localhost:0"); + broker.start(); + broker.waitUntilStarted(); + brokerUrl = broker.getTransportConnectors().get(0).getPublishableConnectString(); + } + + @After + public void tearDown() throws Exception { + if (broker != null) { + broker.stop(); + broker.waitUntilStopped(); + } + } + + @Test + public void testRequestTimeoutDefaultIsZero() throws Exception { + ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(brokerUrl); + try (ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection()) { + assertEquals("Default requestTimeout should be 0", 0, connection.getRequestTimeout()); + } + } + + @Test + public void testRequestTimeoutConfiguredViaFactory() throws Exception { + ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(brokerUrl); + factory.setRequestTimeout(5000); + try (ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection()) { + assertEquals("requestTimeout should be propagated from factory", 5000, connection.getRequestTimeout()); + } + } + + @Test + public void testSyncSendPacketSucceedsWithRequestTimeout() throws Exception { + ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(brokerUrl); + factory.setRequestTimeout(5000); + try (ActiveMQConnection connection = (ActiveMQConnection) factory.createConnection()) { + connection.start(); + // Creating a session triggers syncSendPacket internally — should succeed within timeout + try (Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + // Creating a consumer triggers syncSendPacket internally — should succeed within timeout + MessageConsumer consumer = session.createConsumer(session.createQueue("TEST.QUEUE"))) { Review Comment: The formatting/indentation seems a bit off here -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
