diff --git a/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java b/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java index 4a4c7e6a65..2449fc01b8 100644 --- a/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java @@ -69,7 +69,7 @@ public class NetworkRestartTest extends TestSupport { localProducer.send(localSession.createTextMessage("after")); - Message after = remoteConsumer.receive(1000); + Message after = remoteConsumer.receive(3000); assertNotNull(after); assertEquals("after", ((TextMessage)after).getText()); @@ -104,7 +104,7 @@ public class NetworkRestartTest extends TestSupport { localProducer.send(localSession.createTextMessage("after")); - Message after = remoteConsumer.receive(1000); + Message after = remoteConsumer.receive(3000); assertNotNull(after); assertEquals("after", ((TextMessage)after).getText()); } diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java index 16dc2fb7ad..92e9fe14b9 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java @@ -16,6 +16,9 @@ */ package org.apache.activemq.usecases; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Random; import java.util.HashSet; import java.util.Vector; @@ -56,7 +59,7 @@ public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupp public boolean keepDurableSubsActive = true; private BrokerService broker; private ActiveMQTopic topic; - private Vector exceptions = new Vector(); + private List exceptions = new ArrayList(); protected ActiveMQConnectionFactory createConnectionFactory() throws Exception { ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://" + getName(true)); @@ -1661,7 +1664,7 @@ public class DurableSubscriptionOfflineTest extends org.apache.activemq.TestSupp } executorService.shutdown(); executorService.awaitTermination(10, TimeUnit.MINUTES); - assertTrue("No exceptions " + exceptions.elements(), exceptions.isEmpty()); + assertTrue("No exceptions expected, but was: " + exceptions, exceptions.isEmpty()); } public static class Listener implements MessageListener {