Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-5923 - Increasing test timeout times 

Logging showed that intermittent test failures were caused by not
giving the tests enough time to finish. Also switched message
generation to create random sizes in order to improve testing.
This commit is contained in:
Christopher L. Shannon (cshannon) 2015-09-16 14:57:30 +00:00
parent 4cddd2c015
commit 8a09b7e5f6
8 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/AbstractPendingMessageCursorTest.java
View File

@ -179,7 +179,7 @@ public abstract class AbstractPendingMessageCursorTest extends AbstractStoreStat
verifyStoreStats(dest, 0, 0);
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testTopicMessageSize() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -205,7 +205,7 @@ public abstract class AbstractPendingMessageCursorTest extends AbstractStoreStat
connection.close();
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testTopicNonPersistentMessageSize() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -232,7 +232,7 @@ public abstract class AbstractPendingMessageCursorTest extends AbstractStoreStat
connection.close();
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testTopicPersistentAndNonPersistentMessageSize() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -261,7 +261,7 @@ public abstract class AbstractPendingMessageCursorTest extends AbstractStoreStat
connection.close();
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeOneDurable() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
Connection connection = new ActiveMQConnectionFactory(brokerConnectURI).createConnection();
@ -286,7 +286,7 @@ public abstract class AbstractPendingMessageCursorTest extends AbstractStoreStat
connection.close();
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeOneDurablePartialConsumption() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -312,7 +312,7 @@ public abstract class AbstractPendingMessageCursorTest extends AbstractStoreStat
connection.close();
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeTwoDurables() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -518,7 +518,7 @@ public abstract class AbstractPendingMessageCursorTest extends AbstractStoreStat
MessageProducer prod = session.createProducer(topic);
prod.setDeliveryMode(deliveryMode);
for (int i = 0; i < publishSize; i++) {
prod.send(createMessage(session, AbstractPendingMessageCursorTest.maxMessageSize, publishedMessageSize));
prod.send(createMessage(i, session, AbstractPendingMessageCursorTest.maxMessageSize, publishedMessageSize));
}
} finally {

4
activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java
View File

@ -68,7 +68,7 @@ public class KahaDBPendingMessageCursorTest extends
*
* @throws Exception
*/
@Test(timeout=10000)
@Test(timeout=30000)
public void testDurableMessageSizeAfterRestartAndPublish() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -107,7 +107,7 @@ public class KahaDBPendingMessageCursorTest extends
*
* @throws Exception
*/
@Test(timeout=10000)
@Test(timeout=30000)
public void testNonPersistentDurableMessageSize() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();

6
activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MemoryPendingMessageCursorTest.java
View File

@ -48,7 +48,7 @@ public class MemoryPendingMessageCursorTest extends AbstractPendingMessageCursor
@Override
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeOneDurable() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
Connection connection = new ActiveMQConnectionFactory(brokerConnectURI).createConnection();
@ -77,7 +77,7 @@ public class MemoryPendingMessageCursorTest extends AbstractPendingMessageCursor
}
@Override
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeTwoDurables() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -109,7 +109,7 @@ public class MemoryPendingMessageCursorTest extends AbstractPendingMessageCursor
}
@Override
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeOneDurablePartialConsumption() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();

8
activemq-unit-tests/src/test/java/org/apache/activemq/store/AbstractMessageStoreSizeStatTest.java
View File

@ -92,7 +92,7 @@ public abstract class AbstractMessageStoreSizeStatTest extends AbstractStoreStat
protected abstract void initPersistence(BrokerService brokerService) throws IOException;
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSize() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -100,7 +100,7 @@ public abstract class AbstractMessageStoreSizeStatTest extends AbstractStoreStat
verifyStats(dest, 200, publishedMessageSize.get());
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeAfterConsumption() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -112,7 +112,7 @@ public abstract class AbstractMessageStoreSizeStatTest extends AbstractStoreStat
verifyStats(dest, 0, 0);
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeOneDurable() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
Connection connection = new ActiveMQConnectionFactory(brokerConnectURI).createConnection();
@ -133,7 +133,7 @@ public abstract class AbstractMessageStoreSizeStatTest extends AbstractStoreStat
connection.close();
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeTwoDurables() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
Connection connection = new ActiveMQConnectionFactory(brokerConnectURI).createConnection();

15
activemq-unit-tests/src/test/java/org/apache/activemq/store/AbstractStoreStatTestSupport.java
View File

@ -179,8 +179,7 @@ public abstract class AbstractStoreStatTestSupport {
MessageProducer prod = session.createProducer(queue);
prod.setDeliveryMode(deliveryMode);
for (int i = 0; i < count; i++) {
LOG.info("Publishing message: " + i + ", size: " + messageSize);
prod.send(createMessage(session, messageSize, publishedMessageSize));
prod.send(createMessage(i, session, messageSize, publishedMessageSize));
}
} finally {
@ -230,8 +229,7 @@ public abstract class AbstractStoreStatTestSupport {
MessageProducer prod = session.createProducer(topic);
prod.setDeliveryMode(deliveryMode);
for (int i = 0; i < publishSize; i++) {
LOG.info("Publishing message: " + i + ", size: " + messageSize);
prod.send(createMessage(session, messageSize, publishedMessageSize));
prod.send(createMessage(i, session, messageSize, publishedMessageSize));
}
//verify the view has expected messages
@ -254,14 +252,17 @@ public abstract class AbstractStoreStatTestSupport {
}
/**
* Generate random messages between 100 bytes and messageSize
* Generate random messages between 100 bytes and maxMessageSize
* @param session
* @return
* @throws JMSException
*/
protected BytesMessage createMessage(Session session, int messageSize, AtomicLong publishedMessageSize) throws JMSException {
protected BytesMessage createMessage(int count, Session session, int maxMessageSize, AtomicLong publishedMessageSize) throws JMSException {
final BytesMessage message = session.createBytesMessage();
int size = messageSize;
final Random randomSize = new Random();
int size = randomSize.nextInt((maxMessageSize - 100) + 1) + 100;
LOG.info("Creating message to publish: " + count + ", size: " + size);
if (publishedMessageSize != null) {
publishedMessageSize.addAndGet(size);
}

2
activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java
View File

@ -65,7 +65,7 @@ public class KahaDBMessageStoreSizeStatTest extends
*
* @throws Exception
*/
@Test
@Test(timeout=30000)
public void testMessageSizeAfterRestartAndPublish() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
Destination dest = publishTestQueueMessages(200, publishedMessageSize);

4
activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java
View File

@ -85,7 +85,7 @@ public class MultiKahaDBMessageStoreSizeStatTest extends
*
* @throws Exception
*/
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeAfterRestartAndPublish() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
@ -104,7 +104,7 @@ public class MultiKahaDBMessageStoreSizeStatTest extends
}
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeAfterRestartAndPublishMultiQueue() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
AtomicLong publishedMessageSize2 = new AtomicLong();

4
activemq-unit-tests/src/test/java/org/apache/activemq/store/memory/MemoryMessageStoreSizeStatTest.java
View File

@ -47,7 +47,7 @@ public class MemoryMessageStoreSizeStatTest extends AbstractMessageStoreSizeStat
}
@Override
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeOneDurable() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
Connection connection = new ActiveMQConnectionFactory(brokerConnectURI).createConnection();
@ -72,7 +72,7 @@ public class MemoryMessageStoreSizeStatTest extends AbstractMessageStoreSizeStat
}
@Override
@Test(timeout=10000)
@Test(timeout=30000)
public void testMessageSizeTwoDurables() throws Exception {
AtomicLong publishedMessageSize = new AtomicLong();
Connection connection = new ActiveMQConnectionFactory(brokerConnectURI).createConnection();