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 AD2A3E587 for ; Tue, 5 Feb 2013 20:16:10 +0000 (UTC) Received: (qmail 59681 invoked by uid 500); 5 Feb 2013 20:16:10 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 59653 invoked by uid 500); 5 Feb 2013 20:16:10 -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 59621 invoked by uid 99); 5 Feb 2013 20:16:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 20:16:10 +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, 05 Feb 2013 20:16:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E24E323889CB; Tue, 5 Feb 2013 20:15:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1442723 - /activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java Date: Tue, 05 Feb 2013 20:15:47 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130205201547.E24E323889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Tue Feb 5 20:15:47 2013 New Revision: 1442723 URL: http://svn.apache.org/viewvc?rev=1442723&view=rev Log: Remove use of deprecated asserts and add some logging. Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java?rev=1442723&r1=1442722&r2=1442723&view=diff ============================================================================== --- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java (original) +++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4157Test.java Tue Feb 5 20:15:47 2013 @@ -16,11 +16,16 @@ */ package org.apache.activemq.bugs; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.util.Vector; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; + import javax.jms.BytesMessage; import javax.jms.DeliveryMode; import javax.jms.Destination; @@ -28,6 +33,7 @@ import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; + import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; @@ -35,20 +41,18 @@ import org.apache.activemq.command.Activ import org.apache.activemq.command.ConnectionControl; import org.junit.After; import org.junit.Test; - - -import static junit.framework.Assert.*; +import org.mortbay.log.Log; public class AMQ4157Test { private BrokerService broker; private ActiveMQConnectionFactory connectionFactory; - private Destination destination = new ActiveMQQueue("Test"); - private String payloadString = new String(new byte[8*1024]); - private boolean useBytesMessage= true; + private final Destination destination = new ActiveMQQueue("Test"); + private final String payloadString = new String(new byte[8*1024]); + private final boolean useBytesMessage= true; private final int parallelProducer = 20; private final int parallelConsumer = 100; - private Vector exceptions = new Vector(); + private final Vector exceptions = new Vector(); long toSend = 1000; @Test @@ -90,7 +94,10 @@ public class AMQ4157Test { assertTrue("Producers done in time", executorService.isTerminated()); assertTrue("No exceptions: " + exceptions, exceptions.isEmpty()); - restartBroker(100); + restartBroker(500); + + Log.info("Attempting consume of {} messages", toSend); + consumeMessages(toSend); } @@ -113,7 +120,7 @@ public class AMQ4157Test { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageConsumer consumer = session.createConsumer(destination); for (int i=0; i 0) { + while ( (count.getAndDecrement()) > 0) { Message message = null; if (useBytesMessage) { message = session.createBytesMessage();