Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 66262DF3E for ; Tue, 18 Sep 2012 14:05:54 +0000 (UTC) Received: (qmail 17542 invoked by uid 500); 18 Sep 2012 14:05:54 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 17514 invoked by uid 500); 18 Sep 2012 14:05:54 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 17507 invoked by uid 99); 18 Sep 2012 14:05:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2012 14:05:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2012 14:05:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0E76C23888E4 for ; Tue, 18 Sep 2012 14:05:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1387171 - in /activemq/trunk/activemq-core/src/test/java/org/apache/activemq: network/NetworkRestartTest.java usecases/DurableSubscriptionOfflineTest.java Date: Tue, 18 Sep 2012 14:05:06 -0000 To: commits@activemq.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120918140507.0E76C23888E4@eris.apache.org> 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 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 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 {