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

apply patch for: https://issues.apache.org/jira/browse/AMQ-3930 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1404757 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2012-11-01 20:45:11 +00:00
parent ec231d38b1
commit af4edb335a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java
View File

@ -24,26 +24,32 @@ import javax.jms.MessageConsumer;
import javax.jms.MessageListener; import javax.jms.MessageListener;
import javax.jms.ObjectMessage; import javax.jms.ObjectMessage;
import javax.jms.Session; import javax.jms.Session;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.kaha.impl.async.AsyncDataManager; import org.apache.activemq.kaha.impl.async.AsyncDataManager;
import org.apache.activemq.store.amq.AMQPersistenceAdapter; import org.apache.activemq.store.amq.AMQPersistenceAdapter;
import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory; import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
import org.junit.*;
import org.junit.rules.TestName;
import static org.junit.Assert.assertEquals;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/* /*
* see https://issues.apache.org/activemq/browse/AMQ-1926 * see https://issues.apache.org/activemq/browse/AMQ-1926
*/ */
public class DataFileNotDeletedTest extends TestCase { public class DataFileNotDeletedTest {
@Rule
public TestName testName = new TestName();
private static final Logger LOG = LoggerFactory.getLogger(DataFileNotDeletedTest.class); private static final Logger LOG = LoggerFactory.getLogger(DataFileNotDeletedTest.class);
private final CountDownLatch latch = new CountDownLatch(max_messages); private final CountDownLatch latch = new CountDownLatch(max_messages);
private final static int max_messages = 600; private final static int max_messages = 600;
private static int messageCounter; private static int messageCounter;
private final String destinationName = getName()+"_Queue"; private final String destinationName = testName.getMethodName()+"_Queue";
private BrokerService broker; private BrokerService broker;
private Connection receiverConnection; private Connection receiverConnection;
private Connection producerConnection; private Connection producerConnection;
@ -53,7 +59,7 @@ public class DataFileNotDeletedTest extends TestCase {
AMQPersistenceAdapter persistentAdapter; AMQPersistenceAdapter persistentAdapter;
protected static final String payload = new String(new byte[512]); protected static final String payload = new String(new byte[512]);
@Override @Before
public void setUp() throws Exception { public void setUp() throws Exception {
messageCounter = 0; messageCounter = 0;
startBroker(); startBroker();
@ -63,17 +69,20 @@ public class DataFileNotDeletedTest extends TestCase {
producerConnection.start(); producerConnection.start();
} }
@Override @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
receiverConnection.close(); receiverConnection.close();
producerConnection.close(); producerConnection.close();
broker.stop(); broker.stop();
} }
@Test
public void testForDataFileNotDeleted() throws Exception { public void testForDataFileNotDeleted() throws Exception {
doTestForDataFileNotDeleted(false); doTestForDataFileNotDeleted(false);
} }
@Ignore(value="See AMQ-3930")
@Test
public void testForDataFileNotDeletedTransacted() throws Exception { public void testForDataFileNotDeletedTransacted() throws Exception {
doTestForDataFileNotDeleted(true); doTestForDataFileNotDeleted(true);
} }