Changed for using QpidTestCase

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@583498 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 32 deletions

diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
index 87630fad5b..2375d03410 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/MessageListenerTest.java
@@ -20,16 +20,13 @@
  */
 package org.apache.qpid.client;
 
-import junit.framework.TestCase;
 
-import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
+import org.apache.qpid.testutil.QpidTestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
@@ -37,9 +34,6 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.naming.Context;
-import javax.naming.spi.InitialContextFactory;
-
-import java.util.Hashtable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -52,7 +46,7 @@ import java.util.concurrent.TimeUnit;
  * the message listener later the _synchronousQueue is just poll()'ed and the first message delivered the remaining
  * messages will be left on the queue and lost, subsequent messages on the session will arrive first.
  */
-public class MessageListenerTest extends TestCase implements MessageListener
+public class MessageListenerTest extends QpidTestCase implements MessageListener
 {
     private static final Logger _logger = LoggerFactory.getLogger(MessageListenerTest.class);
 
@@ -63,40 +57,25 @@ public class MessageListenerTest extends TestCase implements MessageListener
     private MessageConsumer _consumer;
     private Connection _clientConnection;
     private CountDownLatch _awaitMessages = new CountDownLatch(MSG_COUNT);
-    private static final String BROKER = "vm://:1";
-    private static final String VHOST = "test";
 
     protected void setUp() throws Exception
     {
         super.setUp();
-        if (BROKER.contains("vm://"))
-        {
-            TransportConnection.createVMBroker(1);
-        }
-
-        InitialContextFactory factory = new PropertiesFileInitialContextFactory();
-
-        Hashtable<String, String> env = new Hashtable<String, String>();
-
-        env.put("connectionfactory.connection", "amqp://guest:guest@MLT_ID/" + VHOST + "?brokerlist='" + BROKER + "'");
-        env.put("queue.queue", "MessageListenerTest");
-
-        _context = factory.getInitialContext(env);
-
-        Queue queue = (Queue) _context.lookup("queue");
 
         // Create Client
-        _clientConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+        _clientConnection = getConnection("guest", "guest");
 
         _clientConnection.start();
 
         Session clientSession = _clientConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
+        Queue queue =clientSession.createQueue("queue");
+
         _consumer = clientSession.createConsumer(queue);
 
         // Create Producer
 
-        Connection producerConnection = ((ConnectionFactory) _context.lookup("connection")).createConnection();
+        Connection producerConnection = getConnection("guest", "guest");
 
         producerConnection.start();
 
@@ -116,12 +95,7 @@ public class MessageListenerTest extends TestCase implements MessageListener
     protected void tearDown() throws Exception
     {
         _clientConnection.close();
-
         super.tearDown();
-        if (BROKER.contains("vm://"))
-        {
-            TransportConnection.killAllVMBrokers();
-        }
     }
 
     public void testSynchronousRecieve() throws Exception