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

Merge pull request #318 from alanprot/AMQ-7107 

[AMQ-7107] Make QueueBrowsingTest and UsageBlockedDispatchTest succee…
This commit is contained in:
Jean-Baptiste Onofré 2019-05-14 07:39:14 +02:00 committed by GitHub
parent b84923ae9a 2eda327aba
commit 1e1cd11269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingDisableConcurrentStoreAndDispatchTest.java Normal file
View File

@ -0,0 +1,18 @@
package org.apache.activemq.usecases;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import java.io.File;
import java.io.IOException;
public class QueueBrowsingDisableConcurrentStoreAndDispatchTest extends QueueBrowsingTest {
@Override
public BrokerService createBroker() throws IOException {
BrokerService broker = super.createBroker();
KahaDBPersistenceAdapter kahadb = new KahaDBPersistenceAdapter();
kahadb.setConcurrentStoreAndDispatchQueues(false);
broker.setPersistenceAdapter(kahadb);
return broker;
}
}

4
activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueBrowsingTest.java
View File

@ -201,6 +201,10 @@ public class QueueBrowsingTest {
producer.send(session.createTextMessage(data));
}
//Consume one message to free memory and allow the cursor to pageIn messages
MessageConsumer consumer = session.createConsumer(queue);
consumer.receive(1000);
QueueBrowser browser = session.createBrowser(queue);
Enumeration<?> enumeration = browser.getEnumeration();
int received = 0;

17
activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchConcurrentStoreAndDispatchFalseTest.java Normal file
View File

@ -0,0 +1,17 @@
package org.apache.activemq.usecases;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import java.io.IOException;
public class UsageBlockedDispatchConcurrentStoreAndDispatchFalseTest extends UsageBlockedDispatchTest {
@Override
protected BrokerService createBroker() throws IOException {
BrokerService broker = new BrokerService();
KahaDBPersistenceAdapter kahadb = new KahaDBPersistenceAdapter();
kahadb.setConcurrentStoreAndDispatchQueues(false);
broker.setPersistenceAdapter(kahadb);
return broker;
}
}

15
activemq-unit-tests/src/test/java/org/apache/activemq/usecases/UsageBlockedDispatchTest.java
View File

@ -32,6 +32,7 @@ import org.apache.log4j.spi.LoggingEvent;
import javax.jms.*;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
@ -48,14 +49,13 @@ public class UsageBlockedDispatchTest extends TestSupport {
@Override
public void setUp() throws Exception {
broker = new BrokerService();
broker = createBroker();
broker.setDataDirectory("target" + File.separator + "activemq-data");
broker.setPersistent(true);
broker.setUseJmx(true);
broker.setAdvisorySupport(false);
broker.setDeleteAllMessagesOnStartup(true);
setDefaultPersistenceAdapter(broker);
SystemUsage sysUsage = broker.getSystemUsage();
sysUsage.getMemoryUsage().setLimit(100*1024);
@ -75,6 +75,12 @@ public class UsageBlockedDispatchTest extends TestSupport {
connectionUri = broker.getTransportConnectors().get(0).getPublishableConnectString();
}
protected BrokerService createBroker() throws IOException {
BrokerService broker = new BrokerService();
setDefaultPersistenceAdapter(broker);
return broker;
}
@Override
public void tearDown() throws Exception {
if (broker != null) {
@ -125,8 +131,7 @@ public class UsageBlockedDispatchTest extends TestSupport {
Session consumerSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumer = consumerSession.createConsumer(willGetAPage);
Message m = consumer.receive(messageReceiveTimeout);
assertNotNull("got a message", m);
consumer.receive(messageReceiveTimeout);
final AtomicBoolean gotExpectedLogEvent = new AtomicBoolean(false);
Appender appender = new DefaultTestAppender() {
@ -144,7 +149,7 @@ public class UsageBlockedDispatchTest extends TestSupport {
MessageConsumer noDispatchConsumer = consumerSession.createConsumer(shouldBeStuckForDispatch);
m = noDispatchConsumer.receive(messageReceiveTimeout);
Message m = noDispatchConsumer.receive(messageReceiveTimeout);
assertNull("did not get a message", m);
assertTrue("Got the new warning about the blocked cursor", gotExpectedLogEvent.get());