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

remove duplicate test and add auto fail, see if we can find why it hangs in hudson 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071323 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2011-02-16 17:42:19 +00:00
parent 6f68a94319
commit e8d9b709e0
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
activemq-core/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
View File

@ -33,7 +33,9 @@ import javax.management.ObjectName;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.CombinationTestSupport;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerTestSupport;
import org.apache.activemq.broker.jmx.QueueViewMBean; import org.apache.activemq.broker.jmx.QueueViewMBean;
import org.apache.activemq.broker.region.policy.FilePendingQueueMessageStoragePolicy; import org.apache.activemq.broker.region.policy.FilePendingQueueMessageStoragePolicy;
import org.apache.activemq.broker.region.policy.PendingQueueMessageStoragePolicy; import org.apache.activemq.broker.region.policy.PendingQueueMessageStoragePolicy;
@ -43,8 +45,9 @@ import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
public class QueuePurgeTest extends TestCase { public class QueuePurgeTest extends CombinationTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(QueuePurgeTest.class); private static final Logger LOG = LoggerFactory.getLogger(QueuePurgeTest.class);
private static final int NUM_TO_SEND = 40000;
private final String MESSAGE_TEXT = new String(new byte[1024]); private final String MESSAGE_TEXT = new String(new byte[1024]);
BrokerService broker; BrokerService broker;
ConnectionFactory factory; ConnectionFactory factory;
@ -54,12 +57,17 @@ public class QueuePurgeTest extends TestCase {
MessageConsumer consumer; MessageConsumer consumer;
protected void setUp() throws Exception { protected void setUp() throws Exception {
setMaxTestTime(10*60*1000); // 10 mins
setAutoFail(true);
super.setUp();
broker = new BrokerService(); broker = new BrokerService();
broker.setDataDirectory("target/activemq-data");
File testDataDir = new File("target/activemq-data/QueuePurgeTest");
broker.setDataDirectoryFile(testDataDir);
broker.setUseJmx(true); broker.setUseJmx(true);
broker.setDeleteAllMessagesOnStartup(true); broker.setDeleteAllMessagesOnStartup(true);
KahaDBPersistenceAdapter persistenceAdapter = new KahaDBPersistenceAdapter(); KahaDBPersistenceAdapter persistenceAdapter = new KahaDBPersistenceAdapter();
persistenceAdapter.setDirectory(new File("target/activemq-data/kahadb/QueuePurgeTest")); persistenceAdapter.setDirectory(new File(testDataDir, "kahadb"));
broker.setPersistenceAdapter(persistenceAdapter); broker.setPersistenceAdapter(persistenceAdapter);
broker.addConnector("tcp://localhost:0"); broker.addConnector("tcp://localhost:0");
broker.start(); broker.start();
@ -69,6 +77,7 @@ public class QueuePurgeTest extends TestCase {
} }
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
super.tearDown();
if (consumer != null) { if (consumer != null) {
consumer.close(); consumer.close();
} }
@ -78,19 +87,9 @@ public class QueuePurgeTest extends TestCase {
broker.stop(); broker.stop();
} }
public void testPurgeQueueWithActiveConsumer() throws Exception { public void testPurgeLargeQueue() throws Exception {
createProducerAndSendMessages(10000);
QueueViewMBean proxy = getProxyToQueueViewMBean();
createConsumer();
proxy.purge();
assertEquals("Queue size is not zero, it's " + proxy.getQueueSize(), 0,
proxy.getQueueSize());
}
public void testPurgeLargeQueue() throws Exception {
applyBrokerSpoolingPolicy(); applyBrokerSpoolingPolicy();
createProducerAndSendMessages(90000); createProducerAndSendMessages(NUM_TO_SEND);
QueueViewMBean proxy = getProxyToQueueViewMBean(); QueueViewMBean proxy = getProxyToQueueViewMBean();
LOG.info("purging.."); LOG.info("purging..");
proxy.purge(); proxy.purge();
@ -103,11 +102,11 @@ public class QueuePurgeTest extends TestCase {
applyBrokerSpoolingPolicy(); applyBrokerSpoolingPolicy();
final int exprityPeriod = 1000; final int exprityPeriod = 1000;
applyExpiryDuration(exprityPeriod); applyExpiryDuration(exprityPeriod);
createProducerAndSendMessages(90000); createProducerAndSendMessages(NUM_TO_SEND);
QueueViewMBean proxy = getProxyToQueueViewMBean(); QueueViewMBean proxy = getProxyToQueueViewMBean();
LOG.info("waiting for expiry to kick in a bunch of times to verify it does not blow mem"); LOG.info("waiting for expiry to kick in a bunch of times to verify it does not blow mem");
Thread.sleep(10000); Thread.sleep(10000);
assertEquals("Queue size is has not changed " + proxy.getQueueSize(), 90000, assertEquals("Queue size is has not changed " + proxy.getQueueSize(), NUM_TO_SEND,
proxy.getQueueSize()); proxy.getQueueSize());
} }
@ -129,7 +128,7 @@ public class QueuePurgeTest extends TestCase {
public void testPurgeLargeQueueWithConsumer() throws Exception { public void testPurgeLargeQueueWithConsumer() throws Exception {
applyBrokerSpoolingPolicy(); applyBrokerSpoolingPolicy();
createProducerAndSendMessages(90000); createProducerAndSendMessages(NUM_TO_SEND);
QueueViewMBean proxy = getProxyToQueueViewMBean(); QueueViewMBean proxy = getProxyToQueueViewMBean();
createConsumer(); createConsumer();
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
@ -158,7 +157,7 @@ public class QueuePurgeTest extends TestCase {
MessageProducer producer = session.createProducer(queue); MessageProducer producer = session.createProducer(queue);
for (int i = 0; i < numToSend; i++) { for (int i = 0; i < numToSend; i++) {
TextMessage message = session.createTextMessage(MESSAGE_TEXT + i); TextMessage message = session.createTextMessage(MESSAGE_TEXT + i);
if (i != 0 && i % 50000 == 0) { if (i != 0 && i % 10000 == 0) {
LOG.info("sent: " + i); LOG.info("sent: " + i);
} }
producer.send(message); producer.send(message);