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

Updating ActiveMQ into OpenWire tests 

This will fix the testsuite for activemq5-unit-tests
This commit is contained in:
Clebert Suconic 2016-09-13 17:11:08 -04:00
parent 17430b9be1
commit 665281a558
7 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/activemq5-unit-tests/pom.xml
View File

@ -29,7 +29,7 @@
<properties>
<activemq.basedir>${project.basedir}/../..</activemq.basedir>
<activemq5.project.version>5.12.0</activemq5.project.version>
<activemq5.project.version>5.14.0</activemq5.project.version>
<jmdns-version>3.4.1</jmdns-version>
<ftpserver-version>1.0.6</ftpserver-version>
<jmock-version>2.5.1</jmock-version>

12
tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
View File

@ -39,8 +39,10 @@ import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.broker.region.virtual.VirtualDestination;
import org.apache.activemq.command.ActiveMQDestination;
import javax.management.MBeanServer;
@ -159,6 +161,16 @@ public class ArtemisBrokerWrapper extends ArtemisBrokerBase {
}
@Override
public void virtualDestinationAdded(ConnectionContext connectionContext, VirtualDestination virtualDestination) {
}
@Override
public void virtualDestinationRemoved(ConnectionContext connectionContext, VirtualDestination virtualDestination) {
}
private void addServerAcceptor(Configuration serverConfig, BrokerService.ConnectorInfo info) throws Exception {
serverConfig.addAcceptorConfiguration("homePort" + info.uri.getPort(), info.uri.toString());
}

5
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
View File

@ -140,6 +140,11 @@ public class QueueDuplicatesFromStoreTest extends TestCase {
private SubscriptionStatistics subscriptionStatistics = new SubscriptionStatistics();
@Override
public long getPendingMessageSize() {
return 0;
}
@Override
public void add(MessageReference node) throws Exception {
if (enqueueCounter.get() != node.getMessageId().getProducerSequenceId()) {

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

@ -180,6 +180,10 @@ public class SubscriptionAddRemoveQueueTest extends TestCase {
List<MessageReference> dispatched =
Collections.synchronizedList(new ArrayList<MessageReference>());
@Override
public long getPendingMessageSize() {
return 0;
}
@Override
public void acknowledge(ConnectionContext context, MessageAck ack)

10
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java
View File

@ -272,6 +272,11 @@ public class OrderPendingListTest {
private final LinkedList<MessageReference> theList = new LinkedList<>();
@Override
public long messageSize() {
return 0;
}
@Override
public boolean isEmpty() {
return theList.isEmpty();
@ -353,6 +358,11 @@ public class OrderPendingListTest {
messageId = new MessageId(id.generateId() + ":1", sequenceId);
}
@Override
public boolean canProcessAsExpired() {
return false;
}
@Override
public MessageId getMessageId() {
return messageId;

5
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java
View File

@ -193,6 +193,11 @@ public class PrioritizedPendingListTest {
static class TestMessageReference implements MessageReference {
@Override
public boolean canProcessAsExpired() {
return false;
}
private static final IdGenerator id = new IdGenerator();
private Message message;

17
tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java
View File

@ -17,11 +17,13 @@
package org.apache.activemq.transport;
import java.io.IOException;
import java.security.cert.X509Certificate;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.wireformat.WireFormat;
/**
*
@ -36,6 +38,21 @@ public class StubTransport extends TransportSupport {
protected void doStop(ServiceStopper stopper) throws Exception {
}
@Override
public X509Certificate[] getPeerCertificates() {
return new X509Certificate[0];
}
@Override
public void setPeerCertificates(X509Certificate[] x509Certificates) {
}
@Override
public WireFormat getWireFormat() {
return null;
}
@Override
protected void doStart() throws Exception {
}