Author: orudyy Date: Mon Sep 19 09:44:12 2016 New Revision: 1761411 URL: http://svn.apache.org/viewvc?rev=1761411&view=rev Log: QPID-7422: [Java Tests] Get test configurable timeouts in test setUp
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java?rev=1761411&r1=1761410&r2=1761411&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java (original) +++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java Mon Sep 19 09:44:12 2016 @@ -71,13 +71,7 @@ import org.apache.qpid.test.utils.QpidTe abstract class AbstractQueueTestBase extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(AbstractQueueTestBase.class); - private static final long QUEUE_RUNNER_WAIT_TIME = getLongProperty("AbstractQueueTestBase.queueRunnerWaitTime", 150L); - - static - { - _logger.debug("Using AbstractQueueTestBase.queueRunnerWaitTime {}", QUEUE_RUNNER_WAIT_TIME); - } - + private long _queueRunnerWaitTime; private Queue<?> _queue; private VirtualHost<?> _virtualHost; private String _qname = "qname"; @@ -103,6 +97,8 @@ abstract class AbstractQueueTestBase ext _queue = _virtualHost.createChild(Queue.class, attributes); _exchange = (DirectExchange) _virtualHost.getChildByName(Exchange.class, ExchangeDefaults.DIRECT_EXCHANGE_NAME); + _queueRunnerWaitTime = Long.getLong("AbstractQueueTestBase.queueRunnerWaitTime", 150L); + _logger.debug("Using AbstractQueueTestBase.queueRunnerWaitTime {}", _queueRunnerWaitTime); } @Override @@ -186,7 +182,7 @@ abstract class AbstractQueueTestBase ext // Check sending a message ends up with the subscriber _queue.enqueue(messageA, null, null); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); + Thread.sleep(_queueRunnerWaitTime); assertEquals(messageA, _consumer.getQueueContext().getLastSeenEntry().getMessage()); assertNull(_consumer.getQueueContext().getReleasedEntry()); @@ -211,7 +207,7 @@ abstract class AbstractQueueTestBase ext _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test", EnumSet.of(ConsumerImpl.Option.ACQUIRES, ConsumerImpl.Option.SEES_REQUEUES), 0); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); + Thread.sleep(_queueRunnerWaitTime); assertEquals(messageA, _consumer.getQueueContext().getLastSeenEntry().getMessage()); assertNull("There should be no releasedEntry after an enqueue", _consumer.getQueueContext().getReleasedEntry()); @@ -229,7 +225,7 @@ abstract class AbstractQueueTestBase ext _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test", EnumSet.of(ConsumerImpl.Option.ACQUIRES, ConsumerImpl.Option.SEES_REQUEUES), 0); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); + Thread.sleep(_queueRunnerWaitTime); assertEquals(messageB, _consumer.getQueueContext().getLastSeenEntry().getMessage()); assertNull("There should be no releasedEntry after enqueues", _consumer.getQueueContext().getReleasedEntry()); @@ -252,12 +248,12 @@ abstract class AbstractQueueTestBase ext _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test", EnumSet.of(ConsumerImpl.Option.ACQUIRES, ConsumerImpl.Option.SEES_REQUEUES), 0); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); + Thread.sleep(_queueRunnerWaitTime); assertEquals("Message which was not yet valid was received", 0, _consumerTarget.getMessages().size()); when(messageHeader.getNotValidBefore()).thenReturn(System.currentTimeMillis()-100L); _queue.checkMessageStatus(); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); + Thread.sleep(_queueRunnerWaitTime); assertEquals("Message which was valid was not received", 1, _consumerTarget.getMessages().size()); } @@ -278,7 +274,7 @@ abstract class AbstractQueueTestBase ext _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test", EnumSet.of(ConsumerImpl.Option.ACQUIRES, ConsumerImpl.Option.SEES_REQUEUES), 0); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); + Thread.sleep(_queueRunnerWaitTime); assertEquals("Message was held despite queue not having holding enabled", 1, _consumerTarget.getMessages().size()); @@ -304,14 +300,14 @@ abstract class AbstractQueueTestBase ext _consumer = (QueueConsumer<?>) _queue.addConsumer(_consumerTarget, null, messageA.getClass(), "test", EnumSet.of(ConsumerImpl.Option.ACQUIRES, ConsumerImpl.Option.SEES_REQUEUES), 0); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); + Thread.sleep(_queueRunnerWaitTime); assertEquals("Expect one message (message B)", 1, _consumerTarget.getMessages().size()); assertEquals("Wrong message received", messageB.getMessageHeader().getMessageId(), _consumerTarget.getMessages().get(0).getMessage().getMessageHeader().getMessageId()); when(messageHeader.getNotValidBefore()).thenReturn(System.currentTimeMillis()-100L); _queue.checkMessageStatus(); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); + Thread.sleep(_queueRunnerWaitTime); assertEquals("Message which was valid was not received", 2, _consumerTarget.getMessages().size()); assertEquals("Wrong message received", messageA.getMessageHeader().getMessageId(), _consumerTarget.getMessages().get(1).getMessage().getMessageHeader().getMessageId()); @@ -342,7 +338,7 @@ abstract class AbstractQueueTestBase ext _queue.enqueue(messageB, postEnqueueAction, null); _queue.enqueue(messageC, postEnqueueAction, null); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner Thread + Thread.sleep(_queueRunnerWaitTime); // Work done by QueueRunner Thread assertEquals("Unexpected total number of messages sent to consumer", 3, @@ -355,7 +351,7 @@ abstract class AbstractQueueTestBase ext queueEntries.get(0).release(); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner Thread + Thread.sleep(_queueRunnerWaitTime); // Work done by QueueRunner Thread assertEquals("Unexpected total number of messages sent to consumer", 4, @@ -401,7 +397,7 @@ abstract class AbstractQueueTestBase ext /* Enqueue one message with expiration set for a short time in the future */ - final long expiration = System.currentTimeMillis() + QUEUE_RUNNER_WAIT_TIME; + final long expiration = System.currentTimeMillis() + _queueRunnerWaitTime; when(messageA.getExpiration()).thenReturn(expiration); _queue.enqueue(messageA, postEnqueueAction, null); @@ -476,7 +472,7 @@ abstract class AbstractQueueTestBase ext _queue.enqueue(messageB, postEnqueueAction, null); _queue.enqueue(messageC, postEnqueueAction, null); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner Thread + Thread.sleep(_queueRunnerWaitTime); // Work done by QueueRunner Thread assertEquals("Unexpected total number of messages sent to consumer", 3, @@ -490,7 +486,7 @@ abstract class AbstractQueueTestBase ext queueEntries.get(2).release(); queueEntries.get(0).release(); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner Thread + Thread.sleep(_queueRunnerWaitTime); // Work done by QueueRunner Thread assertEquals("Unexpected total number of messages sent to consumer", 5, @@ -533,7 +529,7 @@ abstract class AbstractQueueTestBase ext _queue.enqueue(messageA, postEnqueueAction, null); _queue.enqueue(messageB, postEnqueueAction, null); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner Thread + Thread.sleep(_queueRunnerWaitTime); // Work done by QueueRunner Thread assertEquals("Unexpected total number of messages sent to both after enqueue", 2, @@ -542,7 +538,7 @@ abstract class AbstractQueueTestBase ext /* Now release the first message only, causing it to be requeued */ queueEntries.get(0).release(); - Thread.sleep(QUEUE_RUNNER_WAIT_TIME); // Work done by QueueRunner Thread + Thread.sleep(_queueRunnerWaitTime); // Work done by QueueRunner Thread assertEquals("Unexpected total number of messages sent to both consumers after release", 3, @@ -570,7 +566,7 @@ abstract class AbstractQueueTestBase ext // Check sending a message ends up with the subscriber _queue.enqueue(messageA, null, null); - final long timeout = System.currentTimeMillis() + QUEUE_RUNNER_WAIT_TIME; + final long timeout = System.currentTimeMillis() + _queueRunnerWaitTime; QueueEntry lastSeen = null; while (timeout > System.currentTimeMillis() && Modified: qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1761411&r1=1761410&r2=1761411&view=diff ============================================================================== --- qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original) +++ qpid/java/trunk/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Mon Sep 19 09:44:12 2016 @@ -340,13 +340,4 @@ public class QpidTestCase extends TestCa } return properties; } - - protected static long getLongProperty(String propertyName, long defaultValue) - { - if (OVERRIDDEN_PROPERTIES.containsKey(propertyName)) - { - return Long.parseLong(OVERRIDDEN_PROPERTIES.getProperty(propertyName)); - } - return Long.getLong(propertyName, defaultValue); - } } Modified: qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1761411&r1=1761410&r2=1761411&view=diff ============================================================================== --- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original) +++ qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Mon Sep 19 09:44:12 2016 @@ -80,9 +80,7 @@ public class QpidBrokerTestCase extends public static final String TOPIC = "topic"; public static final String MANAGEMENT_MODE_PASSWORD = "mm_password"; protected static final Logger _logger = LoggerFactory.getLogger(QpidBrokerTestCase.class); - protected static final long RECEIVE_TIMEOUT = getLongProperty("qpid.test_receive_timeout", 1000L); - protected static final long RECEIVE_LONG_TIMEOUT = getLongProperty("qpid.test_receive_long_timeout", 5000L); - protected static final long RECEIVE_SHORT_TIMEOUT = getLongProperty("qpid.test_receive_short_timeout", 500L); + protected static final long RECEIVE_TIMEOUT = Long.getLong("qpid.test_receive_timeout", 1000L); protected static final String INDEX = "index"; protected static final String CONTENT = "content"; protected static final int DEFAULT_MESSAGE_SIZE = 1024; @@ -313,7 +311,6 @@ public class QpidBrokerTestCase extends /** * Return a Queue specific for this test. * Uses getTestQueueName() as the name of the queue - * */ public Queue getTestQueue() { @@ -323,7 +320,6 @@ public class QpidBrokerTestCase extends /** * Return a Topic specific for this test. * Uses getTestQueueName() as the name of the topic - * */ public Topic getTestTopic() { @@ -400,7 +396,6 @@ public class QpidBrokerTestCase extends { session.commit(); } - } messages.add(next); @@ -425,7 +420,6 @@ public class QpidBrokerTestCase extends message.setIntProperty(INDEX, msgCount); return message; - } public Message createMessage(Session session, int messageSize) throws JMSException @@ -729,6 +723,21 @@ public class QpidBrokerTestCase extends } } + protected long getReceiveTimeout() + { + return Long.getLong("qpid.test_receive_timeout", 1000L); + } + + protected long getLongReceiveTimeout() + { + return Long.getLong("qpid.test_receive_long_timeout", 5000L); + } + + protected long getShortReceiveTimeout() + { + return Long.getLong("qpid.test_receive_short_timeout", 500L); + } + private File getFileFromSiftingAppender(final ch.qos.logback.classic.Logger logger) { String key = MDC.get(QpidTestCase.CLASS_QUALIFIED_TEST_NAME); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java?rev=1761411&r1=1761410&r2=1761411&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java Mon Sep 19 09:44:12 2016 @@ -55,6 +55,16 @@ public class TimeToLiveTest extends Qpid private static final int MSG_COUNT = 50; private static final long SERVER_TTL_TIMEOUT = 60000L; + private long _shortReceiveTimeout; + private long _longReceiveTimeout; + + @Override + public void setUp() throws Exception + { + super.setUp(); + _longReceiveTimeout = getLongReceiveTimeout(); + _shortReceiveTimeout = getShortReceiveTimeout(); + } public void testPassiveTTLWithPrefetch() throws Exception { @@ -155,11 +165,9 @@ public class TimeToLiveTest extends Qpid clientConnection.start(); - //Receive Message 0 - // Set 5s receive time for messages we expect to receive. - Message receivedFirst = consumer.receive(RECEIVE_LONG_TIMEOUT); - Message receivedSecond = consumer.receive(RECEIVE_LONG_TIMEOUT); - Message receivedThird = consumer.receive(RECEIVE_SHORT_TIMEOUT); + Message receivedFirst = consumer.receive(_longReceiveTimeout); + Message receivedSecond = consumer.receive(_longReceiveTimeout); + Message receivedThird = consumer.receive(_shortReceiveTimeout); // Log the messages to help diagnosis incase of failure _logger.info("First:"+receivedFirst); @@ -311,11 +319,9 @@ public class TimeToLiveTest extends Qpid clientConnection.start(); - //Receive Message 0 - // Set 5s receive time for messages we expect to receive. - Message receivedFirst = durableSubscriber.receive(RECEIVE_LONG_TIMEOUT); - Message receivedSecond = durableSubscriber.receive(RECEIVE_LONG_TIMEOUT); - Message receivedThird = durableSubscriber.receive(RECEIVE_SHORT_TIMEOUT); + Message receivedFirst = durableSubscriber.receive(_longReceiveTimeout); + Message receivedSecond = durableSubscriber.receive(_longReceiveTimeout); + Message receivedThird = durableSubscriber.receive(getShortReceiveTimeout()); // Log the messages to help diagnosis incase of failure _logger.info("First:"+receivedFirst); Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java?rev=1761411&r1=1761410&r2=1761411&view=diff ============================================================================== --- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java (original) +++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java Mon Sep 19 09:44:12 2016 @@ -62,16 +62,24 @@ import org.apache.qpid.test.utils.QpidBr public class CommitRollbackTest extends QpidBrokerTestCase { private static final Logger _logger = LoggerFactory.getLogger(CommitRollbackTest.class); - private static final long POSITIVE_TIMEOUT = QpidBrokerTestCase.RECEIVE_TIMEOUT; - private static final long NEGATIVE_TIMEOUT = QpidBrokerTestCase.RECEIVE_SHORT_TIMEOUT; + private long _positiveTimeout; + private long _negativeTimeout; - protected AMQConnection _conn; + private AMQConnection _conn; private Session _session; private MessageProducer _publisher; private Session _pubSession; private MessageConsumer _consumer; private Queue _jmsQueue; + @Override + public void setUp() throws Exception + { + super.setUp(); + _positiveTimeout = getReceiveTimeout(); + _negativeTimeout = getShortReceiveTimeout(); + } + private void newConnection() throws Exception { _logger.debug("calling newConnection()"); @@ -112,7 +120,7 @@ public class CommitRollbackTest extends newConnection(); _logger.info("receiving result"); - Message result = _consumer.receive(NEGATIVE_TIMEOUT); + Message result = _consumer.receive(_negativeTimeout); // commit to ensure message is removed from queue _session.commit(); @@ -142,7 +150,7 @@ public class CommitRollbackTest extends _pubSession.rollback(); _logger.info("receiving result"); - Message result = _consumer.receive(NEGATIVE_TIMEOUT); + Message result = _consumer.receive(_negativeTimeout); assertNull("test message was put and rolled back, but is still present", result); } @@ -167,7 +175,7 @@ public class CommitRollbackTest extends _logger.info("getting test message"); - Message msg = _consumer.receive(POSITIVE_TIMEOUT); + Message msg = _consumer.receive(_positiveTimeout); assertNotNull("retrieved message is null", msg); _logger.info("closing connection"); @@ -176,7 +184,7 @@ public class CommitRollbackTest extends newConnection(); _logger.info("receiving result"); - Message result = _consumer.receive(NEGATIVE_TIMEOUT); + Message result = _consumer.receive(_negativeTimeout); _session.commit(); @@ -205,7 +213,7 @@ public class CommitRollbackTest extends _logger.info("getting test message"); - Message msg = _consumer.receive(POSITIVE_TIMEOUT); + Message msg = _consumer.receive(_positiveTimeout); assertNotNull("retrieved message is null", msg); assertEquals("test message was correct message", MESSAGE_TEXT, ((TextMessage) msg).getText()); @@ -216,7 +224,7 @@ public class CommitRollbackTest extends newConnection(); _logger.info("receiving result"); - Message result = _consumer.receive(POSITIVE_TIMEOUT); + Message result = _consumer.receive(_positiveTimeout); _session.commit(); @@ -245,7 +253,7 @@ public class CommitRollbackTest extends _logger.info("getting test message"); - Message msg = _consumer.receive(POSITIVE_TIMEOUT); + Message msg = _consumer.receive(_positiveTimeout); assertNotNull("retrieved message is null", msg); assertEquals("test message was correct message", MESSAGE_TEXT, ((TextMessage) msg).getText()); @@ -256,7 +264,7 @@ public class CommitRollbackTest extends _logger.info("receiving result"); - Message result = _consumer.receive(POSITIVE_TIMEOUT); + Message result = _consumer.receive(_positiveTimeout); _session.commit(); assertNotNull("test message was consumed and rolled back, but is gone", result); @@ -285,7 +293,7 @@ public class CommitRollbackTest extends _logger.info("getting test message"); - Message msg = _consumer.receive(POSITIVE_TIMEOUT); + Message msg = _consumer.receive(_positiveTimeout); assertNotNull("retrieved message is null", msg); assertEquals("test message was correct message", MESSAGE_TEXT, ((TextMessage) msg).getText()); @@ -300,7 +308,7 @@ public class CommitRollbackTest extends _consumer = _session.createConsumer(_jmsQueue); - Message result = _consumer.receive(POSITIVE_TIMEOUT); + Message result = _consumer.receive(_positiveTimeout); _session.commit(); assertNotNull("test message was consumed and rolled back, but is gone", result); @@ -328,7 +336,7 @@ public class CommitRollbackTest extends _pubSession.commit(); _logger.info("getting test message"); - Message result = _consumer.receive(POSITIVE_TIMEOUT); + Message result = _consumer.receive(_positiveTimeout); assertNotNull("Message received should not be null", result); assertEquals("1", ((TextMessage) result).getText()); @@ -345,7 +353,7 @@ public class CommitRollbackTest extends // Message 2 may be marked as redelivered if it was prefetched. - result = _consumer.receive(POSITIVE_TIMEOUT); + result = _consumer.receive(_positiveTimeout); assertNotNull("Second message was not consumed, but is gone", result); // The first message back will be 2, message 1 has been received but not committed @@ -357,7 +365,7 @@ public class CommitRollbackTest extends fail("First message was received again"); } - result = _consumer.receive(NEGATIVE_TIMEOUT); + result = _consumer.receive(_negativeTimeout); assertNull("test message should be null:" + result, result); _session.commit(); @@ -376,7 +384,7 @@ public class CommitRollbackTest extends _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT)); _pubSession.commit(); - assertNotNull(_consumer.receive(POSITIVE_TIMEOUT)); + assertNotNull(_consumer.receive(_positiveTimeout)); _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT)); @@ -384,14 +392,14 @@ public class CommitRollbackTest extends _pubSession.rollback(); _logger.info("receiving result"); - Message result = _consumer.receive(NEGATIVE_TIMEOUT); + Message result = _consumer.receive(_negativeTimeout); assertNull("test message was put and rolled back, but is still present", result); _publisher.send(_pubSession.createTextMessage(MESSAGE_TEXT)); _pubSession.commit(); - assertNotNull(_consumer.receive(POSITIVE_TIMEOUT)); + assertNotNull(_consumer.receive(_positiveTimeout)); _session.commit(); } @@ -474,7 +482,7 @@ public class CommitRollbackTest extends for (int i=0 ;i< maxPrefetch; i++) { - final Message message = _consumer.receive(POSITIVE_TIMEOUT); + final Message message = _consumer.receive(_positiveTimeout); assertNotNull("Received:" + i, message); assertEquals("Unexpected message received", i, message.getIntProperty(INDEX)); } @@ -484,7 +492,7 @@ public class CommitRollbackTest extends _logger.info("Receiving messages"); - Message result = _consumer.receive(POSITIVE_TIMEOUT); + Message result = _consumer.receive(_positiveTimeout); assertNotNull("Message expected", result); // Expect the first message assertEquals("Unexpected message received", 0, result.getIntProperty(INDEX)); @@ -520,7 +528,7 @@ public class CommitRollbackTest extends final int rollbackTime = 2000; final int numberOfMessages = 1000; final int numberOfConsumers = 2; - final long testTimeout = numberOfMessages * POSITIVE_TIMEOUT / numberOfConsumers; + final long testTimeout = numberOfMessages * _positiveTimeout / numberOfConsumers; sendMessage(_pubSession, _jmsQueue, numberOfMessages); List<ListenableFuture<Void >> consumerFutures = new ArrayList<>(numberOfConsumers); @@ -546,7 +554,7 @@ public class CommitRollbackTest extends while(!shutdown.get()) { - Message m = consumer.receive(POSITIVE_TIMEOUT); + Message m = consumer.receive(_positiveTimeout); if (m != null) { long currentTime = System.currentTimeMillis(); @@ -611,7 +619,7 @@ public class CommitRollbackTest extends finally { threadPool.shutdownNow(); - threadPool.awaitTermination(2 * POSITIVE_TIMEOUT, TimeUnit.SECONDS); + threadPool.awaitTermination(2 * _positiveTimeout, TimeUnit.SECONDS); } } @@ -641,15 +649,15 @@ public class CommitRollbackTest extends _pubSession.commit(); - assertNotNull("two messages were sent, but none has been received", _consumer.receive(POSITIVE_TIMEOUT)); + assertNotNull("two messages were sent, but none has been received", _consumer.receive(_positiveTimeout)); _session.rollback(); _logger.info("receiving result"); - assertNotNull("two messages were sent, but none has been received", _consumer.receive(POSITIVE_TIMEOUT)); - assertNotNull("two messages were sent, but only one has been received", _consumer.receive(POSITIVE_TIMEOUT)); - assertNull("Only two messages were sent, but more have been received", _consumer.receive(NEGATIVE_TIMEOUT)); + assertNotNull("two messages were sent, but none has been received", _consumer.receive(_positiveTimeout)); + assertNotNull("two messages were sent, but only one has been received", _consumer.receive(_positiveTimeout)); + assertNull("Only two messages were sent, but more have been received", _consumer.receive(_negativeTimeout)); _session.commit(); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org