svn commit: r1177621 - in /activemq/trunk/activemq-core/src/test/java/org/apache/activemq: broker/RedeliveryRestartTest.java transport/failover/FailoverRedeliveryTransactionTest.java

[gtully]

Author: gtully
Date: Fri Sep 30 12:21:53 2011
New Revision: 1177621

URL: http://svn.apache.org/viewvc?rev=1177621&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3519 - allign tests with last minute 
attribute name change

Modified:
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
    
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java?rev=1177621&r1=1177620&r2=1177621&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/RedeliveryRestartTest.java
 Fri Sep 30 12:21:53 2011
@@ -45,7 +45,7 @@ public class RedeliveryRestartTest exten
     public void testValidateRedeliveryFlagAfterRestart() throws Exception {
 
         ConnectionFactory connectionFactory =
-                new ActiveMQConnectionFactory("failover:(" + 
broker.getTransportConnectors().get(0).getPublishableConnectString() + 
")?jms.immediateAck=true");
+                new ActiveMQConnectionFactory("failover:(" + 
broker.getTransportConnectors().get(0).getPublishableConnectString() + 
")?jms.transactedIndividualAck=true");
         ActiveMQConnection connection = (ActiveMQConnection) 
connectionFactory.createConnection();
         connection.start();
 
@@ -96,7 +96,7 @@ public class RedeliveryRestartTest exten
 
     public void testValidateRedeliveryFlagAfterRecovery() throws Exception {
         ConnectionFactory connectionFactory =
-                new 
ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getPublishableConnectString()
 + "?jms.immediateAck=true");
+                new 
ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getPublishableConnectString()
 + "?jms.transactedIndividualAck=true");
         ActiveMQConnection connection = (ActiveMQConnection) 
connectionFactory.createConnection();
         connection.start();
 
@@ -122,7 +122,7 @@ public class RedeliveryRestartTest exten
         broker.start();
 
         connectionFactory =
-                new 
ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getPublishableConnectString()
 + "?jms.immediateAck=true");
+                new 
ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getPublishableConnectString()
 + "?jms.transactedIndividualAck=true");
         connection = (ActiveMQConnection) connectionFactory.createConnection();
         connection.start();
 

Modified: 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java?rev=1177621&r1=1177620&r2=1177621&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
 (original)
+++ 
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverRedeliveryTransactionTest.java
 Fri Sep 30 12:21:53 2011
@@ -32,7 +32,7 @@ public class FailoverRedeliveryTransacti
     @Override
     public void configureConnectionFactory(ActiveMQConnectionFactory factory) {
         super.configureConnectionFactory(factory);
-        factory.setImmediateAck(true);
+        factory.setTransactedIndividualAck(true);
     }
 
     @Override