From commits-return-17091-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Fri Sep 30 12:22:15 2011 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 747047472 for ; Fri, 30 Sep 2011 12:22:15 +0000 (UTC) Received: (qmail 12622 invoked by uid 500); 30 Sep 2011 12:22:15 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 12593 invoked by uid 500); 30 Sep 2011 12:22:15 -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 12586 invoked by uid 99); 30 Sep 2011 12:22:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Sep 2011 12:22:15 +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; Fri, 30 Sep 2011 12:22:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D14B12388847 for ; Fri, 30 Sep 2011 12:21:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1177621 - in /activemq/trunk/activemq-core/src/test/java/org/apache/activemq: broker/RedeliveryRestartTest.java transport/failover/FailoverRedeliveryTransactionTest.java Date: Fri, 30 Sep 2011 12:21:53 -0000 To: commits@activemq.apache.org From: gtully@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110930122153.D14B12388847@eris.apache.org> 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