From commits-return-11854-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Thu Sep 24 20:09:20 2009 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 78454 invoked from network); 24 Sep 2009 20:09:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Sep 2009 20:09:20 -0000 Received: (qmail 16638 invoked by uid 500); 24 Sep 2009 20:09:20 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 16590 invoked by uid 500); 24 Sep 2009 20:09:20 -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 16581 invoked by uid 99); 24 Sep 2009 20:09:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 20:09:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 24 Sep 2009 20:09:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 343D82388906; Thu, 24 Sep 2009 20:08:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818615 - in /activemq/branches/activemq-5.3: ./ activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java Date: Thu, 24 Sep 2009 20:08:57 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090924200858.343D82388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Thu Sep 24 20:08:56 2009 New Revision: 818615 URL: http://svn.apache.org/viewvc?rev=818615&view=rev Log: merging rev 818609: Test case fix JMSConsumerTest Modified: activemq/branches/activemq-5.3/ (props changed) activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java Propchange: activemq/branches/activemq-5.3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 24 20:08:56 2009 @@ -1 +1 @@ -/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516 +/activemq/trunk:816278-816279,816298,818138,818140-818147,818155,818160-818176,818209,818211,818224-818262,818480,818484,818487,818496,818502,818504-818510,818513-818516,818609 Modified: activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java?rev=818615&r1=818614&r2=818615&view=diff ============================================================================== --- activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java (original) +++ activemq/branches/activemq-5.3/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java Thu Sep 24 20:08:56 2009 @@ -363,7 +363,7 @@ public void initCombosForTestMessageListenerOnMessageCloseUnackedWithPrefetch1StayInQueue() { addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)}); - addCombinationValues("ackMode", new Object[] {Integer.valueOf(Session.DUPS_OK_ACKNOWLEDGE)}); + addCombinationValues("ackMode", new Object[] {Integer.valueOf(Session.CLIENT_ACKNOWLEDGE)}); addCombinationValues("destinationType", new Object[] {Byte.valueOf(ActiveMQDestination.QUEUE_TYPE)}); } @@ -398,6 +398,7 @@ connection.close(); got2Done.countDown(); } + tm.acknowledge(); } catch (Throwable e) { e.printStackTrace(); } @@ -442,7 +443,7 @@ assertTrue(done2.await(1000, TimeUnit.MILLISECONDS)); Thread.sleep(200); - // assert msg 2 was redelivered as close() from onMessages() will only ack in auto_ack mode + // assert msg 2 was redelivered as close() from onMessages() will only ack in auto_ack and dups_ok mode assertEquals(5, counter.get()); }