You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2012/09/18 16:05:06 UTC
svn commit: r1387171 - in
/activemq/trunk/activemq-core/src/test/java/org/apache/activemq:
network/NetworkRestartTest.java usecases/DurableSubscriptionOfflineTest.java
Author: davsclaus
Date: Tue Sep 18 14:05:06 2012
New Revision: 1387171
URL: http://svn.apache.org/viewvc?rev=1387171&view=rev
Log:
Fixed test on slow servers
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java?rev=1387171&r1=1387170&r2=1387171&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java Tue Sep 18 14:05:06 2012
@@ -69,7 +69,7 @@ public class NetworkRestartTest extends
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
localProducer.send(localSession.createTextMessage("after"));
- Message after = remoteConsumer.receive(1000);
+ Message after = remoteConsumer.receive(3000);
assertNotNull(after);
assertEquals("after", ((TextMessage)after).getText());
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java?rev=1387171&r1=1387170&r2=1387171&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionOfflineTest.java Tue Sep 18 14:05:06 2012
@@ -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 DurableSubscriptionOfflineT
public boolean keepDurableSubsActive = true;
private BrokerService broker;
private ActiveMQTopic topic;
- private Vector<Throwable> exceptions = new Vector<Throwable>();
+ private List<Throwable> exceptions = new ArrayList<Throwable>();
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://" + getName(true));
@@ -1661,7 +1664,7 @@ public class DurableSubscriptionOfflineT
}
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 {