From d20da4460d914ff771a2de1e2e76a2182088c512 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Tue, 30 Jun 2009 08:56:03 +0000
Subject: [PATCH] temporary fix for durable consumer test

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@789626 13f79535-47bb-0310-9956-ffa450edef68
---
 .../activemq/bugs/DurableConsumerTest.java    | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java b/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java
index 3226cf7caf..24aa78bb03 100755
--- a/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java
@@ -158,8 +158,19 @@ public class DurableConsumerTest extends TestCase {
         }
     }
     
+    private void configurePersistence(BrokerService broker) throws Exception {
+        File dataDirFile = new File("target/"+ getName());
+        AMQPersistenceAdapterFactory fact = new AMQPersistenceAdapterFactory();
+        fact.setDataDirectory(dataDirFile);
+        fact.setForceRecoverReferenceStore(true);
+    	broker.setPersistenceAdapter(fact.createPersistenceAdapter());
+    }
+    
     public void testFailover() throws Exception {
         
+    	configurePersistence(broker);
+    	broker.start();
+    	
     	Thread publisherThread = new Thread( new MessagePublisher() );
         publisherThread.start();
         
@@ -179,11 +190,16 @@ public class DurableConsumerTest extends TestCase {
         Thread.sleep(5000);
         broker.stop();
         broker = createBroker(false);
+        configurePersistence(broker);
+        broker.start();
         Thread.sleep(10000);
         assertEquals(0, exceptions.size());
     }
   
     public void testConcurrentDurableConsumer() throws Exception {
+    	
+    	broker.start();
+    	
         factory = createConnectionFactory();
         final String topicName = getName();
         final int numMessages = 500;
@@ -265,6 +281,9 @@ public class DurableConsumerTest extends TestCase {
     }
     
     public void testConsumer() throws Exception{
+    	
+    	broker.start();
+    	
         factory = createConnectionFactory();
         Connection consumerConnection = factory.createConnection();
         consumerConnection.setClientID(CONSUMER_NAME);
@@ -274,7 +293,8 @@ public class DurableConsumerTest extends TestCase {
         consumerConnection.start();
         consumerConnection.close();
         broker.stop();
-        broker =createBroker(false);
+        broker = createBroker(false);
+        broker.start();
         
         Connection producerConnection = factory.createConnection();
        
@@ -292,14 +312,15 @@ public class DurableConsumerTest extends TestCase {
         }
         producerConnection.close();
         broker.stop();
-        broker =createBroker(false);
+        broker = createBroker(false);
+        broker.start();
         
         consumerConnection = factory.createConnection();
         consumerConnection.setClientID(CONSUMER_NAME);
+        consumerConnection.start();
         consumerSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
        
         consumer = consumerSession.createDurableSubscriber(topic, CONSUMER_NAME);
-        consumerConnection.start();
         for (int i =0; i < COUNT;i++) {
             Message msg =  consumer.receive(5000);            
             assertNotNull("Missing message: "+i, msg);
@@ -342,17 +363,11 @@ public class DurableConsumerTest extends TestCase {
     protected BrokerService createBroker(boolean deleteStore) throws Exception {
         BrokerService answer = new BrokerService();
         configureBroker(answer,deleteStore);
-        answer.start();
         return answer;
     }
     
 
     protected void configureBroker(BrokerService answer,boolean deleteStore) throws Exception {
-        File dataDirFile = new File("target/"+ getName());
-        AMQPersistenceAdapterFactory fact = new AMQPersistenceAdapterFactory();
-        fact.setDataDirectory(dataDirFile);
-        fact.setForceRecoverReferenceStore(true);
-    	answer.setPersistenceAdapter(fact.createPersistenceAdapter());
         answer.setDeleteAllMessagesOnStartup(deleteStore);
         answer.addConnector(bindAddress);
         answer.setUseShutdownHook(false);