Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 25605 invoked from network); 29 Nov 2007 15:03:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Nov 2007 15:03:52 -0000 Received: (qmail 90005 invoked by uid 500); 29 Nov 2007 15:03:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 89946 invoked by uid 500); 29 Nov 2007 15:03:39 -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 89937 invoked by uid 99); 29 Nov 2007 15:03:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Nov 2007 07:03:39 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Nov 2007 15:03:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4051A1A9832; Thu, 29 Nov 2007 07:03:31 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r599470 - /activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java Date: Thu, 29 Nov 2007 15:03:30 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071129150331.4051A1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rajdavies Date: Thu Nov 29 07:03:29 2007 New Revision: 599470 URL: http://svn.apache.org/viewvc?rev=599470&view=rev Log: updated so that we can use delete the db on start-up Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java?rev=599470&r1=599469&r2=599470&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java (original) +++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java Thu Nov 29 07:03:29 2007 @@ -64,7 +64,7 @@ consumerConnection.start(); consumerConnection.close(); broker.stop(); - broker =createBroker(); + broker =createBroker(false); Connection producerConnection = factory.createConnection(); @@ -82,7 +82,7 @@ } producerConnection.close(); broker.stop(); - broker =createBroker(); + broker =createBroker(false); consumerConnection = factory.createConnection(); consumerConnection.setClientID(CONSUMER_NAME); @@ -105,7 +105,7 @@ protected void setUp() throws Exception { if (broker == null) { - broker = createBroker(); + broker = createBroker(true); } @@ -131,19 +131,19 @@ * * @throws Exception */ - protected BrokerService createBroker() throws Exception { + protected BrokerService createBroker(boolean deleteStore) throws Exception { BrokerService answer = new BrokerService(); - configureBroker(answer); + configureBroker(answer,deleteStore); answer.start(); return answer; } - protected void configureBroker(BrokerService answer) throws Exception { + protected void configureBroker(BrokerService answer,boolean deleteStore) throws Exception { + answer.setDeleteAllMessagesOnStartup(deleteStore); answer.addConnector(bindAddress); - answer.setDeleteAllMessagesOnStartup(true); - answer.setUseShutdownHook(false); + answer.setUseShutdownHook(true); } protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {