You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/09/13 21:17:39 UTC
activemq-artemis git commit: Updating ActiveMQ into OpenWire tests
This will fix the testsuite for activemq5-unit-tests
Repository: activemq-artemis
Updated Branches:
refs/heads/master 17430b9be -> 665281a55
Updating ActiveMQ into OpenWire tests
This will fix the testsuite for activemq5-unit-tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/665281a5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/665281a5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/665281a5
Branch: refs/heads/master
Commit: 665281a5583034e143ea60336a20fa88c8925ae0
Parents: 17430b9
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Sep 13 17:11:08 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Sep 13 17:17:12 2016 -0400
----------------------------------------------------------------------
tests/activemq5-unit-tests/pom.xml | 2 +-
.../artemiswrapper/ArtemisBrokerWrapper.java | 12 ++++++++++++
.../region/QueueDuplicatesFromStoreTest.java | 5 +++++
.../region/SubscriptionAddRemoveQueueTest.java | 4 ++++
.../region/cursors/OrderPendingListTest.java | 10 ++++++++++
.../region/cursors/PrioritizedPendingListTest.java | 5 +++++
.../apache/activemq/transport/StubTransport.java | 17 +++++++++++++++++
7 files changed, 54 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/665281a5/tests/activemq5-unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/pom.xml b/tests/activemq5-unit-tests/pom.xml
index 65ada63..2a4dc38 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/665281a5/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
index 9c126e4..c860221 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/ArtemisBrokerWrapper.java
@@ -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());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/665281a5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
index 47c0e09..4eaf3a6 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
@@ -141,6 +141,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()) {
errors.add("Not in sequence at: " + enqueueCounter.get() + ", received: "
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/665281a5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java
index c9d0339..f3e6752 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java
@@ -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)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/665281a5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java
index 0dafbf6..a60cf0c 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/OrderPendingListTest.java
@@ -273,6 +273,11 @@ public class OrderPendingListTest {
private final LinkedList<MessageReference> theList = new LinkedList<>();
@Override
+ public long messageSize() {
+ return 0;
+ }
+
+ @Override
public boolean isEmpty() {
return theList.isEmpty();
}
@@ -354,6 +359,11 @@ public class OrderPendingListTest {
}
@Override
+ public boolean canProcessAsExpired() {
+ return false;
+ }
+
+ @Override
public MessageId getMessageId() {
return messageId;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/665281a5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java
index e48f9db..4ce427d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/PrioritizedPendingListTest.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/665281a5/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java
index 1175e77..5db291e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/transport/StubTransport.java
@@ -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;
/**
*
@@ -37,6 +39,21 @@ public class StubTransport extends TransportSupport {
}
@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 {
}