activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
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 GMT
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());      
     }
 



Mime
View raw message